Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8337
-gerrit
commit 1fa8baa9fdc4d14c7b9a0f67c63c771fbe0a7c3d Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Tue Feb 3 09:17:44 2015 +0200
AMD K8: Remove some excessive preprocessor use
Tests on CPUID are valid regardless of revision.
Change-Id: I5a3a01baca2c0ecfb018ca7965994ba74889a2e2 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/amd/model_fxx/model_fxx_init.c | 44 +++++++++++++------------- src/include/cpu/amd/model_fxx_rev.h | 58 +++++++++++++++++----------------- 2 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 33226d4..341bb62 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -41,12 +41,15 @@ void cpus_ready_for_init(void) } #endif
-#if !CONFIG_K8_REV_F_SUPPORT int is_e0_later_in_bsp(int nodeid) { uint32_t val; uint32_t val_old; int e0_later; + + if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + return 1; + if (nodeid == 0) { // we don't need to do that for node 0 in core0/node0 return !is_cpu_pre_e0(); } @@ -67,18 +70,19 @@ int is_e0_later_in_bsp(int nodeid)
return e0_later; } -#endif
-#if CONFIG_K8_REV_F_SUPPORT int is_cpu_f0_in_bsp(int nodeid) { uint32_t dword; device_t dev; + + if (!IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + return 0; + dev = dev_find_slot(0, PCI_DEVFN(0x18 + nodeid, 3)); dword = pci_read_config32(dev, 0xfc); return (dword & 0xfff00) == 0x40f00; } -#endif
#define MCI_STATUS 0x401
@@ -278,19 +282,14 @@ static void init_ecc_memory(unsigned node_id) #if CONFIG_HW_MEM_HOLE_SIZEK != 0 unsigned long hole_startk = 0;
-#if !CONFIG_K8_REV_F_SUPPORT - if (!is_cpu_pre_e0()) { -#endif - + if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT) || !is_cpu_pre_e0()) { uint32_t val; val = pci_read_config32(f1_dev, 0xf0); if (val & 1) { hole_startk = ((val & (0xff << 24)) >> 10); } -#if !CONFIG_K8_REV_F_SUPPORT } #endif -#endif
/* Don't start too early */ begink = startk; @@ -347,10 +346,10 @@ static void init_ecc_memory(unsigned node_id) printk(BIOS_DEBUG, " done\n"); }
-static inline void k8_errata(void) +static void k8_pre_f_errata(void) { msr_t msr; -#if !CONFIG_K8_REV_F_SUPPORT + if (is_cpu_pre_c0()) { /* Erratum 63... */ msr = rdmsr(HWCR_MSR); @@ -414,18 +413,17 @@ static inline void k8_errata(void) msr.hi |= 1; wrmsr_amd(CPU_ID_EXT_FEATURES_MSR, msr); } -#endif +}
+static void k8_errata(void) +{ + msr_t msr;
-#if !CONFIG_K8_REV_F_SUPPORT /* I can't touch this msr on early buggy cpus */ - if (!is_cpu_pre_b3()) -#endif - { + if (!is_cpu_pre_b3()) { msr = rdmsr(NB_CFG_MSR);
-#if !CONFIG_K8_REV_F_SUPPORT - if (!is_cpu_pre_c0() && is_cpu_pre_d0()) { + if (is_cpu_pre_d0() && !is_cpu_pre_c0()) { /* D0 later don't need it */ /* Erratum 86 Disable data masking on C0 and * later processor revs. @@ -433,7 +431,7 @@ static inline void k8_errata(void) */ msr.hi |= 1 << (36 - 32); } -#endif + /* Erratum 89 ... */ /* Erratum 89 is mistakenly labeled as 88 in AMD pub #25759 * It is correctly labeled as 89 on page 49 of the document @@ -448,12 +446,11 @@ static inline void k8_errata(void)
wrmsr(NB_CFG_MSR, msr); } + /* Erratum 122 */ msr = rdmsr(HWCR_MSR); msr.lo |= 1 << 6; wrmsr(HWCR_MSR, msr); - - }
static void model_fxx_init(device_t dev) @@ -479,6 +476,9 @@ static void model_fxx_init(device_t dev) wrmsr(MCI_STATUS + (i * 4), msr); }
+ if (!IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + k8_pre_f_errata(); + k8_errata();
enable_cache(); diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h index 1e85596..7cd6158 100644 --- a/src/include/cpu/amd/model_fxx_rev.h +++ b/src/include/cpu/amd/model_fxx_rev.h @@ -2,7 +2,6 @@
int init_processor_name(void);
-#if !CONFIG_K8_REV_F_SUPPORT static inline int is_cpu_rev_a0(void) { return (cpuid_eax(1) & 0xfffef) == 0x0f00; @@ -48,13 +47,32 @@ static inline int is_cpu_e0(void) return (cpuid_eax(1) & 0xfff00) == 0x20f00; }
+//AMD_F0_SUPPORT +static inline int is_cpu_pre_f0(void) +{ + return (cpuid_eax(1) & 0xfff0f) < 0x40f00; +} + +static inline int is_cpu_f0(void) +{ + return (cpuid_eax(1) & 0xfff00) == 0x40f00; +} + +static inline int is_cpu_pre_f2(void) +{ + return (cpuid_eax(1) & 0xfff0f) < 0x40f02; +}
#ifdef __PRE_RAM__ -static int is_e0_later_in_bsp(int nodeid) +static inline int is_e0_later_in_bsp(int nodeid) { uint32_t val; uint32_t val_old; int e0_later; + + if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + return 1; + if(nodeid==0) { // we don't need to do that for node 0 in core0/node0 return !is_cpu_pre_e0(); } @@ -73,50 +91,32 @@ static int is_e0_later_in_bsp(int nodeid)
return e0_later; } -#else -int is_e0_later_in_bsp(int nodeid); //defined model_fxx_init.c -#endif - -#endif - -#if CONFIG_K8_REV_F_SUPPORT -//AMD_F0_SUPPORT -static inline int is_cpu_pre_f0(void) -{ - return (cpuid_eax(1) & 0xfff0f) < 0x40f00; -} - -static inline int is_cpu_f0(void) -{ - return (cpuid_eax(1) & 0xfff00) == 0x40f00; -} - -static inline int is_cpu_pre_f2(void) -{ - return (cpuid_eax(1) & 0xfff0f) < 0x40f02; -}
-#ifdef __PRE_RAM__ -//AMD_F0_SUPPORT static inline int is_cpu_f0_in_bsp(int nodeid) { uint32_t dword; device_t dev; + if (!IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + return 0; dev = PCI_DEV(0, 0x18+nodeid, 3); dword = pci_read_config32(dev, 0xfc); return (dword & 0xfff00) == 0x40f00; } + static inline int is_cpu_pre_f2_in_bsp(int nodeid) { uint32_t dword; device_t dev; + if (!IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) + return 1; dev = PCI_DEV(0, 0x18+nodeid, 3); dword = pci_read_config32(dev, 0xfc); return (dword & 0xfff0f) < 0x40f02; } + #else -int is_cpu_f0_in_bsp(int nodeid); // defined in model_fxx_init.c -#endif
-#endif +int is_e0_later_in_bsp(int nodeid); +int is_cpu_f0_in_bsp(int nodeid);
+#endif