summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2003-09-26 16:12:23 +0000
committerRonald G. Minnich <rminnich@gmail.com>2003-09-26 16:12:23 +0000
commit430111b9d1472ef72d9960020eb3eb28e276ca7e (patch)
tree2c2f73a131983260260fb6abb4172378cfa3afbb /src/cpu
parentaa4b4e031f9f48840aca3c4961d3edf59701eea7 (diff)
It builds!
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1150 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/p6/cpufixup.c43
1 files changed, 27 insertions, 16 deletions
diff --git a/src/cpu/p6/cpufixup.c b/src/cpu/p6/cpufixup.c
index f3d614b734..e5cd3fc017 100644
--- a/src/cpu/p6/cpufixup.c
+++ b/src/cpu/p6/cpufixup.c
@@ -1,18 +1,13 @@
/* microcode.c: Microcode update for PIII and later CPUS
*
- * $Id$
*/
-
-#ifndef lint
-static char rcsid[] = "$Id$";
-#endif
-
-#include <pciconf.h>
-#include <subr.h>
+#include <console/console.h>
+#include <mem.h>
#include <cpu/p6/msr.h>
-#include <printk.h>
#include <cpu/p5/cpuid.h>
-#include <cpu/cpufixup.h>
+#include <cpu/k8/mtrr.h>
+#include <device/device.h>
+#include <device/chip.h>
struct microcode {
unsigned int hdrver;
@@ -300,24 +295,33 @@ unsigned int microcode_updates [] = {
0x57688086, 0x218e4005, 0xca054e3d, 0xc1a3c3ec,
};
+
static void display_cpuid_update_microcode(void)
{
unsigned int eax, ebx, ecx, edx;
unsigned int pf, rev, sig, val[2];
unsigned int x86_model, x86_family, i;
struct microcode *m;
-
+ msr_t msr;
/* cpuid sets msr 0x8B iff a microcode update has been loaded. */
- wrmsr(0x8B, 0, 0);
+ //wrmsr(0x8B, 0, 0);
+ msr.lo = msr.hi = 0;
+ wrmsr(0x8b, msr);
cpuid(1, &eax, &ebx, &ecx, &edx);
- rdmsr(0x8B, val[0], rev);
+ //rdmsr(0x8B, val[0], rev);
+ msr = rdmsr(0x8b);
+ val[0] = msr.lo;
+ rev = msr.hi;
x86_model = (eax >>4) & 0x0f;
x86_family = (eax >>8) & 0x0f;
sig = eax;
pf = 0;
if ((x86_model >= 5)||(x86_family>6)) {
- rdmsr(0x17, val[0], val[1]);
+ //rdmsr(0x17, val[0], val[1]);
+ msr = rdmsr(0x17);
+ val[0] = msr.lo;
+ val[1] = msr.hi;
pf = 1 << ((val[1] >> 18) & 7);
}
printk_debug("microcode_info: sig = 0x%08x pf=0x%08x rev = 0x%08x\n",
@@ -326,9 +330,16 @@ static void display_cpuid_update_microcode(void)
m = (void *)&microcode_updates;
for(i = 0; i < sizeof(microcode_updates)/sizeof(struct microcode); i++) {
if ((m[i].sig == sig) && (m[i].pf == pf)) {
- wrmsr(0x79, (unsigned int)&m[i].bits, 0);
+ //wrmsr(0x79, (unsigned int)&m[i].bits, 0);
+ msr.lo = (unsigned int)&m[i].bits;
+ msr.hi = 0;
+ wrmsr(0x79, msr);
+
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
- rdmsr(0x8B, val[0], val[1]);
+ //rdmsr(0x8B, val[0], val[1]);
+ msr = rdmsr(0x8b);
+ val[0] = msr.lo;
+ val[1] = msr.hi;
printk_info("microcode updated from revision %d to %d\n",
rev, val[1]);
}