Rename find_pmtimer() to find_acpi_features()

I'm about to make it do more than just the pmtimer...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/src/acpi.c b/src/acpi.c
index c7177c300369090ecf41769a481d858772e40af6..36bd39a068c9234ba001e3bb065e9576605cff11 100644 (file)
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -925,15 +925,13 @@ find_resume_vector(void)
 }
 
 void
-find_pmtimer(void)
+find_acpi_features(void)
 {
     struct fadt_descriptor_rev1 *fadt = find_fadt();
     if (!fadt)
         return;
-    u32 pm_tmr = fadt->pm_tmr_blk;
+    u32 pm_tmr = le32_to_cpu(fadt->pm_tmr_blk);
     dprintf(4, "pm_tmr_blk=%x\n", pm_tmr);
-    if (!pm_tmr)
-        return;
-
-    pmtimer_setup(pm_tmr, 3579);
+    if (pm_tmr)
+        pmtimer_setup(pm_tmr, 3579);
 }

diff --git a/src/acpi.h b/src/acpi.h
index e52470eb3d150e685e4d705fac5bfff88d7258f7..b23717af6885e044452675fb645ebf08a0266556 100644 (file)
--- a/src/acpi.h
+++ b/src/acpi.h
@@ -5,7 +5,7 @@
 
 void acpi_setup(void);
 u32 find_resume_vector(void);
-void find_pmtimer(void);
+void find_acpi_features(void);
 
 #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "
 

diff --git a/src/coreboot.c b/src/coreboot.c
index f0484e1b71cd3cf6712dad81354fde6dfe361601..c9ad2a87bf0f5bdfcf1ce565c5e1df98503146fb 100644 (file)
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -12,7 +12,7 @@
 #include "boot.h" // boot_add_cbfs
 #include "disk.h" // MAXDESCSIZE
 #include "config.h" // CONFIG_*
-#include "acpi.h" // find_pmtimer
+#include "acpi.h" // find_acpi_features
 #include "pci.h" // pci_probe_devices
 
 
@@ -214,7 +214,7 @@ coreboot_platform_setup(void)
             scan_tables(m->start, m->size);
     }
 
-    find_pmtimer();
+    find_acpi_features();
 }
 
 

diff --git a/src/csm.c b/src/csm.c
index 68f8830b9dd03b482b7ea84d647abc4ee8c21499..4336e16ee3df41065f244d49316494a16b5ae53c 100644 (file)
--- a/src/csm.c
+++ b/src/csm.c
@@ -146,12 +146,12 @@ handle_csm_0002(struct bregs *regs)
         dprintf(3, "CSM PIRQ table at %p\n", PirAddr);
     }
 
-    // For find_resume_vector()... and find_pmtimer()
+    // For find_resume_vector()... and find_acpi_features()
     if (csm_rsdp.signature == RSDP_SIGNATURE) {
         RsdpAddr = &csm_rsdp;
         dprintf(3, "CSM ACPI RSDP at %p\n", RsdpAddr);
 
-        find_pmtimer();
+        find_acpi_features();
     }
 
     // SMBIOS table needs to be copied into the f-seg

diff --git a/src/xen.c b/src/xen.c
index db542c3a8b99bd5b6e18f23f8e31dea6eb620a9f..5dfee9e6f16ea1090b064e34bb9bf6e07c86a1fa 100644 (file)
--- a/src/xen.c
+++ b/src/xen.c
@@ -10,7 +10,7 @@
 #include "memmap.h" // add_e820
 #include "types.h" // ASM32FLAT
 #include "util.h" // copy_acpi_rsdp
-#include "acpi.h" // find_pmtimer
+#include "acpi.h" // find_acpi_features
 
 #define INFO_PHYSICAL_ADDRESS 0x00001000
 
@@ -125,7 +125,7 @@ void xen_biostable_setup(void)
     for (i=0; i<info->tables_nr; i++)
         copy_table(tables[i]);
 
-    find_pmtimer();
+    find_acpi_features();
 }
 
 void xen_ramsize_preinit(void)