Changeset 34035 in vbox

Timestamp:

Nov 12, 2010 6:17:58 PM (14 years ago)

Author:

vboxsync

Message:

ACPI: added IRQ9 override (present on all real boxes I have), ignore bogus interrupt line

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -511 +511 @@
 };
 AssertCompileSize(ACPITBLISO, 10);
-#define NUMBER_OF_IRQ_SOURCE_OVERRIDES 1
+#define NUMBER_OF_IRQ_SOURCE_OVERRIDES 2
 
 /** HPET Descriptor Structure */
@@ -945 +945 @@
 {
     uint16_t cpus = s->cCpus;
-    AcpiTableMADT madt(cpus, 1 /* one source override */ );
+    AcpiTableMADT madt(cpus, NUMBER_OF_IRQ_SOURCE_OVERRIDES);
 
     acpiPrepareHeader(madt.header_addr(), "APIC", madt.size(), 2);
@@ -976 +976 @@
 
     /* Interrupt Source Overrides */
+    /* Flags:
+        bits[3:2]:
+          00 conforms to the bus
+          01 edge-triggered
+          10 reserved
+          11 level-triggered
+        bits[1:0]
+          00 conforms to the bus
+          01 active-high
+          10 reserved
+          11 active-low */
     /* If changing, also update PDMIsaSetIrq() and MPS */
     ACPITBLISO* isos = madt.ISO_addr();
+    /* Timer interrupt rule IRQ0 to GSI2 */
     isos[0].u8Type     = 2;
     isos[0].u8Length   = sizeof(ACPITBLISO);
@@ -984 +996 @@
     isos[0].u32GSI     = 2; /* connected to pin 2 */
     isos[0].u16Flags   = 0; /* conform to the bus */
-    Assert(NUMBER_OF_IRQ_SOURCE_OVERRIDES == 1);
+
+    /* ACPI interrupt rule - IRQ9 to GSI9 */
+    isos[1].u8Type     = 2;
+    isos[1].u8Length   = sizeof(ACPITBLISO);
+    isos[1].u8Bus      = 0; /* Must be 0 */
+    isos[1].u8Source   = 9; /* IRQ9 */
+    isos[1].u32GSI     = 9; /* connected to pin 9 */
+    isos[1].u16Flags   = 0xd; /* active high, level triggered */
+    Assert(NUMBER_OF_IRQ_SOURCE_OVERRIDES == 2);
 
     madt.header_addr()->u8Checksum = acpiChecksum(madt.data(), madt.size());
@@ -1077 +1097 @@
     old_level = pm1a_level(s);
     new_level = (pm1a_pure_en(en) & pm1a_pure_sts(sts)) != 0;
+
+    Log(("update_pm1a() old=%x new=%x\n", old_level, new_level));
 
     s->pm1a_en = en;
@@ -1150 +1172 @@
 {
     ACPIState *s = IACPIPORT_2_ACPISTATE(pInterface);
+    Log(("acpiPowerButtonPress: handled=%d status=%x\n", s->fPowerButtonHandled, s->pm1a_sts));
     s->fPowerButtonHandled = false;
     update_pm1a(s, s->pm1a_sts | PWRBTN_STS, s->pm1a_en);
@@ -1777 +1800 @@
             break;
         default:
+            AssertMsgFailed(("PM1 status read: width %d\n", cb));
             return VERR_IOM_IOPORT_UNUSED;
     }
@@ -1790 +1814 @@
             break;
         default:
+            AssertMsgFailed(("PM1 control read: width %d\n", cb));
             return VERR_IOM_IOPORT_UNUSED;
     }
@@ -2384 +2409 @@
 
     Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, Address, cb));
+
+    if (Address == 0x3c && u32Value == 0xff)
+    {
+        Log(("acpi: ignore bogus interrupt line settings\n"));
+        return;
+    }
+
     pThis->pfnAcpiPciConfigWrite(pPciDev, Address, u32Value, cb);
 
@@ -2394 +2426 @@
             int rc;
 
-            RTIOPORT uNewBase =
-                    RTIOPORT(RT_LE2H_U32(*(uint32_t*)&pPciDev->config[0x40]));
+            RTIOPORT uNewBase = RTIOPORT(PCIDevGetDWord(pPciDev, 0x40));
             uNewBase &= 0xffc0;