diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-22 11:42:32 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-22 11:42:32 +0000 |
commit | c02b4fc9db3c3c1e263027382697b566127f66bb (patch) | |
tree | 11bd18488e360e5c1beeb9ccb852ef4489c3689a /src/cpu/amd/model_fxx | |
parent | 27852aba6787617ca5656995cbc7e8ef0a3ea22c (diff) |
printk_foo -> printk(BIOS_FOO, ...)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd/model_fxx')
-rw-r--r-- | src/cpu/amd/model_fxx/fidvid.c | 24 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/init_cpus.c | 10 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/model_fxx_init.c | 20 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/powernow_acpi.c | 16 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/processor_name.c | 2 |
5 files changed, 36 insertions, 36 deletions
diff --git a/src/cpu/amd/model_fxx/fidvid.c b/src/cpu/amd/model_fxx/fidvid.c index 47ddbdf44c..59cb5460d2 100644 --- a/src/cpu/amd/model_fxx/fidvid.c +++ b/src/cpu/amd/model_fxx/fidvid.c @@ -15,21 +15,21 @@ static inline void print_debug_fv(const char *str, unsigned val) { #if K8_SET_FIDVID_DEBUG == 1 - printk_debug("%s%x\r\n", str, val); + printk(BIOS_DEBUG, "%s%x\r\n", str, val); #endif } static inline void print_debug_fv_8(const char *str, unsigned val) { #if K8_SET_FIDVID_DEBUG == 1 - printk_debug("%s%02x\r\n", str, val); + printk(BIOS_DEBUG, "%s%02x\r\n", str, val); #endif } static inline void print_debug_fv_64(const char *str, unsigned val, unsigned val2) { #if K8_SET_FIDVID_DEBUG == 1 - printk_debug("%s%x%x\r\n", str, val, val2); + printk(BIOS_DEBUG, "%s%x%x\r\n", str, val, val2); #endif } @@ -131,7 +131,7 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) apicidx = lapicid(); if (apicid != apicidx) { - printk_err("wrong apicid, we want change %x, but it is %x\r\n", apicid, apicidx); + printk(BIOS_ERR, "wrong apicid, we want change %x, but it is %x\r\n", apicid, apicidx); return fidvid; } @@ -201,8 +201,8 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) * transition to target fid */ - printk_debug("Current fid_cur: 0x%x, fid_max: 0x%x\n", fid_cur, fid_max); - printk_debug("Requested fid_new: 0x%x\n", fid_new); + printk(BIOS_DEBUG, "Current fid_cur: 0x%x, fid_max: 0x%x\n", fid_cur, fid_max); + printk(BIOS_DEBUG, "Requested fid_new: 0x%x\n", fid_new); step_limit = 8; /* max 8 steps just in case... */ while ((fid_cur != fid_new) && (step_limit--)) { @@ -218,7 +218,7 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) /* If 200Mhz step OR past 3200 max table value */ if ((step == 2) || (fid_new >= 0x18 || fid_cur >= 0x18)) { - printk_debug("200MHZ step "); + printk(BIOS_DEBUG, "200MHZ step "); /* Step +/- 200MHz at a time */ if (fid_cur < fid_new) @@ -231,7 +231,7 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) int temp; /* look it up in the table */ - printk_debug("FidVid table step "); + printk(BIOS_DEBUG, "FidVid table step "); temp = next_fid_200[((fid_new/2) * 13) + (fid_cur/2)]; @@ -243,7 +243,7 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) break; /* table error */ } else { /* step < 2 (100MHZ) */ - printk_debug("100MHZ step "); + printk(BIOS_DEBUG, "100MHZ step "); /* The table adjust in 200MHz increments. If requested, * do the 100MHz increment if the CPU supports it.*/ @@ -251,17 +251,17 @@ static u32 set_fidvid(unsigned apicid, unsigned fidvid, int showmessage) fid_temp = fid_cur + 1; } else { /* 100 MHZ not supported. Get out of the loop */ - printk_debug("is not supported.\n"); + printk(BIOS_DEBUG, "is not supported.\n"); break; } } if(fid_temp > fid_max) { - printk_debug("fid_temp 0x%x > fid_max 0x%x\n", fid_temp, fid_max); + printk(BIOS_DEBUG, "fid_temp 0x%x > fid_max 0x%x\n", fid_temp, fid_max); break; } - printk_debug("fidvid: 0x%x\n", fid_temp); + printk(BIOS_DEBUG, "fidvid: 0x%x\n", fid_temp); /* set target fid */ msr.hi = 0x190; /* 2 us for AMD NPT Family 0Fh Processors */ diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c index 510c803ca9..847a8a7fa6 100644 --- a/src/cpu/amd/model_fxx/init_cpus.c +++ b/src/cpu/amd/model_fxx/init_cpus.c @@ -16,23 +16,23 @@ static inline void print_initcpu8 (const char *strval, unsigned val) { - printk_debug("%s%02x\r\n", strval, val); + printk(BIOS_DEBUG, "%s%02x\r\n", strval, val); } static inline void print_initcpu8_nocr (const char *strval, unsigned val) { - printk_debug("%s%02x", strval, val); + printk(BIOS_DEBUG, "%s%02x", strval, val); } static inline void print_initcpu16 (const char *strval, unsigned val) { - printk_debug("%s%04x\r\n", strval, val); + printk(BIOS_DEBUG, "%s%04x\r\n", strval, val); } static inline void print_initcpu(const char *strval, unsigned val) { - printk_debug("%s%08x\r\n", strval, val); + printk(BIOS_DEBUG, "%s%08x\r\n", strval, val); } typedef void (*process_ap_t)(unsigned apicid, void *gp); @@ -155,7 +155,7 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid); static inline __attribute__((always_inline)) void print_apicid_nodeid_coreid(unsigned apicid, struct node_core_id id, const char *str) { - printk_debug("%s --- { APICID = %02x NODEID = %02x COREID = %02x} ---\r\n", str, apicid, id.nodeid, id.coreid); + printk(BIOS_DEBUG, "%s --- { APICID = %02x NODEID = %02x COREID = %02x} ---\r\n", str, apicid, id.nodeid, id.coreid); } diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 4d9dc3328e..47eae695e8 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -150,16 +150,16 @@ static void print_mtrr_state(struct mtrr_state *state) { int i; for(i = 0; i < MTRR_COUNT; i++) { - printk_debug("var mtrr %d: %08x%08x mask: %08x%08x\n", + printk(BIOS_DEBUG, "var mtrr %d: %08x%08x mask: %08x%08x\n", i, state->mtrrs[i].base.hi, state->mtrrs[i].base.lo, state->mtrrs[i].mask.hi, state->mtrrs[i].mask.lo); } - printk_debug("top_mem: %08x%08x\n", + printk(BIOS_DEBUG, "top_mem: %08x%08x\n", state->top_mem.hi, state->top_mem.lo); - printk_debug("top_mem2: %08x%08x\n", + printk(BIOS_DEBUG, "top_mem2: %08x%08x\n", state->top_mem2.hi, state->top_mem2.lo); - printk_debug("def_type: %08x%08x\n", + printk(BIOS_DEBUG, "def_type: %08x%08x\n", state->def_type.hi, state->def_type.lo); } #endif @@ -214,7 +214,7 @@ static inline void clear_2M_ram(unsigned long basek, struct mtrr_state *mtrr_sta enable_lapic(); /* Print a status message */ - printk_debug("%c", (basek >= TOLM_KB)?'+':'-'); + printk(BIOS_DEBUG, "%c", (basek >= TOLM_KB)?'+':'-'); /* Return to the initialization state */ set_init_ecc_mtrrs(); @@ -232,7 +232,7 @@ static inline void clear_2M_ram(unsigned long basek, struct mtrr_state *mtrr_sta size = (limitk - basek) << 10; addr = map_2M_page(basek >> 11); if (addr == MAPPING_ERROR) { - printk_err("Cannot map page: %lx\n", basek >> 11); + printk(BIOS_ERR, "Cannot map page: %lx\n", basek >> 11); return; } @@ -276,14 +276,14 @@ static void init_ecc_memory(unsigned node_id) } else { pci_write_config32(f3_dev, SCRUB_CONTROL, (SCRUB_NONE << 16) | (SCRUB_NONE << 8) | (SCRUB_NONE << 0)); - printk_debug("Scrubbing Disabled\n"); + printk(BIOS_DEBUG, "Scrubbing Disabled\n"); } /* If ecc support is not enabled don't touch memory */ dcl = pci_read_config32(f2_dev, DRAM_CONFIG_LOW); if (!(dcl & DCL_DimmEccEn)) { - printk_debug("ECC Disabled\n"); + printk(BIOS_DEBUG, "ECC Disabled\n"); return; } @@ -313,7 +313,7 @@ static void init_ecc_memory(unsigned node_id) begink = (CONFIG_RAMTOP >>10); } - printk_debug("Clearing memory %luK - %luK: ", begink, endk); + printk(BIOS_DEBUG, "Clearing memory %luK - %luK: ", begink, endk); /* Save the normal state */ save_mtrr_state(&mtrr_state); @@ -362,7 +362,7 @@ static void init_ecc_memory(unsigned node_id) (SCRUB_84ms << 16) | (SCRUB_84ms << 8) | (SCRUB_84ms << 0)); } - printk_debug(" done\n"); + printk(BIOS_DEBUG, " done\n"); } diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c index 86d1c2d557..5339f3b5bf 100644 --- a/src/cpu/amd/model_fxx/powernow_acpi.c +++ b/src/cpu/amd/model_fxx/powernow_acpi.c @@ -156,14 +156,14 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) v[10] = cpuid1.ecx; v[11] = cpuid1.edx; processor_brand[48] = 0; - printk_info("processor_brand=%s\n", processor_brand); + printk(BIOS_INFO, "processor_brand=%s\n", processor_brand); /* * Based on the CPU socket type,cmp_cap and pwr_lmt , get the power limit. * socket_type : 0x10 SocketF; 0x11 AM2/ASB1 ; 0x12 S1G1 * cmp_cap : 0x0 SingleCore ; 0x1 DualCore */ - printk_info("Pstates Algorithm ...\n"); + printk(BIOS_INFO, "Pstates Algorithm ...\n"); cmp_cap = (pci_read_config16(dev_find_slot(0, PCI_DEVFN(0x18, 3)), 0xE8) & 0x3000) >> 12; @@ -181,7 +181,7 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) /* See if the CPUID(0x80000007) returned EDX[2:1]==11b */ cpuid1 = cpuid(0x80000007); if ((cpuid1.edx & 0x6) != 0x6) { - printk_info("No valid set of P-states\n"); + printk(BIOS_INFO, "No valid set of P-states\n"); goto write_pstates; } @@ -204,7 +204,7 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) PstateStep_coef = 2; if (IntPstateSup == 0) { - printk_info("No intermediate P-states are supported\n"); + printk(BIOS_INFO, "No intermediate P-states are supported\n"); goto write_pstates; } @@ -352,12 +352,12 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) /* Print Pstate freq,vid,volt,power */ for (index = 0; index < Pstate_num; index++) { - printk_info("Pstate_freq[%d] = %dMHz\t", index, + printk(BIOS_INFO, "Pstate_freq[%d] = %dMHz\t", index, Pstate_feq[index]); - printk_info("Pstate_vid[%d] = %d\t", index, Pstate_vid[index]); - printk_info("Pstate_volt[%d] = %dmv\t", index, + printk(BIOS_INFO, "Pstate_vid[%d] = %d\t", index, Pstate_vid[index]); + printk(BIOS_INFO, "Pstate_volt[%d] = %dmv\t", index, Pstate_volt[index]); - printk_info("Pstate_power[%d] = %dmw\n", index, + printk(BIOS_INFO, "Pstate_power[%d] = %dmw\n", index, Pstate_power[index]); } diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c index ce276ffcca..4d86467632 100644 --- a/src/cpu/amd/model_fxx/processor_name.c +++ b/src/cpu/amd/model_fxx/processor_name.c @@ -443,7 +443,7 @@ int init_processor_name(void) } } - printk_debug("CPU model %s\n", program_string); + printk(BIOS_DEBUG, "CPU model %s\n", program_string); for (i=0; i<6; i++) { progmsr.lo = program_values[(2*i)+0]; |