OvmfPkg: _DIS and _SRS methods should have permanent effect

[mirror_edk2.git] / OvmfPkg / AcpiTables / Dsdt.asl

diff --git a/OvmfPkg/AcpiTables/Dsdt.asl b/OvmfPkg/AcpiTables/Dsdt.asl
index 0ef0d3d0a0ed4a59b4f8c3a5b7f69fa8951c0f31..e12c3e9a07d180a860b341ef1a4027e550f96091 100644 (file)
--- a/OvmfPkg/AcpiTables/Dsdt.asl
+++ b/OvmfPkg/AcpiTables/Dsdt.asl
@@ -239,58 +239,43 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
           }\r
         }\r
 \r
-        //\r
-        // _DIS method for LNKA, LNKB, LNKC, LNKD\r
-        //\r
-        Method (PDIS, 1, NotSerialized) {\r
-          Or (Arg0, 0x80, Arg0)\r
-        }\r
-\r
         //\r
         // _CRS method for LNKA, LNKB, LNKC, LNKD\r
         //\r
         Method (PCRS, 1, NotSerialized) {\r
-          Name (BUF0, ResourceTemplate () {IRQ (Level, ActiveLow, Shared){0}})\r
           //\r
-          // Define references to buffer elements\r
+          // create temporary buffer with an Extended Interrupt Descriptor\r
+          // whose single vector defaults to zero\r
           //\r
-          CreateWordField (BUF0, 0x01, IRQW)  // IRQ low\r
+          Name (BUF0, ResourceTemplate () {\r
+              Interrupt (ResourceConsumer, Level, ActiveHigh, Shared){0}\r
+            }\r
+          )\r
+\r
           //\r
-          // Write current settings into IRQ descriptor\r
+          // define reference to first interrupt vector in buffer\r
           //\r
-          If (And (Arg0, 0x80)) {\r
-            Store (Zero, Local0)\r
-          } Else {\r
-            Store (One, Local0)\r
-          }\r
+          CreateDWordField (BUF0, 0x05, IRQW)\r
+\r
           //\r
-          // Shift 1 by value in register 70\r
+          // If the disable-bit is clear, overwrite the default zero vector\r
+          // with the value in Arg0 (ie. PIRQRC[A:D]). Reserved bits are read\r
+          // as 0.\r
           //\r
-          ShiftLeft (Local0, And (Arg0, 0x0F), IRQW)   // Save in buffer\r
-          Return (BUF0)                                // Return Buf0\r
+          If (LNot (And (Arg0, 0x80))) {\r
+            Store (Arg0, IRQW)\r
+          }\r
+          Return (BUF0)\r
         }\r
 \r
         //\r
         // _PRS resource for LNKA, LNKB, LNKC, LNKD\r
         //\r
         Name (PPRS, ResourceTemplate () {\r
-          IRQ (Level, ActiveLow, Shared) {3, 4, 5, 7, 9, 10, 11, 12, 14, 15}\r
-        })\r
-\r
-        //\r
-        // _SRS method for LNKA, LNKB, LNKC, LNKD\r
-        //\r
-        Method (PSRS, 2, NotSerialized) {\r
-          CreateWordField (Arg1, 0x01, IRQW)      // IRQ low\r
-          FindSetRightBit (IRQW, Local0)          // Set IRQ\r
-          If (LNotEqual (IRQW, Zero)) {\r
-            And (Local0, 0x7F, Local0)\r
-            Decrement (Local0)\r
-          } Else {\r
-            Or (Local0, 0x80, Local0)\r
+          Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) {\r
+            3, 4, 5, 7, 9, 10, 11, 12, 14, 15\r
           }\r
-          Store (Local0, Arg0)\r
-        }\r
+        })\r
 \r
         //\r
         // PCI IRQ Link A\r
@@ -300,10 +285,15 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
           Name (_UID, 1)\r
 \r
           Method (_STA, 0, NotSerialized) { Return (PSTA (PIRA)) }\r
-          Method (_DIS, 0, NotSerialized) { PDIS (PIRA)  }\r
+          Method (_DIS, 0, NotSerialized) {\r
+            Or (PIRA, 0x80, PIRA) // set disable-bit\r
+          }\r
           Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRA)) }\r
           Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) { PSRS (PIRA, Arg0) }\r
