Only allow CONFIG_XEN when not CONFIG_COREBOOT.

[seabios.git] / src / acpi-dsdt.dsl

diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
index bb0a176774cfe9b168e449cdb2ddb8179a950ea9..08412e213301e97726707cda12277137cc3ebab8 100644 (file)
--- a/src/acpi-dsdt.dsl
+++ b/src/acpi-dsdt.dsl
@@ -73,7 +73,7 @@ DefinitionBlock (
 #define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB)
                prt_slot0(0x0000),
                /* Device 1 is power mgmt device, and can only use irq 9 */
-               Package() { 0x0001ffff, 0, 0, 9 },
+               Package() { 0x0001ffff, 0, LNKS, 0 },
                Package() { 0x0001ffff, 1, LNKB, 0 },
                Package() { 0x0001ffff, 2, LNKC, 0 },
                Package() { 0x0001ffff, 3, LNKD, 0 },
@@ -122,6 +122,12 @@ DefinitionBlock (
                 B0EJ, 32,
             }
 
+            OperationRegion(RMVC, SystemIO, 0xae0c, 0x04)
+            Field(RMVC, DWordAcc, NoLock, WriteAsZeros)
+            {
+                PCRM, 32,
+            }
+
 #define hotplug_slot(name, nr) \
             Device (S##name) {                    \
                Name (_ADR, nr##0000)              \
@@ -233,6 +239,10 @@ DefinitionBlock (
     Scope(\_SB.PCI0) {
         Device (VGA) {
                  Name (_ADR, 0x00020000)
+                 OperationRegion(PCIC, PCI_Config, Zero, 0x4)
+                 Field(PCIC, DWordAcc, NoLock, Preserve) {
+                         VEND, 32
+                 }
                  Method (_S1D, 0, NotSerialized)
                  {
                          Return (0x00)
@@ -243,13 +253,20 @@ DefinitionBlock (
                  }
                  Method (_S3D, 0, NotSerialized)
                  {
-                         Return (0x00)
+                         If (LEqual(VEND, 0x1001b36)) {
+                                 Return (0x03)           // QXL
+                         } Else {
+                                 Return (0x00)
+                         }
                  }
+                 Method(_RMV) { Return (0x00) }
         }
 
        /* PIIX3 ISA bridge */
         Device (ISA) {
             Name (_ADR, 0x00010000)
+            Method(_RMV) { Return (0x00) }
+
 
             /* PIIX PCI to ISA irq remapping */
             OperationRegion (P40C, PCI_Config, 0x60, 0x04)
@@ -442,6 +459,49 @@ DefinitionBlock (
                DRSJ, 32
            }
        }
+
+#define gen_pci_device(name, nr)                                \
+        Device(SL##name) {                                      \
+            Name (_ADR, nr##0000)                               \
+            Method (_RMV) {                                     \
+                If (And(\_SB.PCI0.PCRM, ShiftLeft(1, nr))) {    \
+                    Return (0x1)                                \
+                }                                               \
+                Return (0x0)                                    \
+            }                                                   \
+            Name (_SUN, name)                                   \
+        }
+
+        /* VGA (slot 1) and ISA bus (slot 2) defined above */
+       gen_pci_device(3, 0x0003)
+       gen_pci_device(4, 0x0004)
+       gen_pci_device(5, 0x0005)
+       gen_pci_device(6, 0x0006)
+       gen_pci_device(7, 0x0007)
+       gen_pci_device(8, 0x0008)
+       gen_pci_device(9, 0x0009)
+       gen_pci_device(10, 0x000a)
+       gen_pci_device(11, 0x000b)
+       gen_pci_device(12, 0x000c)
+       gen_pci_device(13, 0x000d)
+       gen_pci_device(14, 0x000e)
+       gen_pci_device(15, 0x000f)
+       gen_pci_device(16, 0x0010)
+       gen_pci_device(17, 0x0011)
+       gen_pci_device(18, 0x0012)
+       gen_pci_device(19, 0x0013)
+       gen_pci_device(20, 0x0014)
+       gen_pci_device(21, 0x0015)
+       gen_pci_device(22, 0x0016)
+       gen_pci_device(23, 0x0017)
+       gen_pci_device(24, 0x0018)
+       gen_pci_device(25, 0x0019)
+       gen_pci_device(26, 0x001a)
+       gen_pci_device(27, 0x001b)
+       gen_pci_device(28, 0x001c)
+       gen_pci_device(29, 0x001d)
+       gen_pci_device(30, 0x001e)
+       gen_pci_device(31, 0x001f)
     }
 
     /* PCI IRQs */
@@ -634,6 +694,46 @@ DefinitionBlock (
                     Store (TMP, PRQ3)
                 }
         }
+        Device(LNKS){
+                Name(_HID, EISAID("PNP0C0F"))     // PCI interrupt link
+                Name(_UID, 5)
+                Name(_PRS, ResourceTemplate(){
+                    Interrupt (, Level, ActiveHigh, Shared)
+                        { 9 }
+                })
+                Method (_STA, 0, NotSerialized)
+                {
+                    Store (0x0B, Local0)
+                    If (And (0x80, PRQ0, Local1))
+                    {
+                         Store (0x09, Local0)
+                    }
+                    Return (Local0)
+                }
+                Method (_DIS, 0, NotSerialized)
+                {
+                    Or (PRQ0, 0x80, PRQ0)
+                }
+                Method (_CRS, 0, NotSerialized)
+                {
+                    Name (PRR0, ResourceTemplate ()
+                    {
+                        Interrupt (, Level, ActiveHigh, Shared)
+                            {9}
+                    })
+                    CreateDWordField (PRR0, 0x05, TMP)
+                    Store (PRQ0, Local0)
+                    If (LLess (Local0, 0x80))
+                    {
+                        Store (Local0, TMP)
+                    }
+                    Else
+                    {
+                        Store (Zero, TMP)
+                    }
+                    Return (PRR0)
+                }
+        }
     }
 
     /*