From ba59c62044f8fc701d0fbc4269753533f58c576d Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 9 Dec 2019 15:07:31 +0000
Subject: [PATCH] vmm, devices: Remove hardcoded IRQ number for GED device

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>
---
 devices/src/acpi.rs       |  8 +++++++-
 vmm/src/device_manager.rs | 26 ++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/devices/src/acpi.rs b/devices/src/acpi.rs
index 745c8a0e7..6d0673b5f 100644
--- a/devices/src/acpi.rs
+++ b/devices/src/acpi.rs
@@ -57,13 +57,15 @@ impl BusDevice for AcpiShutdownDevice {
 pub struct AcpiGEDDevice {
     interrupt: Box<dyn Interrupt>,
     notification_type: HotPlugNotificationType,
+    ged_irq: u32,
 }
 
 impl AcpiGEDDevice {
-    pub fn new(interrupt: Box<dyn Interrupt>) -> AcpiGEDDevice {
+    pub fn new(interrupt: Box<dyn Interrupt>, ged_irq: u32) -> AcpiGEDDevice {
         AcpiGEDDevice {
             interrupt,
             notification_type: HotPlugNotificationType::NoDevicesChanged,
+            ged_irq,
         }
     }
 
@@ -74,6 +76,10 @@ impl AcpiGEDDevice {
         self.notification_type = notification_type;
         self.interrupt.deliver()
     }
+
+    pub fn irq(&self) -> u32 {
+        self.ged_irq
+    }
 }
 
 // I/O port reports what type of notification was made
diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index deac35b6f..2ef20b930 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -681,13 +681,16 @@ impl DeviceManager {
             .insert(acpi_device.clone(), 0x3c0, 0x4)
             .map_err(DeviceManagerError::BusError)?;
 
-        // We need to hardcode this as the ACPI tables need to specify a particular IRQ and it's not possible
-        // to ask the allocator for a specific one.
-        let ged_irq = 5;
+        let ged_irq = address_manager
+            .allocator
+            .lock()
+            .unwrap()
+            .allocate_irq()
+            .unwrap();
         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
             .allocator
@@ -1555,7 +1558,7 @@ impl Drop for DeviceManager {
 }
 
 #[cfg(feature = "acpi")]
-fn create_ged_device() -> Vec<u8> {
+fn create_ged_device(ged_irq: u32) -> Vec<u8> {
     aml::Device::new(
         "_SB_.GED_".into(),
         vec![
@@ -1564,7 +1567,7 @@ fn create_ged_device() -> Vec<u8> {
             &aml::Name::new(
                 "_CRS".into(),
                 &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),
@@ -1663,7 +1666,14 @@ impl Aml for DeviceManager {
         let s5_sleep_data =
             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(mbrd_dsdt_data.as_slice());