From 362db613a0556a102e2812c1c00e3491eafdb66f Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Thu, 8 Apr 2010 15:12:18 +0000 Subject: Cosmetically make init_cpus more similar for fam10 and K8. Remove some fam10 warnings. Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5382 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/cpu/amd/model_10xxx_msr.h | 3 +++ src/include/cpu/amd/model_fxx_rev.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/include/cpu') diff --git a/src/include/cpu/amd/model_10xxx_msr.h b/src/include/cpu/amd/model_10xxx_msr.h index c885493ef0..a774125cb0 100644 --- a/src/include/cpu/amd/model_10xxx_msr.h +++ b/src/include/cpu/amd/model_10xxx_msr.h @@ -33,4 +33,7 @@ #define LOGICAL_CPUS_NUM_MSR 0xC001100d #define CPU_ID_EXT_FEATURES_MSR 0xC0011005 +msr_t rdmsr_amd(u32 index); +void wrmsr_amd(u32 index, msr_t msr); + #endif /* CPU_AMD_MODEL_10XXX_MSR_H */ diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h index c2d59a62de..56381e389e 100644 --- a/src/include/cpu/amd/model_fxx_rev.h +++ b/src/include/cpu/amd/model_fxx_rev.h @@ -98,7 +98,7 @@ static inline int is_cpu_pre_f2(void) #ifdef __PRE_RAM__ //AMD_F0_SUPPORT -static int is_cpu_f0_in_bsp(int nodeid) +static inline int is_cpu_f0_in_bsp(int nodeid) { uint32_t dword; device_t dev; @@ -106,7 +106,7 @@ static int is_cpu_f0_in_bsp(int nodeid) dword = pci_read_config32(dev, 0xfc); return (dword & 0xfff00) == 0x40f00; } -static int is_cpu_pre_f2_in_bsp(int nodeid) +static inline int is_cpu_pre_f2_in_bsp(int nodeid) { uint32_t dword; device_t dev; -- cgit v1.2.3