1 files changed, 1 insertions, 128 deletions

diff --git a/src/fw/acpi.c b/src/fw/acpi.c
index 042d571..340ea9d 100644
--- a/src/fw/acpi.c
+++ b/src/fw/acpi.c
@@ -19,12 +19,9 @@
 #include "string.h" // memset
 #include "util.h" // MaxCountCPUs
 #include "x86.h" // readl
-#include "romfile_loader.h" // romfile_loader_execute
 
 #include "src/fw/acpi-dsdt.hex"
 
-u32 acpi_pm1a_cnt VARFSEG;
-
 static void
 build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev)
 {
@@ -73,7 +70,7 @@ static void piix4_fadt_setup(struct pci_device *pci, void *arg)
 }
 
 /* PCI_VENDOR_ID_INTEL && PCI_DEVICE_ID_INTEL_ICH9_LPC */
-void ich9_lpc_fadt_setup(struct pci_device *dev, void *arg)
+static void ich9_lpc_fadt_setup(struct pci_device *dev, void *arg)
 {
     struct fadt_descriptor_rev1 *fadt = arg;
 
@@ -592,32 +589,10 @@ static const struct pci_device_id acpi_find_tbl[] = {
     PCI_DEVICE_END,
 };
 
-struct rsdp_descriptor *RsdpAddr;
-
 #define MAX_ACPI_TABLES 20
 void
 acpi_setup(void)
 {
-    if (CONFIG_FW_ROMFILE_LOAD) {
-        int loader_err;
-
-        dprintf(3, "load ACPI tables\n");
-
-        loader_err = romfile_loader_execute("etc/table-loader");
-
-        RsdpAddr = find_acpi_rsdp();
-
-        if (RsdpAddr)
-            return;
-
-        /* If present, loader should have installed an RSDP.
-         * Not installed? We might still be able to continue
-         * using the builtin RSDP.
-         */
-        if (!loader_err)
-            warn_internalerror();
-    }
-
     if (! CONFIG_ACPI)
         return;
 
@@ -714,105 +689,3 @@ acpi_setup(void)
     RsdpAddr = rsdp;
     dprintf(1, "ACPI tables: RSDP=%p RSDT=%p\n", rsdp, rsdt);
 }
-
-static struct fadt_descriptor_rev1 *
-find_fadt(void)
-{
-    dprintf(4, "rsdp=%p\n", RsdpAddr);
-    if (!RsdpAddr || RsdpAddr->signature != RSDP_SIGNATURE)
-        return NULL;
-    struct rsdt_descriptor_rev1 *rsdt = (void*)RsdpAddr->rsdt_physical_address;
-    dprintf(4, "rsdt=%p\n", rsdt);
-    if (!rsdt || rsdt->signature != RSDT_SIGNATURE)
-        return NULL;
-    void *end = (void*)rsdt + rsdt->length;
-    int i;
-    for (i=0; (void*)&rsdt->table_offset_entry[i] < end; i++) {
-        struct fadt_descriptor_rev1 *fadt = (void*)rsdt->table_offset_entry[i];
-        if (!fadt || fadt->signature != FACP_SIGNATURE)
-            continue;
-        dprintf(4, "fadt=%p\n", fadt);
-        return fadt;
-    }
-    dprintf(4, "no fadt found\n");
-    return NULL;
-}
-
-u32
-find_resume_vector(void)
-{
-    struct fadt_descriptor_rev1 *fadt = find_fadt();
-    if (!fadt)
-        return 0;
-    struct facs_descriptor_rev1 *facs = (void*)fadt->firmware_ctrl;
-    dprintf(4, "facs=%p\n", facs);
-    if (! facs || facs->signature != FACS_SIGNATURE)
-        return 0;
-    // Found it.
-    dprintf(4, "resume addr=%d\n", facs->firmware_waking_vector);
-    return facs->firmware_waking_vector;
-}
-
-void
-find_acpi_features(void)
-{
-    struct fadt_descriptor_rev1 *fadt = find_fadt();
-    if (!fadt)
-        return;
-    u32 pm_tmr = le32_to_cpu(fadt->pm_tmr_blk);
-    u32 pm1a_cnt = le32_to_cpu(fadt->pm1a_cnt_blk);
-    dprintf(4, "pm_tmr_blk=%x\n", pm_tmr);
-    if (pm_tmr)
-        pmtimer_setup(pm_tmr);
-    if (pm1a_cnt)
-        acpi_pm1a_cnt = pm1a_cnt;
-
-    // Theoretically we should check the 'reset_reg_sup' flag, but Windows
-    // doesn't and thus nobody seems to *set* it. If the table is large enough
-    // to include it, let the sanity checks in acpi_set_reset_reg() suffice.
-    if (fadt->length >= 129) {
-        void *p = fadt;
-        acpi_set_reset_reg(p + 116, *(u8 *)(p + 128));
-    }
-}
-
-static struct acpi_20_generic_address acpi_reset_reg;
-static u8 acpi_reset_val;
-
-#define acpi_ga_to_bdf(addr) pci_to_bdf(0, (addr >> 32) & 0xffff, (addr >> 16) & 0xffff)
-
-void
-acpi_reboot(void)
-{
-    // Check it passed the sanity checks in acpi_set_reset_reg() and was set
-    if (acpi_reset_reg.register_bit_width != 8)
-        return;
-
-    u64 addr = le64_to_cpu(acpi_reset_reg.address);
-
-    dprintf(1, "ACPI hard reset %d:%llx (%x)\n",
-            acpi_reset_reg.address_space_id, addr, acpi_reset_val);
-
-    switch (acpi_reset_reg.address_space_id) {
-    case 0: // System Memory
-	writeb((void *)(u32)addr, acpi_reset_val);
-        break;
-    case 1: // System I/O
-        outb(acpi_reset_val, addr);
-        break;
-    case 2: // PCI config space
-        pci_config_writeb(acpi_ga_to_bdf(addr), addr & 0xffff, acpi_reset_val);
-        break;
-    }
-}
-
-void
-acpi_set_reset_reg(struct acpi_20_generic_address *reg, u8 val)
-{
-    if (!reg || reg->address_space_id > 2 ||
-        reg->register_bit_width != 8 || reg->register_bit_offset)
-        return;
-
-    acpi_reset_reg = *reg;
-    acpi_reset_val = val;
-}