X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FAcpiTables%2FPlatform.h;h=d96b847239668fc1131d6b1e8991606b1525eaec;hb=774f52f6debdc3ba4e43bb6f49b1223ca727241b;hp=684156a4758c3cd71024960f7bf3ca5bda89802b;hpb=8eb28fe796f7c5426e3fc15ed72b76d939ad3872;p=mirror_edk2.git

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index 684156a475..d96b847239 100644
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -28,7 +28,6 @@
 #define EFI_ACPI_CREATOR_ID       SIGNATURE_32('O','V','M','F')
 #define EFI_ACPI_CREATOR_REVISION 0x00000099
 
-#define INT_MODEL       0x01
 #define SCI_INT_VECTOR  0x0009
 #define SMI_CMD_IO_PORT 0xB2
 #define ACPI_ENABLE     0xF1
@@ -36,17 +35,12 @@
 #define S4BIOS_REQ      0x00
 #define PM1a_EVT_BLK    0x0000b000
 #define PM1a_CNT_BLK    0x0000b004
-#define PM2_CNT_BLK     0x00000000
 #define PM_TMR_BLK      0x0000b008
 #define GPE0_BLK        0x0000afe0
-#define GPE1_BLK        0x00000000
 #define PM1_EVT_LEN     0x04
 #define PM1_CNT_LEN     0x02
-#define PM2_CNT_LEN     0x00
 #define PM_TM_LEN       0x04
 #define GPE0_BLK_LEN    0x04
-#define GPE1_BLK_LEN    0x00
-#define GPE1_BASE       0x00
 #define RESERVED        0x00
 #define P_LVL2_LAT      0x0065
 #define P_LVL3_LAT      0x03E9
@@ -57,7 +51,24 @@
 #define DAY_ALRM        0x00
 #define MON_ALRM        0x00
 #define CENTURY         0x00
-#define FLAG            EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 | EFI_ACPI_1_0_SLP_BUTTON | EFI_ACPI_1_0_RTC_S4
+#define FLAG            (EFI_ACPI_2_0_WBINVD | \
+                         EFI_ACPI_2_0_PROC_C1 | \
+                         EFI_ACPI_2_0_SLP_BUTTON | \
+                         EFI_ACPI_2_0_RTC_S4 | \
+                         EFI_ACPI_2_0_RESET_REG_SUP)
+#define RESET_REG       0xCF9
+#define RESET_VALUE     (BIT2 | BIT1) // PIIX3 Reset CPU + System Reset
 
-#endif
+//
+// Byte-aligned IO port register block initializer for
+// EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE
+//
+#define GAS2_IO(Base, Size) {                             \
+          EFI_ACPI_2_0_SYSTEM_IO, /* AddressSpaceId    */ \
+          (Size) * 8,             /* RegisterBitWidth  */ \
+          0,                      /* RegisterBitOffset */ \
+          0,                      /* Reserved          */ \
+          (Base)                  /* Address           */ \
+          }
 
+#endif