Skip to content

Commit 834ef6a

Browse files
ubizjakliuw
authored andcommitted
x86/hyperv: Use savesegment() instead of inline asm() to save segment registers
Use standard savesegment() utility macro to save segment registers. Signed-off-by: Uros Bizjak <[email protected]> Acked-by: Wei Liu <[email protected]> Tested-by: Michael Kelley <[email protected]> Cc: K. Y. Srinivasan <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: Dexuan Cui <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: H. Peter Anvin <[email protected]> Signed-off-by: Wei Liu <[email protected]>
1 parent 2e7577c commit 834ef6a

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

arch/x86/hyperv/ivm.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <asm/e820/api.h>
2626
#include <asm/desc.h>
2727
#include <asm/msr.h>
28+
#include <asm/segment.h>
2829
#include <uapi/asm/vmx.h>
2930

3031
#ifdef CONFIG_AMD_MEM_ENCRYPT
@@ -315,16 +316,16 @@ int hv_snp_boot_ap(u32 apic_id, unsigned long start_ip, unsigned int cpu)
315316
vmsa->gdtr.base = gdtr.address;
316317
vmsa->gdtr.limit = gdtr.size;
317318

318-
asm volatile("movl %%es, %%eax;" : "=a" (vmsa->es.selector));
319+
savesegment(es, vmsa->es.selector);
319320
hv_populate_vmcb_seg(vmsa->es, vmsa->gdtr.base);
320321

321-
asm volatile("movl %%cs, %%eax;" : "=a" (vmsa->cs.selector));
322+
savesegment(cs, vmsa->cs.selector);
322323
hv_populate_vmcb_seg(vmsa->cs, vmsa->gdtr.base);
323324

324-
asm volatile("movl %%ss, %%eax;" : "=a" (vmsa->ss.selector));
325+
savesegment(ss, vmsa->ss.selector);
325326
hv_populate_vmcb_seg(vmsa->ss, vmsa->gdtr.base);
326327

327-
asm volatile("movl %%ds, %%eax;" : "=a" (vmsa->ds.selector));
328+
savesegment(ds, vmsa->ds.selector);
328329
hv_populate_vmcb_seg(vmsa->ds, vmsa->gdtr.base);
329330

330331
vmsa->efer = native_read_msr(MSR_EFER);

0 commit comments

Comments
 (0)