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

Commit 357d1226 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by H. Peter Anvin
Browse files

x86, xen, gdt: Remove the pvops variant of store_gdt. 



The two use-cases where we needed to store the GDT were during ACPI S3 suspend
and resume. As the patches:
 x86/gdt/i386: store/load GDT for ACPI S3 or hibernation/resume path is not needed
 x86/gdt/64-bit: store/load GDT for ACPI S3 or hibernate/resume path is not needed.

have demonstrated - there are other mechanism by which the GDT is
saved and reloaded during early resume path.

Hence we do not need to worry about the pvops call-chain for saving the
GDT and can and can eliminate it. The other areas where the store_gdt is
used are never going to be hit when running under the pvops platforms.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Link: http://lkml.kernel.org/r/1365194544-14648-4-git-send-email-konrad.wilk@oracle.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 84e70971

arch/x86/include/asm/paravirt.h

+0 −4
Original line number Diff line number Diff line
@@ -262,10 +262,6 @@ static inline void set_ldt(const void *addr, unsigned entries) 
{

	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);

}

static inline void store_gdt(struct desc_ptr *dtr)

{

	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);

}

static inline void store_idt(struct desc_ptr *dtr)

{

	PVOP_VCALL1(pv_cpu_ops.store_idt, dtr);

arch/x86/include/asm/paravirt_types.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct pv_cpu_ops { 
	void (*load_tr_desc)(void);

	void (*load_gdt)(const struct desc_ptr *);

	void (*load_idt)(const struct desc_ptr *);

	void (*store_gdt)(struct desc_ptr *);

	/* store_gdt has been removed. */

	void (*store_idt)(struct desc_ptr *);

	void (*set_ldt)(const void *desc, unsigned entries);

	unsigned long (*store_tr)(void);

arch/x86/kernel/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int acpi_suspend_lowlevel(void) 
	header->pmode_behavior = 0;



#ifndef CONFIG_64BIT

	store_gdt((struct desc_ptr *)&header->pmode_gdt);

	native_store_gdt((struct desc_ptr *)&header->pmode_gdt);



	if (!rdmsr_safe(MSR_EFER,

			&header->pmode_efer_low,

arch/x86/kernel/doublefault_32.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static void doublefault_fn(void) 
	struct desc_ptr gdt_desc = {0, 0};

	unsigned long gdt, tss;



	store_gdt(&gdt_desc);

	native_store_gdt(&gdt_desc);

	gdt = gdt_desc.address;



	printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);

arch/x86/kernel/paravirt.c

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ struct pv_cpu_ops pv_cpu_ops = { 
	.set_ldt = native_set_ldt,

	.load_gdt = native_load_gdt,

	.load_idt = native_load_idt,

	.store_gdt = native_store_gdt,

	.store_idt = native_store_idt,

	.store_tr = native_store_tr,

	.load_tls = native_load_tls,