+          Method (_SRS, 1, NotSerialized) {\r
+            CreateDWordField (Arg0, 0x05, IRQW)\r
+            Store (IRQW, PIRA)\r
+          }\r
         }\r
 \r
         //\r
@@ -314,10 +304,15 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
           Name (_UID, 2)\r
 \r
           Method (_STA, 0, NotSerialized) { Return (PSTA (PIRB)) }\r
-          Method (_DIS, 0, NotSerialized) { PDIS (PIRB) }\r
+          Method (_DIS, 0, NotSerialized) {\r
+            Or (PIRB, 0x80, PIRB) // set disable-bit\r
+          }\r
           Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRB)) }\r
           Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) { PSRS (PIRB, Arg0) }\r
+          Method (_SRS, 1, NotSerialized) {\r
+            CreateDWordField (Arg0, 0x05, IRQW)\r
+            Store (IRQW, PIRB)\r
+          }\r
         }\r
 \r
         //\r
@@ -328,10 +323,15 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
           Name (_UID, 3)\r
 \r
           Method (_STA, 0, NotSerialized) { Return (PSTA (PIRC)) }\r
-          Method (_DIS, 0, NotSerialized) { PDIS (PIRC) }\r
+          Method (_DIS, 0, NotSerialized) {\r
+            Or (PIRC, 0x80, PIRC) // set disable-bit\r
+          }\r
           Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRC)) }\r
           Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) { PSRS (PIRC, Arg0) }\r
+          Method (_SRS, 1, NotSerialized) {\r
+            CreateDWordField (Arg0, 0x05, IRQW)\r
+            Store (IRQW, PIRC)\r
+          }\r
         }\r
 \r
         //\r
@@ -342,10 +342,15 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
           Name (_UID, 1)\r
 \r
           Method (_STA, 0, NotSerialized) { Return (PSTA (PIRD)) }\r
-          Method (_DIS, 0, NotSerialized) { PDIS (PIRD) }\r
+          Method (_DIS, 0, NotSerialized) {\r
+            Or (PIRD, 0x80, PIRD) // set disable-bit\r
+          }\r
           Method (_CRS, 0, NotSerialized) { Return (PCRS (PIRD)) }\r
           Method (_PRS, 0, NotSerialized) { Return (PPRS) }\r
-          Method (_SRS, 1, NotSerialized) { PSRS (PIRD, Arg0) }\r
+          Method (_SRS, 1, NotSerialized) {\r
+            CreateDWordField (Arg0, 0x05, IRQW)\r
+            Store (IRQW, PIRD)\r
+          }\r
         }\r
 \r
         //\r
@@ -445,13 +450,14 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
             IO (Decode16, 0x278, 0x278, 0x00, 0x08)\r
             IO (Decode16, 0x370, 0x370, 0x00, 0x02)\r
             IO (Decode16, 0x378, 0x378, 0x00, 0x08)\r
+            IO (Decode16, 0x402, 0x402, 0x00, 0x01)        // QEMU debug console, should use FixedPcdGet16 (PcdDebugIoPort)\r
             IO (Decode16, 0x440, 0x440, 0x00, 0x10)\r
             IO (Decode16, 0x678, 0x678, 0x00, 0x08)\r
             IO (Decode16, 0x778, 0x778, 0x00, 0x08)\r
-            IO (Decode16, 0xafe0, 0xafe0, 0x00, 0x04)     // QEMU GPE0 BLK\r
-            IO (Decode16, 0xb000, 0xb000, 0x00, 0x40)     // PMBLK1\r
-            Memory32Fixed (ReadOnly, 0xFEC00000, 0x1000)  // IO APIC\r
-            Memory32Fixed (ReadOnly, 0xFEE00000, 0x1000)\r
+            IO (Decode16, 0xafe0, 0xafe0, 0x00, 0x04)      // QEMU GPE0 BLK\r
+            IO (Decode16, 0xb000, 0xb000, 0x00, 0x40)      // PMBLK1\r
+            Memory32Fixed (ReadOnly, 0xFEC00000, 0x1000)   // IO APIC\r
+            Memory32Fixed (ReadOnly, 0xFEE00000, 0x100000) // LAPIC\r
           })\r
         }\r
 \r