Move the AMD64 specific parts out of setup_64.c
Create a separate amd_64.c file in the cpu/ dir for the useful parts to live in.
Signed-off-by Dave Jones <[email protected]>
--- arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/amd_64.c | 237 ++++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/setup_64.c | 231 +--------------------------------------- 3 files changed, 244 insertions(+), 225 deletions(-) create mode 100644 arch/x86/kernel/cpu/amd_64.c
arch/x86/kernel/cpu/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-y += proc.o feature_names.o obj-$(CONFIG_X86_32) += common.o bugs.o obj-$(CONFIG_X86_32) += amd.o +obj-$(CONFIG_X86_64) += amd_64.o obj-$(CONFIG_X86_32) += cyrix.o obj-$(CONFIG_X86_32) += centaur.o obj-$(CONFIG_X86_32) += transmeta.o
arch/x86/kernel/cpu/amd_64.c new file +237 -0
237 lines not on this page · raw message
arch/x86/kernel/setup_64.c +6 -225
261 lines not on this page · raw message
Signature · 1 line
1.5.5.1
Hi!
Quoted 24 lines
Create a separate
amd_64.cfile in the cpu/ dir for the useful parts to live in.arch/x86/kernel/cpu/amd_64.c new file +20
-0+#define ENABLE_C1E_MASK 0x18000000 +#define CPUID_PROCESSOR_SIGNATURE 1 +#define CPUID_XFAM 0x0ff00000 +#define CPUID_XFAM_K8 0x00000000 +#define CPUID_XFAM_10H 0x00100000 +#define CPUID_XFAM_11H 0x00200000 +#define CPUID_XMOD 0x000f0000 +#define CPUID_XMOD_REV_F 0x00040000 + +/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ +static __cpuinit int amd_apic_timer_broken (void ) +{ +u32 lo, hi, eax =cpuid_eax (CPUID_PROCESSOR_SIGNATURE ); + +switch (eax &CPUID_XFAM ) { +case CPUID_XFAM_K8 : +if ((eax &CPUID_XMOD ) <CPUID_XMOD_REV_F ) +break ; +case CPUID_XFAM_10H : +case CPUID_XFAM_11H :
arch/x86/kernel/cpu/amd_64.c line 89
Quoted 10 lines
arch/x86/kernel/cpu/amd_64.c new file +10
-0+rdmsr (MSR_K8_ENABLE_C1E , lo, hi); +if (lo &ENABLE_C1E_MASK ) +return 1 ; +break ; +default : +/* err on the side of caution */ +return 1 ; + } +return 0 ; +}
This needs to be done in 32-bit kernel, too, right?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html