kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: acpi: Move ACPI GED device to MMIO bus

Browse Source 
Currently the GED control is in a fixed I/O port address but instead use
an MMIO address that has been chosen by the allocator.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2021-01-20 15:32:10 +00:00
committed by Sebastien Boeuf
parent 4ebeeb1310
commit 28ab6cea0e
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
vmm/src/device_manager.rs
View File

@@ -244,6 +244,9 @@ pub enum DeviceManagerError {
/// Failed to allocate IO port
AllocateIOPort,
/// Failed to allocate MMIO address
AllocateMMIOAddress,
// Failed to make hotplug notification
HotPlugNotification(io::Error),
@@ -1210,32 +1213,33 @@ impl DeviceManager {
.unwrap()
.allocate_irq()
.unwrap();
let interrupt_group = interrupt_manager
.create_group(LegacyIrqGroupConfig {
irq: ged_irq as InterruptIndex,
})
.map_err(DeviceManagerError::CreateInterruptGroup)?;
let ged_device = Arc::new(Mutex::new(devices::AcpiGEDDevice::new(
interrupt_group,
ged_irq,
)));
self.bus_devices
.push(Arc::clone(&ged_device) as Arc<Mutex<dyn BusDevice>>);
self.address_manager
let ged_address = self
.address_manager
.allocator
.lock()
.unwrap()
.allocate_io_addresses(Some(GuestAddress(0xb000)), 0x1, None)
.ok_or(DeviceManagerError::AllocateIOPort)?;
.allocate_mmio_addresses(None, devices::acpi::GED_DEVICE_ACPI_SIZE as u64, None)
.ok_or(DeviceManagerError::AllocateMMIOAddress)?;
let ged_device = Arc::new(Mutex::new(devices::AcpiGEDDevice::new(
interrupt_group,
ged_irq,
ged_address,
)));
self.address_manager
.io_bus
.insert(ged_device.clone(), 0xb000, 0x1)
.mmio_bus
.insert(
ged_device.clone(),
ged_address.0,
devices::acpi::GED_DEVICE_ACPI_SIZE as u64,
)
.map_err(DeviceManagerError::BusError)?;
self.bus_devices
.push(Arc::clone(&ged_device) as Arc<Mutex<dyn BusDevice>>);
let pm_timer_device = Arc::new(Mutex::new(devices::AcpiPMTimerDevice::new()));