External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-15 13:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm, devices: Remove hardcoded IRQ number for GED device

Browse Source 
Remove the previously hardcoded IRQ number used for the GED device.
Instead allocate the IRQ using the allocator and use that value in the
definition in the ACPI device.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-12-09 15:07:31 +00:00
parent ce1bd9c7ff
commit ba59c62044
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/src/acpi.rs
View File

@ -57,13 +57,15 @@ impl BusDevice for AcpiShutdownDevice {
pub struct AcpiGEDDevice { pub struct AcpiGEDDevice {
interrupt: Box<dyn Interrupt>, interrupt: Box<dyn Interrupt>,
notification_type: HotPlugNotificationType, notification_type: HotPlugNotificationType,
ged_irq: u32,
} }
impl AcpiGEDDevice { impl AcpiGEDDevice {
pub fn new(interrupt: Box<dyn Interrupt>) -> AcpiGEDDevice { pub fn new(interrupt: Box<dyn Interrupt>, ged_irq: u32) -> AcpiGEDDevice {
AcpiGEDDevice { AcpiGEDDevice {
interrupt, interrupt,
notification_type: HotPlugNotificationType::NoDevicesChanged, notification_type: HotPlugNotificationType::NoDevicesChanged,
ged_irq,
} }
} }
@ -74,6 +76,10 @@ impl AcpiGEDDevice {
self.notification_type = notification_type; self.notification_type = notification_type;
self.interrupt.deliver() self.interrupt.deliver()
} }
pub fn irq(&self) -> u32 {
self.ged_irq
}
} }
// I/O port reports what type of notification was made // I/O port reports what type of notification was made

26
vmm/src/device_manager.rs
View File

@ -681,13 +681,16 @@ impl DeviceManager {
.insert(acpi_device.clone(), 0x3c0, 0x4) .insert(acpi_device.clone(), 0x3c0, 0x4)
.map_err(DeviceManagerError::BusError)?; .map_err(DeviceManagerError::BusError)?;
// We need to hardcode this as the ACPI tables need to specify a particular IRQ and it's not possible let ged_irq = address_manager
// to ask the allocator for a specific one. .allocator
let ged_irq = 5; .lock()
.unwrap()
.allocate_irq()
.unwrap();
let interrupt: Box<dyn devices::Interrupt> = let interrupt: Box<dyn devices::Interrupt> =
Box::new(UserIoapicIrq::new(ioapic.clone(), ged_irq)); Box::new(UserIoapicIrq::new(ioapic.clone(), ged_irq as usize));
let ged_device = Arc::new(Mutex::new(devices::AcpiGEDDevice::new(interrupt))); let ged_device = Arc::new(Mutex::new(devices::AcpiGEDDevice::new(interrupt, ged_irq)));
address_manager address_manager
.allocator .allocator
@ -1555,7 +1558,7 @@ impl Drop for DeviceManager {
} }
#[cfg(feature = "acpi")] #[cfg(feature = "acpi")]
fn create_ged_device() -> Vec<u8> { fn create_ged_device(ged_irq: u32) -> Vec<u8> {
aml::Device::new( aml::Device::new(
"_SB_.GED_".into(), "_SB_.GED_".into(),
vec![ vec![
@ -1564,7 +1567,7 @@ fn create_ged_device() -> Vec<u8> {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::Interrupt::new( &aml::ResourceTemplate::new(vec![&aml::Interrupt::new(
true, true, false, false, 5, true, true, false, false, ged_irq,
)]), )]),
), ),
&aml::OpRegion::new("GDST".into(), aml::OpRegionSpace::SystemIO, 0xb000, 0x1), &aml::OpRegion::new("GDST".into(), aml::OpRegionSpace::SystemIO, 0xb000, 0x1),
@ -1663,7 +1666,14 @@ impl Aml for DeviceManager {
let s5_sleep_data = let s5_sleep_data =
aml::Name::new("_S5_".into(), &aml::Package::new(vec![&5u8])).to_aml_bytes(); aml::Name::new("_S5_".into(), &aml::Package::new(vec![&5u8])).to_aml_bytes();
let ged_data = create_ged_device(); let ged_data = create_ged_device(
self.ged_notification_device
.as_ref()
.unwrap()
.lock()
.unwrap()
.irq(),
);
bytes.extend_from_slice(pci_dsdt_data.as_slice()); bytes.extend_from_slice(pci_dsdt_data.as_slice());
bytes.extend_from_slice(mbrd_dsdt_data.as_slice()); bytes.extend_from_slice(mbrd_dsdt_data.as_slice());