Переглянути джерело

Silicon/Qemu: Convert DSDT ASL from legacy to ASL 2.0 syntax

ACPI 6.0 introduced support for ASL 2.0 includes standard operators.
Convert the DSDT from legacy to ASL 2.0 syntax.

Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Rebecca Cran 1 рік тому
батько
коміт
2775438dab
1 змінених файлів з 9 додано та 9 видалено
  1. 9 9
      Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl

+ 9 - 9
Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl

@@ -449,7 +449,7 @@ DefinitionBlock ("DsdtTable.aml", "DSDT",
        */
       Method (_OSC,4) {
         // Check for proper UUID
-        If (LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) {
+        If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) {
           // Create DWord-adressable fields from the Capabilities Buffer
           CreateDWordField (Arg3,0,CDW1)
           CreateDWordField (Arg3,4,CDW2)
@@ -463,28 +463,28 @@ DefinitionBlock ("DsdtTable.aml", "DSDT",
           // * ASPM
           // * Clock PM
           // * MSI/MSI-X
-          If (LNotEqual(And(SUPP, 0x16), 0x16)) {
-            And (CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits)
+          If ((SUPP & 0x16) != 0x16) {
+            CTRL &= 0x1E // Mask bit 0 (and undefined bits)
           }
 
           // Always allow native PME, AER (no dependencies)
 
           // Never allow SHPC (no SHPC controller in this system)
-          And (CTRL,0x1D,CTRL)
+          CTRL &= 0x1D
 
-          If (LNotEqual(Arg1,One)) {        // Unknown revision
-            Or (CDW1,0x08,CDW1)
+          If (Arg1 != One) {         // Unknown revision
+            CDW1 |= 0x08
           }
 
-          If (LNotEqual(CDW3,CTRL)) {        // Capabilities bits were masked
-            Or (CDW1,0x10,CDW1)
+          If (CDW3 != CTRL) {        // Capabilities bits were masked
+            CDW1 |= 0x10
           }
 
           // Update DWORD3 in the buffer
           Store (CTRL,CDW3)
           Return (Arg3)
         } Else {
-          Or (CDW1,4,CDW1) // Unrecognized UUID
+          CDW1 |= 4 // Unrecognized UUID
           Return (Arg3)
         }
       } // End _OSC