printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / intel / d945gclf / acpi_tables.c

diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
index 7439b7979a82f102758456811313d9219b6c2cc0..6b2956d387b951eb1b2eefbd1f365b15dff401db 100644 (file)
--- a/src/mainboard/intel/d945gclf/acpi_tables.c
+++ b/src/mainboard/intel/d945gclf/acpi_tables.c
@@ -5,8 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
+ * published by the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <types.h>
@@ -37,8 +35,6 @@ extern unsigned char AmlCode[];
 #if CONFIG_HAVE_ACPI_SLIC
 unsigned long acpi_create_slic(unsigned long current);
 #endif
-void generate_cpu_entries(void); // from cpu/intel/speedstep
-unsigned long acpi_fill_mcfg(unsigned long current); // from northbridge/intel/i945
 
 #if OLD_ACPI
 typedef struct acpi_oemb {
@@ -194,7 +190,9 @@ unsigned long acpi_fill_srat(unsigned long current)
        return current;
 }
 
+#if CONFIG_HAVE_SMI_HANDLER
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
+#endif
 
 #define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
 unsigned long write_acpi_tables(unsigned long start)
@@ -223,7 +221,7 @@ unsigned long write_acpi_tables(unsigned long start)
        /* Align ACPI tables to 16byte */
        ALIGN_CURRENT;
 
-       printk_info("ACPI: Writing ACPI tables at %lx.\n", start);
+       printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start);
 
        /* We need at least an RSDP and an RSDT Table */
        rsdp = (acpi_rsdp_t *) current;
@@ -242,7 +240,7 @@ unsigned long write_acpi_tables(unsigned long start)
        /*
         * We explicitly add these tables later on:
         */
-       printk_debug("ACPI:    * HPET\n");
+       printk(BIOS_DEBUG, "ACPI:    * HPET\n");
 
        hpet = (acpi_hpet_t *) current;
        current += sizeof(acpi_hpet_t);
@@ -251,7 +249,7 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_add_table(rsdp, hpet);
 
        /* If we want to use HPET Timers Linux wants an MADT */
-       printk_debug("ACPI:    * MADT\n");
+       printk(BIOS_DEBUG, "ACPI:    * MADT\n");
 
        madt = (acpi_madt_t *) current;
        acpi_create_madt(madt);
@@ -259,7 +257,7 @@ unsigned long write_acpi_tables(unsigned long start)
        ALIGN_CURRENT;
        acpi_add_table(rsdp, madt);
 
-       printk_debug("ACPI:    * MCFG\n");
+       printk(BIOS_DEBUG, "ACPI:    * MCFG\n");
        mcfg = (acpi_mcfg_t *) current;
        acpi_create_mcfg(mcfg);
        current += mcfg->header.length;
@@ -267,7 +265,7 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_add_table(rsdp, mcfg);
 
 #if OLD_ACPI
-       printk_debug("ACPI:    * OEMB\n");
+       printk(BIOS_DEBUG, "ACPI:    * OEMB\n");
        oemb=(acpi_oemb_t *)current;
        current += sizeof(acpi_oemb_t);
        ALIGN_CURRENT;
@@ -275,7 +273,7 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_add_table(rsdp, oemb);
 #endif
 
-       printk_debug("ACPI:     * FACS\n");
+       printk(BIOS_DEBUG, "ACPI:     * FACS\n");
        facs = (acpi_facs_t *) current;
        current += sizeof(acpi_facs_t);
        ALIGN_CURRENT;
@@ -289,7 +287,7 @@ unsigned long write_acpi_tables(unsigned long start)
 #if OLD_ACPI
        for (i=0; i < dsdt->length; i++) {
                if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBEEF) {
-                       printk_debug("ACPI: Patching up DSDT at offset 0x%04x -> 0x%08x\n", i, 0x24 + (u32)oemb);
+                       printk(BIOS_DEBUG, "ACPI: Patching up DSDT at offset 0x%04x -> 0x%08x\n", i, 0x24 + (u32)oemb);
                        *(u32*)(((u32)dsdt) + i) = 0x24 + (u32)oemb;
                        break;
                }
@@ -301,7 +299,7 @@ unsigned long write_acpi_tables(unsigned long start)
        /* Pack GNVS into the ACPI table area */
        for (i=0; i < dsdt->length; i++) {
                if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) {
-                       printk_debug("ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, current);
+                       printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, current);
                        *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes
                        break;
                }
@@ -313,25 +311,27 @@ unsigned long write_acpi_tables(unsigned long start)
        current += 0x100;
        ALIGN_CURRENT;
 
+#if CONFIG_HAVE_SMI_HANDLER
        /* And tell SMI about it */
        smm_setup_structures((void *)current, NULL, NULL);
+#endif
 
        /* We patched up the DSDT, so we need to recalculate the checksum */
        dsdt->checksum = 0;
        dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length);
 
-       printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
+       printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n", dsdt,
                     dsdt->length);
 
 #if CONFIG_HAVE_ACPI_SLIC
-       printk_debug("ACPI:     * SLIC\n");
+       printk(BIOS_DEBUG, "ACPI:     * SLIC\n");
        slic = (acpi_header_t *)current;
        current += acpi_create_slic(current);
        ALIGN_CURRENT;
        acpi_add_table(rsdp, slic);
 #endif
 
-       printk_debug("ACPI:     * FADT\n");
+       printk(BIOS_DEBUG, "ACPI:     * FADT\n");
        fadt = (acpi_fadt_t *) current;
        current += sizeof(acpi_fadt_t);
        ALIGN_CURRENT;
@@ -339,15 +339,15 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_create_fadt(fadt, facs, dsdt);
        acpi_add_table(rsdp, fadt);
 
-       printk_debug("ACPI:     * SSDT\n");
+       printk(BIOS_DEBUG, "ACPI:     * SSDT\n");
        ssdt = (acpi_header_t *)current;
        acpi_create_ssdt_generator(ssdt, "DYNADATA");
        current += ssdt->length;
        acpi_add_table(rsdp, ssdt);
 
-       printk_debug("current = %lx\n", current);
+       printk(BIOS_DEBUG, "current = %lx\n", current);
 
-       printk_debug("ACPI:     * DMI (Linux workaround)\n");
+       printk(BIOS_DEBUG, "ACPI:     * DMI (Linux workaround)\n");
        memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE);
 #if CONFIG_WRITE_HIGH_TABLES == 1
        memcpy((void *)current, dmi_table, DMI_TABLE_SIZE);
@@ -355,6 +355,6 @@ unsigned long write_acpi_tables(unsigned long start)
        ALIGN_CURRENT;
 #endif
 
-       printk_info("ACPI: done.\n");
+       printk(BIOS_INFO, "ACPI: done.\n");
        return current;
 }