Revert "acpi: set correct address of the control/event blocks in the FADT"

This reverts commit a8c87a8788e5ce21d6e55e0acdc64a8f26cf5687.

diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index 64806b67641d178797a635cc08743c38c9470713..17bd0fe95f38c6ee7b8e79dcdd337f8095b0c0bf 100644 (file)
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -121,12 +121,7 @@ static void ovmf_acpi_build_tables(void)
         .dsdt_anycpu = dsdt_anycpu_qemu_xen,
         .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len,
         .dsdt_15cpu = NULL, 
-        .dsdt_15cpu_len = 0,
-        .pm1a_evt = ACPI_PM1A_EVT_BLK_ADDRESS_V1,
-        .pm1a_cnt = ACPI_PM1A_CNT_BLK_ADDRESS_V1,
-        .pm_tmr = ACPI_PM_TMR_BLK_ADDRESS_V1,
-        .gpe0 = ACPI_GPE0_BLK_ADDRESS_V1,
-        .gpe0_len = ACPI_GPE0_BLK_LEN_V1,
+        .dsdt_15cpu_len = 0
     };
 
     hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 1);

diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c
index 9591bbb0aa1858467eee09cc81d5c6e5ee94aa2a..b14d1f2af3f82829c5a296c644a6730ed560126e 100644 (file)
--- a/tools/firmware/hvmloader/rombios.c
+++ b/tools/firmware/hvmloader/rombios.c
@@ -31,7 +31,6 @@
 
 #include <libacpi.h>
 #include <xen/hvm/params.h>
-#include <xen/hvm/ioreq.h>
 
 #define ROM_INCLUDE_ROMBIOS
 #define ROM_INCLUDE_VGABIOS
@@ -177,11 +176,6 @@ static void rombios_acpi_build_tables(void)
         .dsdt_anycpu_len = dsdt_anycpu_len,
         .dsdt_15cpu = dsdt_15cpu,
         .dsdt_15cpu_len = dsdt_15cpu_len,
-        .pm1a_evt = ACPI_PM1A_EVT_BLK_ADDRESS_V0,
-        .pm1a_cnt = ACPI_PM1A_CNT_BLK_ADDRESS_V0,
-        .pm_tmr = ACPI_PM_TMR_BLK_ADDRESS_V0,
-        .gpe0 = ACPI_GPE0_BLK_ADDRESS_V0,
-        .gpe0_len = ACPI_GPE0_BLK_LEN_V0,
     };
 
     hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 0);

diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c
index 0375407ca7f4777a39df3cfd1938cbe39b789a87..c8792cd42b49df70312278d2f0435f664427d70c 100644 (file)
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -95,11 +95,6 @@ static void seabios_acpi_build_tables(void)
         .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len,
         .dsdt_15cpu = NULL,
         .dsdt_15cpu_len = 0,
-        .pm1a_evt = ACPI_PM1A_EVT_BLK_ADDRESS_V1,
-        .pm1a_cnt = ACPI_PM1A_CNT_BLK_ADDRESS_V1,
-        .pm_tmr = ACPI_PM_TMR_BLK_ADDRESS_V1,
-        .gpe0 = ACPI_GPE0_BLK_ADDRESS_V1,
-        .gpe0_len = ACPI_GPE0_BLK_LEN_V1,
     };
 
     hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 1);

diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 82171252a1fc5a6c4f04c52a1d92680beb47198a..934b566a5dbb7f360d7cda14ae6c07eb5129129c 100644 (file)
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -905,11 +905,6 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
         config->dsdt_anycpu_len = dsdt_anycpu_len;
         config->dsdt_15cpu = dsdt_15cpu;
         config->dsdt_15cpu_len = dsdt_15cpu_len;
-        config->pm1a_evt = ACPI_PM1A_EVT_BLK_ADDRESS_V0;
-        config->pm1a_cnt = ACPI_PM1A_CNT_BLK_ADDRESS_V0;
-        config->pm_tmr = ACPI_PM_TMR_BLK_ADDRESS_V0;
-        config->gpe0 = ACPI_GPE0_BLK_ADDRESS_V0;
-        config->gpe0_len = ACPI_GPE0_BLK_LEN_V0;
 
         hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 0);
     }
@@ -919,11 +914,6 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
         config->dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len;
         config->dsdt_15cpu = NULL;
         config->dsdt_15cpu_len = 0;
-        config->pm1a_evt = ACPI_PM1A_EVT_BLK_ADDRESS_V1;
-        config->pm1a_cnt = ACPI_PM1A_CNT_BLK_ADDRESS_V1;
-        config->pm_tmr = ACPI_PM_TMR_BLK_ADDRESS_V1;
-        config->gpe0 = ACPI_GPE0_BLK_ADDRESS_V1;
-        config->gpe0_len = ACPI_GPE0_BLK_LEN_V1;
 
         hvm_param_set(HVM_PARAM_ACPI_IOPORTS_LOCATION, 1);
     }

diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
index 50242f34c598ba607106179d9b88b84853d74380..f9881c96047ffa1a7f1ffd5eb65e424d5b5baca3 100644 (file)
--- a/tools/libacpi/build.c
+++ b/tools/libacpi/build.c
@@ -536,15 +536,6 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
         acpi_info->pci_hi_len = config->pci_hi_len;
     }
 
-    /*
-     * Set location of the control/event registers.
-     */
-    Fadt.pm1a_evt_blk = config->pm1a_evt;
-    Fadt.pm1a_cnt_blk = config->pm1a_cnt;
-    Fadt.pm_tmr_blk = config->pm_tmr;
-    Fadt.gpe0_blk = config->gpe0;
-    Fadt.gpe0_blk_len = config->gpe0_len;
-
     /*
      * Fill in high-memory data structures, starting at @buf.
      */

diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h
index 2c56fb764603210f53d8c18d46176b913db7aa50..2ed1ecfc8e3a88fe3ad362486ba5a44829a3bc8c 100644 (file)
--- a/tools/libacpi/libacpi.h
+++ b/tools/libacpi/libacpi.h
@@ -96,13 +96,6 @@ struct acpi_config {
     uint32_t ioapic_base_address;
     uint16_t pci_isa_irq_mask;
     uint8_t ioapic_id;
-
-    /* Location of the control/event registers */
-    uint32_t pm1a_evt;
-    uint32_t pm1a_cnt;
-    uint32_t pm_tmr;
-    uint32_t gpe0;
-    uint8_t gpe0_len;
 };
 
 int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config);