OvmfPkg: sync FADT with QEMU: correct SMI_CMD

- Qemu's PIIX emulation actually supports SMM and ACPI_ENABLE /
  ACPI_DISABLE.

- After enabling SMI_CMD (SMI_CMD_IO_PORT), further values to be written
  there must be synchronized with qemu: PSTATE_CNT, CST_CNT.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13611 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
index b06c6b22adb182cc95b23e6aa7aa0fe8bc0c6a05..c55094b8380224988db0dd685ec642eda2b34df5 100644 (file)
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ b/OvmfPkg/AcpiTables/Facp.aslc
@@ -33,7 +33,7 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   ACPI_ENABLE,      // value to write to port smi_cmd to enable ACPI\r
   ACPI_DISABLE,     // value to write to port smi_cmd to disable ACPI\r
   S4BIOS_REQ,       // Value to write to SMI CMD port to enter the S4BIOS state\r
-  0xE2,             // PState control\r
+  0,                // PState control\r
   PM1a_EVT_BLK,     // Port address of Power Mgt 1a Event Reg Blk\r
   PM1b_EVT_BLK,     // Port address of Power Mgt 1b Event Reg Blk\r
   PM1a_CNT_BLK,     // Port address of Power Mgt 1a Ctrl Reg Blk\r
@@ -49,7 +49,7 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   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
-  0xE3,             // _CST support\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
   FLUSH_SIZE,       // Size of area read to flush caches\r

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index b9a491cd788b0f3c5b1b73225606cda1b6c651e6..d1803170d477c97529b69d2ae1ce0d3a26df42c2 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -29,9 +29,9 @@
 \r
 #define INT_MODEL       0x01\r
 #define SCI_INT_VECTOR  0x0009\r
-#define SMI_CMD_IO_PORT 0 // If SMM was supported, then this would be 0xB2\r
-#define ACPI_ENABLE     0\r
-#define ACPI_DISABLE    0\r
+#define SMI_CMD_IO_PORT 0xB2\r
+#define ACPI_ENABLE     0xF1\r
+#define ACPI_DISABLE    0xF0\r
 #define S4BIOS_REQ      0x00\r
 #define PM1a_EVT_BLK    0x0000b000\r
 #define PM1b_EVT_BLK    0x00000000\r