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

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

* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, pat: Fix cacheflush address in change_page_attr_set_clr()
  mm: remove !NUMA condition from PAGEFLAGS_EXTENDED condition set
  x86: Fix earlyprintk=dbgp for machines without NX
  x86, pat: Sanity check remap_pfn_range for RAM region
  x86, pat: Lookup the protection from memtype list on vm_insert_pfn()
  x86, pat: Add lookup_memtype to get the current memtype of a paddr
  x86, pat: Use page flags to track memtypes of RAM pages
  x86, pat: Generalize the use of page flag PG_uncached
  x86, pat: Add rbtree to do quick lookup in memtype tracking
  x86, pat: Add PAT reserve free to io_mapping* APIs
  x86, pat: New i/f for driver to request memtype for IO regions
  x86, pat: ioremap to follow same PAT restrictions as other PAT users
  x86, pat: Keep identity maps consistent with mmaps even when pat_disabled
  x86, mtrr: make mtrr_aps_delayed_init static bool
  x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init
  generic-ipi: Allow cpus not yet online to call smp_call_function with irqs disabled
  x86: Fix an incorrect argument of reserve_bootmem()
  x86: Fix system crash when loading with "reservetop" parameter
parents 1aaf2e59 fa526d0d

arch/ia64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ config IA64_UNCACHED_ALLOCATOR 
	bool

	select GENERIC_ALLOCATOR



config ARCH_USES_PG_UNCACHED

	def_bool y

	depends on IA64_UNCACHED_ALLOCATOR



config AUDIT_ARCH

	bool

	default y

arch/x86/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,10 @@ config X86_PAT 


	  If unsure, say Y.



config ARCH_USES_PG_UNCACHED

	def_bool y

	depends on X86_PAT



config EFI

	bool "EFI runtime service support"

	depends on ACPI

arch/x86/include/asm/cacheflush.h

+52 −2
Original line number Diff line number Diff line
@@ -43,8 +43,58 @@ static inline void copy_from_user_page(struct vm_area_struct *vma, 
	memcpy(dst, src, len);

}



#define PG_non_WB				PG_arch_1

PAGEFLAG(NonWB, non_WB)

#define PG_WC				PG_arch_1

PAGEFLAG(WC, WC)



#ifdef CONFIG_X86_PAT

/*

 * X86 PAT uses page flags WC and Uncached together to keep track of

 * memory type of pages that have backing page struct. X86 PAT supports 3

 * different memory types, _PAGE_CACHE_WB, _PAGE_CACHE_WC and

 * _PAGE_CACHE_UC_MINUS and fourth state where page's memory type has not

 * been changed from its default (value of -1 used to denote this).

 * Note we do not support _PAGE_CACHE_UC here.

 *

 * Caller must hold memtype_lock for atomicity.

 */

static inline unsigned long get_page_memtype(struct page *pg)

{

	if (!PageUncached(pg) && !PageWC(pg))

		return -1;

	else if (!PageUncached(pg) && PageWC(pg))

		return _PAGE_CACHE_WC;

	else if (PageUncached(pg) && !PageWC(pg))

		return _PAGE_CACHE_UC_MINUS;

	else

		return _PAGE_CACHE_WB;

}



static inline void set_page_memtype(struct page *pg, unsigned long memtype)

{

	switch (memtype) {

	case _PAGE_CACHE_WC:

		ClearPageUncached(pg);

		SetPageWC(pg);

		break;

	case _PAGE_CACHE_UC_MINUS:

		SetPageUncached(pg);

		ClearPageWC(pg);

		break;

	case _PAGE_CACHE_WB:

		SetPageUncached(pg);

		SetPageWC(pg);

		break;

	default:

	case -1:

		ClearPageUncached(pg);

		ClearPageWC(pg);

		break;

	}

}

#else

static inline unsigned long get_page_memtype(struct page *pg) { return -1; }

static inline void set_page_memtype(struct page *pg, unsigned long memtype) { }

#endif



/*

 * The set_memory_* API can be used to change various attributes of a virtual

arch/x86/include/asm/iomap.h

+6 −3
Original line number Diff line number Diff line
@@ -26,13 +26,16 @@ 
#include <asm/pgtable.h>

#include <asm/tlbflush.h>



int

is_io_mapping_possible(resource_size_t base, unsigned long size);



void *

iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);



void

iounmap_atomic(void *kvaddr, enum km_type type);



int

iomap_create_wc(resource_size_t base, unsigned long size, pgprot_t *prot);



void

iomap_free(resource_size_t base, unsigned long size);



#endif /* _ASM_X86_IOMAP_H */

arch/x86/include/asm/mtrr.h

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ extern int mtrr_del_page(int reg, unsigned long base, unsigned long size); 
extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);

extern void mtrr_ap_init(void);

extern void mtrr_bp_init(void);

extern void set_mtrr_aps_delayed_init(void);

extern void mtrr_aps_init(void);

extern void mtrr_bp_restore(void);

extern int mtrr_trim_uncached_memory(unsigned long end_pfn);

extern int amd_special_default_mtrr(void);

#  else
@@ -161,6 +164,9 @@ static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) 


#define mtrr_ap_init() do {} while (0)

#define mtrr_bp_init() do {} while (0)

#define set_mtrr_aps_delayed_init() do {} while (0)

#define mtrr_aps_init() do {} while (0)

#define mtrr_bp_restore() do {} while (0)

#  endif



#ifdef CONFIG_COMPAT

CRA Git | Maintained and supported by SUSTech CRA and CCSE