Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30a71318 authored by Dave Jones's avatar Dave Jones Committed by H. Peter Anvin
Browse files

x86: Move the 64-bit Centaur specific parts out of setup_64.c 



Create a separate centaur_64.c file in the cpu/ dir for
the useful parts to live in.

Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7e219112

arch/x86/kernel/cpu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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_64)	+= centaur_64.o

obj-$(CONFIG_X86_32)	+= transmeta.o

obj-$(CONFIG_X86_32)	+= intel.o

obj-$(CONFIG_X86_64)	+= intel_64.o

arch/x86/kernel/cpu/centaur_64.c

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/smp.h>



#include <asm/cpufeature.h>

#include <asm/processor.h>



void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)

{

	if (c->x86 == 0x6 && c->x86_model >= 0xf)

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

}



void __cpuinit init_centaur(struct cpuinfo_x86 *c)

{

	/* Cache sizes */

	unsigned n;



	n = c->extended_cpuid_level;

	if (n >= 0x80000008) {

		unsigned eax = cpuid_eax(0x80000008);

		c->x86_virt_bits = (eax >> 8) & 0xff;

		c->x86_phys_bits = eax & 0xff;

	}



	if (c->x86 == 0x6 && c->x86_model >= 0xf) {

		c->x86_cache_alignment = c->x86_clflush_size * 2;

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

	}

	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);

}

arch/x86/kernel/setup_64.c

+2 −26
Original line number Diff line number Diff line
@@ -622,32 +622,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) 
#endif

}



static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)

{

	if (c->x86 == 0x6 && c->x86_model >= 0xf)

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

}



static void __cpuinit init_centaur(struct cpuinfo_x86 *c)

{

	/* Cache sizes */

	unsigned n;



	n = c->extended_cpuid_level;

	if (n >= 0x80000008) {

		unsigned eax = cpuid_eax(0x80000008);

		c->x86_virt_bits = (eax >> 8) & 0xff;

		c->x86_phys_bits = eax & 0xff;

	}



	if (c->x86 == 0x6 && c->x86_model >= 0xf) {

		c->x86_cache_alignment = c->x86_clflush_size * 2;

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

	}

	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);

}



static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)

{

	char *v = c->x86_vendor_id;
@@ -667,6 +641,8 @@ extern void __cpuinit early_init_amd(struct cpuinfo_x86 *c); 
extern void __cpuinit init_amd(struct cpuinfo_x86 *c);

extern void __cpuinit early_init_intel(struct cpuinfo_x86 *c);

extern void __cpuinit init_intel(struct cpuinfo_x86 *c);

extern void __cpuinit early_init_centaur(struct cpuinfo_x86 *c);

extern void __cpuinit init_centaur(struct cpuinfo_x86 *c);



/* Do some early cpuid on the boot CPU to get some parameter that are

   needed before check_bugs. Everything advanced is in identify_cpu