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

Commit c996f380 authored by Borislav Petkov's avatar Borislav Petkov Committed by Thomas Gleixner
Browse files

x86/MSR: Move native_* variants to msr.h 



... where they belong.

No functional change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Cc: kvm@vger.kernel.org
Link: https://lkml.kernel.org/r/20180301151336.12948-1-bp@alien8.de
parent 1b88accf

arch/x86/include/asm/microcode.h

+0 −14
Original line number Diff line number Diff line
@@ -6,20 +6,6 @@ 
#include <linux/earlycpio.h>

#include <linux/initrd.h>



#define native_rdmsr(msr, val1, val2)			\

do {							\

	u64 __val = __rdmsr((msr));			\

	(void)((val1) = (u32)__val);			\

	(void)((val2) = (u32)(__val >> 32));		\

} while (0)



#define native_wrmsr(msr, low, high)			\

	__wrmsr(msr, low, high)



#define native_wrmsrl(msr, val)				\

	__wrmsr((msr), (u32)((u64)(val)),		\

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



struct ucode_patch {

	struct list_head plist;

	void *data;		/* Intel uses only this one */

arch/x86/include/asm/msr.h

+14 −0
Original line number Diff line number Diff line
@@ -108,6 +108,20 @@ static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high) 
		     : : "c" (msr), "a"(low), "d" (high) : "memory");

}



#define native_rdmsr(msr, val1, val2)			\

do {							\

	u64 __val = __rdmsr((msr));			\

	(void)((val1) = (u32)__val);			\

	(void)((val2) = (u32)(__val >> 32));		\

} while (0)



#define native_wrmsr(msr, low, high)			\

	__wrmsr(msr, low, high)



#define native_wrmsrl(msr, val)				\

	__wrmsr((msr), (u32)((u64)(val)),		\

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



static inline unsigned long long native_read_msr(unsigned int msr)

{

	unsigned long long val;

arch/x86/kvm/svm.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include <asm/debugreg.h>

#include <asm/kvm_para.h>

#include <asm/irq_remapping.h>

#include <asm/microcode.h>

#include <asm/nospec-branch.h>



#include <asm/virtext.h>

arch/x86/kvm/vmx.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <asm/apic.h>

#include <asm/irq_remapping.h>

#include <asm/mmu_context.h>

#include <asm/microcode.h>

#include <asm/nospec-branch.h>



#include "trace.h"