OvmfPkg/AmdSevDxe: sort #includes, and entries in INF file sections

[mirror_edk2.git] / OvmfPkg / AcpiTables / Facp.aslc

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
index 45bb50768f8a2eb273d71309964f43780027141e..df35285c9c918a793aa4a5db3483338d5d691c9d 100644 (file)
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ b/OvmfPkg/AcpiTables/Facp.aslc
@@ -15,11 +15,11 @@
 \r
 #include "Platform.h"\r
 \r
-EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {\r
+EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {\r
   {\r
-    EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,\r
-    sizeof (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE),\r
-    EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
+    EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,\r
+    sizeof (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE),\r
+    EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
     0,                          // to make sum of entire table == 0\r
     {EFI_ACPI_OEM_ID},          // OEMID is a 6 bytes long field\r
     EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)\r
@@ -29,8 +29,8 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   },\r
   0,                // Physical addesss of FACS\r
   0,                // Physical address of DSDT\r
-  INT_MODEL,        // System Interrupt Model\r
-  RESERVED,         // reserved\r
+  RESERVED,         // System Interrupt Model in ACPI 1.0, eliminated in 2.0\r
+  EFI_ACPI_2_0_PM_PROFILE_UNSPECIFIED, // Preferred PM profile\r
   SCI_INT_VECTOR,   // System vector of SCI interrupt\r
   SMI_CMD_IO_PORT,  // Port address of SMI command port\r
   ACPI_ENABLE,      // value to write to port smi_cmd to enable ACPI\r
@@ -41,17 +41,17 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   0,                // Power Mgt 1b Event Reg Blk unsupported\r
   PM1a_CNT_BLK,     // Port address of Power Mgt 1a Ctrl Reg Blk\r
   0,                // Power Mgt 1b Ctrl Reg Blk unsupported\r
-  PM2_CNT_BLK,      // Port address of Power Mgt 2  Ctrl Reg Blk\r
+  0,                // Power Mgt 2  Ctrl Reg Blk unsupported\r
   PM_TMR_BLK,       // Port address of Power Mgt Timer Ctrl Reg Blk\r
   GPE0_BLK,         // Port addr of General Purpose Event 0 Reg Blk\r
-  GPE1_BLK,         // Port addr of General Purpose Event 1 Reg Blk\r
+  0,                // General Purpose Event 1 Reg Blk unsupported\r
   PM1_EVT_LEN,      // Byte Length of ports at pm1X_evt_blk\r
   PM1_CNT_LEN,      // Byte Length of ports at pm1X_cnt_blk\r
-  PM2_CNT_LEN,      // Byte Length of ports at pm2_cnt_blk\r
+  0,                // Power Mgt 2 Ctrl Reg Blk unsupported\r
   PM_TM_LEN,        // Byte Length of ports at pm_tm_blk\r
   GPE0_BLK_LEN,     // Byte Length of ports at gpe0_blk\r
-  GPE1_BLK_LEN,     // Byte Length of ports at gpe1_blk\r
-  GPE1_BASE,        // offset in gpe model where gpe1 events start\r
+  0,                // General Purpose Event 1 Reg Blk unsupported\r
+  0,                // General Purpose Event 1 Reg Blk unsupported\r
   0,                // _CST support\r
   P_LVL2_LAT,       // worst case HW latency to enter/exit C2 state\r
   P_LVL3_LAT,       // worst case HW latency to enter/exit C3 state\r
@@ -62,10 +62,23 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   DAY_ALRM,         // index to day-of-month alarm in RTC CMOS RAM\r
   MON_ALRM,         // index to month-of-year alarm in RTC CMOS RAM\r
   CENTURY,          // index to century in RTC CMOS RAM\r
-  0x00,             // Boot architecture flag\r
-  0x00,             // Boot architecture flag\r
+  0x0000,           // Boot architecture flag (16-bit)\r
   RESERVED,         // reserved\r
-  FLAG\r
+  FLAG,             // Fixed feature flags\r
+  GAS2_IO(RESET_REG, 1), // Extended address of the Reset Register\r
+  RESET_VALUE,           // Value for the Reset Register to reset the system\r
+  { RESERVED },     // reserved[3]\r
+  0,                // 64-bit physical addesss of FACS, set at installation\r
+  0,                // 64-bit physical addesss of DSDT, set at installation\r
+\r
+  GAS2_IO(PM1a_EVT_BLK, PM1_EVT_LEN), // Ext. addr. of PM 1a Event Reg Blk\r
+  { 0 },                              // PM 1b Event Reg Blk unsupported\r
+  GAS2_IO(PM1a_CNT_BLK, PM1_CNT_LEN), // Ext. addr. of PM 1a Ctrl Reg Blk\r
+  { 0 },                              // PM 1b Ctrl Reg Blk unsupported\r
+  { 0 },                              // PM 2  Ctrl Reg Blk unsupported\r
+  GAS2_IO(PM_TMR_BLK, PM_TM_LEN),     // Ext. addr. of PM Timer Ctrl Reg Blk\r
+  GAS2_IO(GPE0_BLK, GPE0_BLK_LEN),    // Ext. addr. of GPE 0 Reg Blk\r
+  { 0 }                               // GPE 1 Reg Blk unsupported\r
 };\r
 \r
 \r