MTRR: get physical address size from CPUID

[coreboot.git] / src / cpu / via / model_c7 / model_c7_init.c

diff --git a/src/cpu/via/model_c7/model_c7_init.c b/src/cpu/via/model_c7/model_c7_init.c
index d9d59d1c58c1d442d65d5125217175c6e36696fd..585f7494b8ce6fce90391333c1f004e76cd57bd5 100644 (file)
--- a/src/cpu/via/model_c7/model_c7_init.c
+++ b/src/cpu/via/model_c7/model_c7_init.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of the coreboot project.
- * 
+ *
  * (C) 2007-2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or
@@ -23,20 +23,18 @@
 #include <console/console.h>
 #include <delay.h>
 #include <stdlib.h>
-
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 #define MSR_IA32_PERF_STATUS   0x00000198
 #define MSR_IA32_PERF_CTL      0x00000199
 #define MSR_IA32_MISC_ENABLE   0x000001a0
 
 static int c7a_speed_translation[] = {
-//      LFM     HFM             
+//      LFM     HFM
        0x0409, 0x0f13,         // 400MHz, 844mV --> 1500MHz, 1.004V    C7-M
        0x0409, 0x1018,         // 400MHz, 844mV --> 1600MHz, 1.084V
        0x0409, 0x0c18,         // 533MHz, 844mV --> 1600MHz, 1.084V
@@ -51,7 +49,7 @@ static int c7a_speed_translation[] = {
 };
 
 static int c7d_speed_translation[] = {
-//      LFM     HFM             
+//      LFM     HFM
        0x0409, 0x1018,         // 400MHz, 844mV --> 1600MHz, 1.084V    C7-M
        0x0409, 0x121f,         // 400MHz, 844mV --> 1800MHz, 1.196V
        0x0809, 0x121f,         // 800MHz, 844mV --> 1800MHz, 1.196V
@@ -68,7 +66,7 @@ static int c7d_speed_translation[] = {
 static void set_c7_speed(int model) {
        int cnt, current, new, i;
        msr_t msr;
-       printk_debug("Enabling improved C7 clock and voltage.\n");
+       printk(BIOS_DEBUG, "Enabling improved C7 clock and voltage.\n");
 
        // Enable Speedstep
        msr = rdmsr(MSR_IA32_MISC_ENABLE);
@@ -77,16 +75,16 @@ static void set_c7_speed(int model) {
 
        msr = rdmsr(MSR_IA32_PERF_STATUS);
 
-       printk_info("Voltage: %dmV (min %dmV; max %dmV)\n",
+       printk(BIOS_INFO, "Voltage: %dmV (min %dmV; max %dmV)\n",
                    ((int)(msr.lo & 0xff) * 16 + 700),
                    ((int)((msr.hi >> 16) & 0xff) * 16 + 700),
                    ((int)(msr.hi & 0xff) * 16 + 700));
 
-       printk_info("CPU multiplier: %dx (min %dx; max %dx)\n",
+       printk(BIOS_INFO, "CPU multiplier: %dx (min %dx; max %dx)\n",
                    (int)((msr.lo >> 8) & 0xff),
                    (int)((msr.hi >> 24) & 0xff), (int)((msr.hi >> 8) & 0xff));
 
-       printk_debug(" msr.lo = %x\n", msr.lo);
+       printk(BIOS_DEBUG, " msr.lo = %x\n", msr.lo);
 
        /* Wait while CPU is busy */
        cnt = 0;
@@ -95,7 +93,7 @@ static void set_c7_speed(int model) {
                msr = rdmsr(MSR_IA32_PERF_STATUS);
                cnt++;
                if (cnt > 128) {
-                       printk_warning("Could not update multiplier and voltage.\n");
+                       printk(BIOS_WARNING, "Could not update multiplier and voltage.\n");
                        return;
                }
        }
@@ -129,7 +127,7 @@ static void set_c7_speed(int model) {
 
        msr.lo = new;
        msr.hi = 0;
-       printk_debug(" new msr.lo = %x\n", msr.lo);
+       printk(BIOS_DEBUG, " new msr.lo = %x\n", msr.lo);
 
        wrmsr(MSR_IA32_PERF_CTL, msr);
 
@@ -140,13 +138,13 @@ static void set_c7_speed(int model) {
                msr = rdmsr(MSR_IA32_PERF_STATUS);
                cnt++;
                if (cnt > 128) {
-                       printk_warning("Error while updating multiplier and voltage\n");
+                       printk(BIOS_WARNING, "Error while updating multiplier and voltage\n");
                        break;
                }
        } while (msr.lo & ((1 << 16) | (1 << 17)));
 
-       printk_info("Current voltage: %dmV\n", ((int)(msr.lo & 0xff) * 16 + 700));
-       printk_info("Current CPU multiplier: %dx\n", (int)((msr.lo >> 8) & 0xff));
+       printk(BIOS_INFO, "Current voltage: %dmV\n", ((int)(msr.lo & 0xff) * 16 + 700));
+       printk(BIOS_INFO, "Current CPU multiplier: %dx\n", (int)((msr.lo >> 8) & 0xff));
 }
 
 static void model_c7_init(device_t dev)
@@ -157,39 +155,39 @@ static void model_c7_init(device_t dev)
 
        get_fms(&c, dev->device);
 
-       printk_info("Detected VIA ");
+       printk(BIOS_INFO, "Detected VIA ");
 
        switch (c.x86_model) {
        case 10:
                msr = rdmsr(0x1153);
                brand = (((msr.lo >> 2) ^ msr.lo) >> 18) & 3;
-               printk_info("Model A ");
+               printk(BIOS_INFO, "Model A ");
                break;
        case 13:
                msr = rdmsr(0x1154);
                brand = (((msr.lo >> 4) ^ (msr.lo >> 2))) & 0x000000ff;
-               printk_info("Model D ");
+               printk(BIOS_INFO, "Model D ");
                break;
        default:
-               printk_info("Model Unknown ");
+               printk(BIOS_INFO, "Model Unknown ");
                brand = 0xff;
        }
 
        switch (brand) {
        case 0:
-               printk_info("C7-M\n");
+               printk(BIOS_INFO, "C7-M\n");
                break;
        case 1:
-               printk_info("C7\n");
+               printk(BIOS_INFO, "C7\n");
                break;
        case 2:
-               printk_info("Eden\n");
+               printk(BIOS_INFO, "Eden\n");
                break;
        case 3:
-               printk_info("C7-D\n");
+               printk(BIOS_INFO, "C7-D\n");
                break;
        default:
-               printk_info("%02x (please report)\n", brand);
+               printk(BIOS_INFO, "%02x (please report)\n", brand);
        }
 
        /* Gear up */
@@ -204,7 +202,7 @@ static void model_c7_init(device_t dev)
        x86_enable_cache();
 
        /* Set up Memory Type Range Registers */
-       x86_setup_mtrrs(36);
+       x86_setup_mtrrs();
        x86_mtrr_check();
 
        /* Enable the local cpu apics */
@@ -215,7 +213,7 @@ static struct device_operations cpu_dev_ops = {
        .init = model_c7_init,
 };
 
-/* Look in arch/i386/lib/cpu.c:cpu_initialize. If there is no CPU with an exact
+/* Look in arch/x86/lib/cpu.c:cpu_initialize. If there is no CPU with an exact
  * ID, the cpu mask (stepping) is masked out and the check is repeated. This
  * allows us to keep the table significantly smaller.
  */