Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/msr: Rename 'native_wrmsrl()' to 'native_wrmsrq()'

Suggested-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Xin Li <xin@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>

+10 -10
+1 -1
arch/x86/hyperv/ivm.c
··· 115 115 116 116 static inline void wr_ghcb_msr(u64 val) 117 117 { 118 - native_wrmsrl(MSR_AMD64_SEV_ES_GHCB, val); 118 + native_wrmsrq(MSR_AMD64_SEV_ES_GHCB, val); 119 119 } 120 120 121 121 static enum es_result hv_ghcb_hv_call(struct ghcb *ghcb, u64 exit_code,
+1 -1
arch/x86/include/asm/microcode.h
··· 61 61 { 62 62 u32 rev, dummy; 63 63 64 - native_wrmsrl(MSR_IA32_UCODE_REV, 0); 64 + native_wrmsrq(MSR_IA32_UCODE_REV, 0); 65 65 66 66 /* As documented in the SDM: Do a CPUID 1 here */ 67 67 native_cpuid_eax(1);
+1 -1
arch/x86/include/asm/msr.h
··· 109 109 #define native_wrmsr(msr, low, high) \ 110 110 __wrmsr(msr, low, high) 111 111 112 - #define native_wrmsrl(msr, val) \ 112 + #define native_wrmsrq(msr, val) \ 113 113 __wrmsr((msr), (u32)((u64)(val)), \ 114 114 (u32)((u64)(val) >> 32)) 115 115
+1 -1
arch/x86/include/asm/spec-ctrl.h
··· 84 84 static __always_inline void __update_spec_ctrl(u64 val) 85 85 { 86 86 __this_cpu_write(x86_spec_ctrl_current, val); 87 - native_wrmsrl(MSR_IA32_SPEC_CTRL, val); 87 + native_wrmsrq(MSR_IA32_SPEC_CTRL, val); 88 88 } 89 89 90 90 #ifdef CONFIG_SMP
+1 -1
arch/x86/kernel/cpu/microcode/amd.c
··· 602 602 if (!verify_sha256_digest(mc->hdr.patch_id, *cur_rev, (const u8 *)p_addr, psize)) 603 603 return false; 604 604 605 - native_wrmsrl(MSR_AMD64_PATCH_LOADER, p_addr); 605 + native_wrmsrq(MSR_AMD64_PATCH_LOADER, p_addr); 606 606 607 607 if (x86_family(bsp_cpuid_1_eax) == 0x17) { 608 608 unsigned long p_addr_end = p_addr + psize - 1;
+1 -1
arch/x86/kernel/cpu/microcode/intel.c
··· 320 320 } 321 321 322 322 /* write microcode via MSR 0x79 */ 323 - native_wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc->bits); 323 + native_wrmsrq(MSR_IA32_UCODE_WRITE, (unsigned long)mc->bits); 324 324 325 325 rev = intel_get_microcode_revision(); 326 326 if (rev != mc->hdr.rev)
+4 -4
arch/x86/kvm/vmx/vmx.c
··· 382 382 383 383 msr = __rdmsr(MSR_IA32_MCU_OPT_CTRL); 384 384 msr |= FB_CLEAR_DIS; 385 - native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr); 385 + native_wrmsrq(MSR_IA32_MCU_OPT_CTRL, msr); 386 386 /* Cache the MSR value to avoid reading it later */ 387 387 vmx->msr_ia32_mcu_opt_ctrl = msr; 388 388 } ··· 393 393 return; 394 394 395 395 vmx->msr_ia32_mcu_opt_ctrl &= ~FB_CLEAR_DIS; 396 - native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl); 396 + native_wrmsrq(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl); 397 397 } 398 398 399 399 static void vmx_update_fb_clear_dis(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx) ··· 6745 6745 vcpu->stat.l1d_flush++; 6746 6746 6747 6747 if (static_cpu_has(X86_FEATURE_FLUSH_L1D)) { 6748 - native_wrmsrl(MSR_IA32_FLUSH_CMD, L1D_FLUSH); 6748 + native_wrmsrq(MSR_IA32_FLUSH_CMD, L1D_FLUSH); 6749 6749 return; 6750 6750 } 6751 6751 ··· 7318 7318 */ 7319 7319 if (cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS) || 7320 7320 vmx->spec_ctrl != hostval) 7321 - native_wrmsrl(MSR_IA32_SPEC_CTRL, hostval); 7321 + native_wrmsrq(MSR_IA32_SPEC_CTRL, hostval); 7322 7322 7323 7323 barrier_nospec(); 7324 7324 }