Commit 2c929ce6 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, cpu, amd: Deprecate AMD-specific MSR variants 



Now that all users of {rd,wr}msr_amd_safe have been fixed, deprecate its
use by making them private to amd.c and adding warnings when used on
anything else beside K8.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1338562358-28182-5-git-send-email-bp@amd64.org


Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 169e9cbd

arch/x86/include/asm/msr.h

+0 −27
Original line number Diff line number Diff line
@@ -211,33 +211,6 @@ do { \ 


#endif	/* !CONFIG_PARAVIRT */



static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)

{

	u32 gprs[8] = { 0 };

	int err;



	gprs[1] = msr;

	gprs[7] = 0x9c5a203a;



	err = rdmsr_safe_regs(gprs);



	*p = gprs[0] | ((u64)gprs[2] << 32);



	return err;

}



static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)

{

	u32 gprs[8] = { 0 };



	gprs[0] = (u32)val;

	gprs[1] = msr;

	gprs[2] = val >> 32;

	gprs[7] = 0x9c5a203a;



	return wrmsr_safe_regs(gprs);

}



#define checking_wrmsrl(msr, val) wrmsr_safe((msr), (u32)(val),		\

					     (u32)((val) >> 32))

arch/x86/kernel/cpu/amd.c

+33 −0
Original line number Diff line number Diff line
@@ -19,6 +19,39 @@ 


#include "cpu.h"



static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)

{

	struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());

	u32 gprs[8] = { 0 };

	int err;



	WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);



	gprs[1] = msr;

	gprs[7] = 0x9c5a203a;



	err = rdmsr_safe_regs(gprs);



	*p = gprs[0] | ((u64)gprs[2] << 32);



	return err;

}



static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)

{

	struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());

	u32 gprs[8] = { 0 };



	WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);



	gprs[0] = (u32)val;

	gprs[1] = msr;

	gprs[2] = val >> 32;

	gprs[7] = 0x9c5a203a;



	return wrmsr_safe_regs(gprs);

}



#ifdef CONFIG_X86_32

/*

 *	B step AMD K6 before B 9730xxxx have hardware bugs that can cause