hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: clean up init_amd() 

1. move out calling of check_enable_amd_mmconf_dmi out of setup_64.c
   put it into init_amd(), so don't need to make extra dmi check for
   system with other cpus.
2. 15 --> 0xf

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-21 01:14:27 -07:00 committed by Ingo Molnar
parent 3c999f1426
commit ce38cc7996
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/cpu/amd_64.c
View File

@ -131,7 +131,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
* Errata 63 for SH-B3 steppings * Errata 63 for SH-B3 steppings
* Errata 122 for all steppings (F+ have it disabled by default) * Errata 122 for all steppings (F+ have it disabled by default)
*/ */
if (c->x86 == 15) { if (c->x86 == 0xf) {
rdmsrl(MSR_K8_HWCR, value); rdmsrl(MSR_K8_HWCR, value);
value |= 1 << 6; value |= 1 << 6;
wrmsrl(MSR_K8_HWCR, value); wrmsrl(MSR_K8_HWCR, value);
@ -143,10 +143,11 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
clear_cpu_cap(c, 0*32+31); clear_cpu_cap(c, 0*32+31);
/* On C+ stepping K8 rep microcode works well for copy/memset */ /* On C+ stepping K8 rep microcode works well for copy/memset */
level = cpuid_eax(1); if (c->x86 == 0xf) {
if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || level = cpuid_eax(1);
level >= 0x0f58)) if((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58)
set_cpu_cap(c, X86_FEATURE_REP_GOOD); set_cpu_cap(c, X86_FEATURE_REP_GOOD);
}
if (c->x86 == 0x10 || c->x86 == 0x11) if (c->x86 == 0x10 || c->x86 == 0x11)
set_cpu_cap(c, X86_FEATURE_REP_GOOD); set_cpu_cap(c, X86_FEATURE_REP_GOOD);
@ -157,7 +158,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
level = get_model_name(c); level = get_model_name(c);
if (!level) { if (!level) {
switch (c->x86) { switch (c->x86) {
case 15: case 0xf:
/* Should distinguish Models here, but this is only /* Should distinguish Models here, but this is only
a fallback anyways. */ a fallback anyways. */
strcpy(c->x86_model_id, "Hammer"); strcpy(c->x86_model_id, "Hammer");
@ -176,14 +177,19 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
else else
num_cache_leaves = 3; num_cache_leaves = 3;
if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) if (c->x86 >= 0xf && c->x86 <= 0x11)
set_cpu_cap(c, X86_FEATURE_K8); set_cpu_cap(c, X86_FEATURE_K8);
/* MFENCE stops RDTSC speculation */ /* MFENCE stops RDTSC speculation */
set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);
if (c->x86 == 0x10) if (c->x86 == 0x10) {
/* do this for boot cpu */
if (c == &boot_cpu_data)
check_enable_amd_mmconf_dmi();
fam10h_check_enable_mmcfg(); fam10h_check_enable_mmcfg();
}
if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) {
unsigned long long tseg; unsigned long long tseg;

4
arch/x86/kernel/setup_64.c
View File

@ -72,7 +72,6 @@
#include <asm/topology.h> #include <asm/topology.h>
#include <asm/trampoline.h> #include <asm/trampoline.h>
#include <asm/pat.h> #include <asm/pat.h>
#include <asm/mmconfig.h>
#include <mach_apic.h> #include <mach_apic.h>
#ifdef CONFIG_PARAVIRT #ifdef CONFIG_PARAVIRT
@ -474,9 +473,6 @@ void __init setup_arch(char **cmdline_p)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
#endif #endif
/* do this before identify_cpu for boot cpu */
check_enable_amd_mmconf_dmi();
} }
struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};