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

Commit 8fa8b035 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, amd: Move BSP code to cpu_dev helper 



Move code which is run once on the BSP during boot into the cpu_dev
helper.

[ hpa: removed bogus cpu_has -> static_cpu_has conversion ]

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/20110805180409.GC26217@aftab


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent a110b5ec

arch/x86/kernel/cpu/amd.c

+29 −30
Original line number Diff line number Diff line
@@ -410,6 +410,34 @@ static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) 
#endif

}



static void __cpuinit bsp_init_amd(struct cpuinfo_x86 *c)

{

	if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {



		if (c->x86 > 0x10 ||

		    (c->x86 == 0x10 && c->x86_model >= 0x2)) {

			u64 val;



			rdmsrl(MSR_K7_HWCR, val);

			if (!(val & BIT(24)))

				printk(KERN_WARNING FW_BUG "TSC doesn't count "

					"with P0 frequency!\n");

		}

	}



	if (c->x86 == 0x15) {

		unsigned long upperbit;

		u32 cpuid, assoc;



		cpuid	 = cpuid_edx(0x80000005);

		assoc	 = cpuid >> 16 & 0xff;

		upperbit = ((cpuid >> 24) << 10) / assoc;



		va_align.mask	  = (upperbit - 1) & PAGE_MASK;

		va_align.flags    = ALIGN_VA_32 | ALIGN_VA_64;

	}

}



static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)

{

	early_init_amd_mc(c);
@@ -441,36 +469,6 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_EXTD_APICID);

	}

#endif



	/* We need to do the following only once */

	if (c != &boot_cpu_data)

		return;



	if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {



		if (c->x86 > 0x10 ||

		    (c->x86 == 0x10 && c->x86_model >= 0x2)) {

			u64 val;



			rdmsrl(MSR_K7_HWCR, val);

			if (!(val & BIT(24)))

				printk(KERN_WARNING FW_BUG "TSC doesn't count "

					"with P0 frequency!\n");

		}

	}



	if (c->x86 == 0x15) {

		unsigned long upperbit;

		u32 cpuid, assoc;



		cpuid	 = cpuid_edx(0x80000005);

		assoc	 = cpuid >> 16 & 0xff;

		upperbit = ((cpuid >> 24) << 10) / assoc;



		va_align.mask	  = (upperbit - 1) & PAGE_MASK;

		va_align.flags    = ALIGN_VA_32 | ALIGN_VA_64;



	}

}



static void __cpuinit init_amd(struct cpuinfo_x86 *c)
@@ -692,6 +690,7 @@ static const struct cpu_dev __cpuinitconst amd_cpu_dev = { 
	.c_size_cache	= amd_size_cache,

#endif

	.c_early_init   = early_init_amd,

	.c_bsp_init	= bsp_init_amd,

	.c_init		= init_amd,

	.c_x86_vendor	= X86_VENDOR_AMD,

};