External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-09-28 17:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Add new I/O ports for ACPI shutdown and PM timer devices

Browse Source 
Adding new I/O ports for both the ACPI shutdown and the ACPI PM timer
devices so they can be triggered from both addresses. The reason for
this change is that TDX expects only certain I/O ports to be enabled
based on what QEMU exposes. We follow this to avoid new ports from being
opened exclusively for Cloud Hypervisor.

We have to keep the former I/O ports available given all firmwares
haven't been updated yet. Once we reach a point where we know both Rust
Hypervisor Firmware, OVMF, TDVF and TDSHIM have been updated with the
new port values, we'll be able to remove the former ports.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-08-11 11:43:16 +02:00 committed by Rob Bradford
parent 0b182be65e
commit 98f949d35d
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vmm/src/device_manager.rs
View File

@ -1411,6 +1411,10 @@ impl DeviceManager {
#[cfg(target_arch = "x86_64")]
{
let shutdown_pio_address: u16 = 0x600;
// TODO: Remove the entry for 0x3c0 once all firmwares will have been
// updated with the new value.
self.address_manager
.allocator
.lock()
@ -1418,16 +1422,31 @@ impl DeviceManager {
.allocate_io_addresses(Some(GuestAddress(0x3c0)), 0x8, None)
.ok_or(DeviceManagerError::AllocateIoPort)?;
self.address_manager
.allocator
.lock()
.unwrap()
.allocate_io_addresses(Some(GuestAddress(shutdown_pio_address.into())), 0x8, None)
.ok_or(DeviceManagerError::AllocateIoPort)?;
// TODO: Remove the entry for 0x3c0 once all firmwares will have been
// updated with the new value.
self.address_manager
.io_bus
.insert(shutdown_device, 0x3c0, 0x4)
.insert(shutdown_device.clone(), 0x3c0, 0x4)
.map_err(DeviceManagerError::BusError)?;
self.address_manager
.io_bus
.insert(shutdown_device, shutdown_pio_address.into(), 0x4)
.map_err(DeviceManagerError::BusError)?;
self.acpi_platform_addresses.sleep_control_reg_address =
Some(GenericAddress::io_port_address::<u8>(0x3c0));
Some(GenericAddress::io_port_address::<u8>(shutdown_pio_address));
self.acpi_platform_addresses.sleep_status_reg_address =
Some(GenericAddress::io_port_address::<u8>(0x3c0));
Some(GenericAddress::io_port_address::<u8>(shutdown_pio_address));
self.acpi_platform_addresses.reset_reg_address =
Some(GenericAddress::io_port_address::<u8>(0x3c0));
Some(GenericAddress::io_port_address::<u8>(shutdown_pio_address));
}
let ged_irq = self
@ -1476,6 +1495,10 @@ impl DeviceManager {
#[cfg(target_arch = "x86_64")]
{
let pm_timer_pio_address: u16 = 0x608;
// TODO: Remove the entry for 0xb008 once all firmwares will have been
// updated with the new value.
self.address_manager
.allocator
.lock()
@ -1483,13 +1506,27 @@ impl DeviceManager {
.allocate_io_addresses(Some(GuestAddress(0xb008)), 0x4, None)
.ok_or(DeviceManagerError::AllocateIoPort)?;
self.address_manager
.allocator
.lock()
.unwrap()
.allocate_io_addresses(Some(GuestAddress(pm_timer_pio_address.into())), 0x4, None)
.ok_or(DeviceManagerError::AllocateIoPort)?;
// TODO: Remove the entry for 0xb008 once all firmwares will have been
// updated with the new value.
self.address_manager
.io_bus
.insert(pm_timer_device, 0xb008, 0x4)
.insert(pm_timer_device.clone(), 0xb008, 0x4)
.map_err(DeviceManagerError::BusError)?;
self.address_manager
.io_bus
.insert(pm_timer_device, pm_timer_pio_address.into(), 0x4)
.map_err(DeviceManagerError::BusError)?;
self.acpi_platform_addresses.pm_timer_address =
Some(GenericAddress::io_port_address::<u32>(0xb008));
Some(GenericAddress::io_port_address::<u32>(pm_timer_pio_address));
}
Ok(Some(ged_device))