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

Commit ae8a5218 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:
 "Two changes:

   - one to quirk-save/restore certain system MSRs across
     suspend/resume, to make certain Intel systems work better
     (Chen Yu)

   - and also to constify a read only structure (Julia Lawall)"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/calgary: Constify cal_chipset_ops structures
  x86/pm: Introduce quirk framework to save/restore extra MSR registers around suspend/resume
parents 0ffedcda d6b56b0b

arch/x86/include/asm/calgary.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/types.h>



struct iommu_table {

	struct cal_chipset_ops *chip_ops; /* chipset specific funcs */

	const struct cal_chipset_ops *chip_ops; /* chipset specific funcs */

	unsigned long  it_base;      /* mapped address of tce table */

	unsigned long  it_hint;      /* Hint for next alloc */

	unsigned long *it_map;       /* A simple allocation bitmap for now */

arch/x86/include/asm/msr.h

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ struct msr_regs_info { 
	int err;

};



struct saved_msr {

	bool valid;

	struct msr_info info;

};



struct saved_msrs {

	unsigned int num;

	struct saved_msr *array;

};



static inline unsigned long long native_read_tscp(unsigned int *aux)

{

	unsigned long low, high;

arch/x86/include/asm/suspend_32.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct saved_context { 
	unsigned long cr0, cr2, cr3, cr4;

	u64 misc_enable;

	bool misc_enable_saved;

	struct saved_msrs saved_msrs;

	struct desc_ptr gdt_desc;

	struct desc_ptr idt;

	u16 ldt;

arch/x86/include/asm/suspend_64.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct saved_context { 
	unsigned long cr0, cr2, cr3, cr4, cr8;

	u64 misc_enable;

	bool misc_enable_saved;

	struct saved_msrs saved_msrs;

	unsigned long efer;

	u16 gdt_pad; /* Unused */

	struct desc_ptr gdt_desc;

arch/x86/kernel/pci-calgary_64.c

+2 −2
Original line number Diff line number Diff line
@@ -180,13 +180,13 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl); 
static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl);

static void get_tce_space_from_tar(void);



static struct cal_chipset_ops calgary_chip_ops = {

static const struct cal_chipset_ops calgary_chip_ops = {

	.handle_quirks = calgary_handle_quirks,

	.tce_cache_blast = calgary_tce_cache_blast,

	.dump_error_regs = calgary_dump_error_regs

};



static struct cal_chipset_ops calioc2_chip_ops = {

static const struct cal_chipset_ops calioc2_chip_ops = {

	.handle_quirks = calioc2_handle_quirks,

	.tce_cache_blast = calioc2_tce_cache_blast,

	.dump_error_regs = calioc2_dump_error_regs