aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/paravirt.h
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-08-31 03:50:10 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-08-31 18:14:28 -0400
commit177fed1ee8d727c39601ce9fc2299b4cb25a718e (patch)
treec5e77b06ef238f59a8566358670ff9a91d376e27 /arch/x86/include/asm/paravirt.h
parent132ec92f3f70fe365c1f4b8d46e66cf8a2a16880 (diff)
x86, msr: Rewrite AMD rd/wrmsr variants
Switch them to native_{rd,wr}msr_safe_regs and remove pv_cpu_ops.read_msr_amd. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> LKML-Reference: <1251705011-18636-2-git-send-email-petkovbb@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
-rw-r--r--arch/x86/include/asm/paravirt.h26
1 files changed, 20 insertions, 6 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 1705944e0374..11574934a994 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -166,7 +166,6 @@ struct pv_cpu_ops {
166 166
167 /* MSR, PMC and TSR operations. 167 /* MSR, PMC and TSR operations.
168 err = 0/-EFAULT. wrmsr returns 0/-EFAULT. */ 168 err = 0/-EFAULT. wrmsr returns 0/-EFAULT. */
169 u64 (*read_msr_amd)(unsigned int msr, int *err);
170 u64 (*read_msr)(unsigned int msr, int *err); 169 u64 (*read_msr)(unsigned int msr, int *err);
171 int (*rdmsr_regs)(u32 *regs); 170 int (*rdmsr_regs)(u32 *regs);
172 int (*write_msr)(unsigned int msr, unsigned low, unsigned high); 171 int (*write_msr)(unsigned int msr, unsigned low, unsigned high);
@@ -828,10 +827,6 @@ static inline int paravirt_rdmsr_regs(u32 *regs)
828 return PVOP_CALL1(int, pv_cpu_ops.rdmsr_regs, regs); 827 return PVOP_CALL1(int, pv_cpu_ops.rdmsr_regs, regs);
829} 828}
830 829
831static inline u64 paravirt_read_msr_amd(unsigned msr, int *err)
832{
833 return PVOP_CALL2(u64, pv_cpu_ops.read_msr_amd, msr, err);
834}
835static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high) 830static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)
836{ 831{
837 return PVOP_CALL3(int, pv_cpu_ops.write_msr, msr, low, high); 832 return PVOP_CALL3(int, pv_cpu_ops.write_msr, msr, low, high);
@@ -887,12 +882,31 @@ static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
887} 882}
888static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p) 883static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
889{ 884{
885 u32 gprs[8] = { 0 };
890 int err; 886 int err;
891 887
892 *p = paravirt_read_msr_amd(msr, &err); 888 gprs[1] = msr;
889 gprs[7] = 0x9c5a203a;
890
891 err = paravirt_rdmsr_regs(gprs);
892
893 *p = gprs[0] | ((u64)gprs[2] << 32);
894
893 return err; 895 return err;
894} 896}
895 897
898static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
899{
900 u32 gprs[8] = { 0 };
901
902 gprs[0] = (u32)val;
903 gprs[1] = msr;
904 gprs[2] = val >> 32;
905 gprs[7] = 0x9c5a203a;
906
907 return paravirt_wrmsr_regs(gprs);
908}
909
896static inline u64 paravirt_read_tsc(void) 910static inline u64 paravirt_read_tsc(void)
897{ 911{
898 return PVOP_CALL0(u64, pv_cpu_ops.read_tsc); 912 return PVOP_CALL0(u64, pv_cpu_ops.read_tsc);