printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / cpu / amd / model_10xxx / update_microcode.c

diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c
index 32d7750dcc9366bcf8dba3cff9aad7ae3ed596c5..85b1aa84bfd92ab5b980cac0656f76353a1681b4 100644 (file)
--- a/src/cpu/amd/model_10xxx/update_microcode.c
+++ b/src/cpu/amd/model_10xxx/update_microcode.c
@@ -18,7 +18,7 @@
  */
 
 
-#ifndef __ROMCC__
+#ifndef __PRE_RAM__
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -29,16 +29,26 @@
 
 static const u8 microcode_updates[] __attribute__ ((aligned(16))) = {
 
-#ifdef __ROMCC__
+#ifdef __PRE_RAM__
 
-       // Barcelona rev Ax
-//             #include "mc_patch_01000020.h"
-
-       // Barcelona rev B0, B1, BA
-//             #include "mc_patch_01000066.h"
+/* From the Revision Guide :
+ * Equivalent Processor Table for AMD Family 10h Processors
+ *
+ * Installed Processor   Equivalent Processor   Patch Level
+ * Revision ID           Revision ID
+ * 00100F00h             1000h                  01000020h
+ * 00100F01h             1000h                  01000020h
+ * 00100F02h             1000h                  01000020h
+ * 00100F20h             1020h                  01000096h
+ * 00100F21h (DR-B1)     1020h                  01000096h
+ * 00100F2Ah (DR-BA)     1020h                  01000096h
+ * 00100F22h (DR-B2)     1022h                  01000095h
+ * 00100F23h (DR-B3)     1022h                  01000095h
+ * 00100F42h (RB-C2)     1041h                  01000086h
+ * 00100F62h (DA-C2)     1062h                  0100009Fh
+ */
 
-       // Barcelona rev B2, B3
-               #include "mc_patch_01000065.h"
+#include CONFIG_AMD_UCODE_PATCH_FILE
 
 #endif
        /*  Dummy terminator  */
@@ -58,6 +68,8 @@ static u32 get_equivalent_processor_rev_id(u32 orig_id) {
                0x100f2A, 0x1020,
                0x100f22, 0x1022,
                0x100f23, 0x1022,
+               0x100f42, 0x1041,
+               0x100f62, 0x1062,
        };
 
        u32 new_id;
@@ -85,7 +97,7 @@ void update_microcode(u32 cpu_deviceid)
        if (equivalent_processor_rev_id != 0) {
                amd_update_microcode((void *) microcode_updates, equivalent_processor_rev_id);
        } else {
-               printk_debug("microcode: rev id not found. Skipping microcode patch!\n");
+               printk(BIOS_DEBUG, "microcode: rev id not found. Skipping microcode patch!\n");
        }
 
 }