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

Commit 6bf08a8d authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by H. Peter Anvin
Browse files

x86, AMD: Clean up init_amd() 



Clean up multiple declarations of variable used for rd/wrmsr.

Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@amd.com>
Link: http://lkml.kernel.org/r/1359495136-23244-1-git-send-email-ostr@amd64.org


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

arch/x86/kernel/cpu/amd.c

+12 −17
Original line number Diff line number Diff line
@@ -518,10 +518,9 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) 
static void __cpuinit init_amd(struct cpuinfo_x86 *c)

{

	u32 dummy;



#ifdef CONFIG_SMP

	unsigned long long value;



#ifdef CONFIG_SMP

	/*

	 * Disable TLB flush filter by setting HWCR.FFDIS on K8

	 * bit 6 of msr C001_0015
@@ -559,12 +558,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
		 * (AMD Erratum #110, docId: 25759).

		 */

		if (c->x86_model < 0x14 && cpu_has(c, X86_FEATURE_LAHF_LM)) {

			u64 val;



			clear_cpu_cap(c, X86_FEATURE_LAHF_LM);

			if (!rdmsrl_amd_safe(0xc001100d, &val)) {

				val &= ~(1ULL << 32);

				wrmsrl_amd_safe(0xc001100d, val);

			if (!rdmsrl_amd_safe(0xc001100d, &value)) {

				value &= ~(1ULL << 32);

				wrmsrl_amd_safe(0xc001100d, value);

			}

		}
@@ -617,13 +614,12 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
	if ((c->x86 == 0x15) &&

	    (c->x86_model >= 0x10) && (c->x86_model <= 0x1f) &&

	    !cpu_has(c, X86_FEATURE_TOPOEXT)) {

		u64 val;



		if (!rdmsrl_safe(0xc0011005, &val)) {

			val |= 1ULL << 54;

			wrmsrl_safe(0xc0011005, val);

			rdmsrl(0xc0011005, val);

			if (val & (1ULL << 54)) {

		if (!rdmsrl_safe(0xc0011005, &value)) {

			value |= 1ULL << 54;

			wrmsrl_safe(0xc0011005, value);

			rdmsrl(0xc0011005, value);

			if (value & (1ULL << 54)) {

				set_cpu_cap(c, X86_FEATURE_TOPOEXT);

				printk(KERN_INFO FW_INFO "CPU: Re-enabling "

				  "disabled Topology Extensions Support\n");
@@ -637,11 +633,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
	 */

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

	    (c->x86_model >= 0x02) && (c->x86_model < 0x20)) {

		u64 val;



		if (!rdmsrl_safe(0xc0011021, &val) && !(val & 0x1E)) {

			val |= 0x1E;

			wrmsrl_safe(0xc0011021, val);

		if (!rdmsrl_safe(0xc0011021, &value) && !(value & 0x1E)) {

			value |= 0x1E;

			wrmsrl_safe(0xc0011021, value);

		}

	}