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

Commit ca1fec58 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86/mm/pat: Adjust default caching mode translation tables 



Make WT really mean WT (rather than UC).

I can't see why commit 9cd25aac ("x86/mm/pat: Emulate PAT when
it is disabled") didn't make this to match its changes to
pat_init().

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Link: http://lkml.kernel.org/r/55ACC3660200007800092E62@mail.emea.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5bc016f1

arch/x86/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -43,18 +43,18 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { 
	[_PAGE_CACHE_MODE_WC      ]	= 0         | _PAGE_PCD,

	[_PAGE_CACHE_MODE_UC_MINUS]	= 0         | _PAGE_PCD,

	[_PAGE_CACHE_MODE_UC      ]	= _PAGE_PWT | _PAGE_PCD,

	[_PAGE_CACHE_MODE_WT      ]	= 0         | _PAGE_PCD,

	[_PAGE_CACHE_MODE_WT      ]	= _PAGE_PWT | 0,

	[_PAGE_CACHE_MODE_WP      ]	= 0         | _PAGE_PCD,

};

EXPORT_SYMBOL(__cachemode2pte_tbl);



uint8_t __pte2cachemode_tbl[8] = {

	[__pte2cm_idx( 0        | 0         | 0        )] = _PAGE_CACHE_MODE_WB,

	[__pte2cm_idx(_PAGE_PWT | 0         | 0        )] = _PAGE_CACHE_MODE_UC_MINUS,

	[__pte2cm_idx(_PAGE_PWT | 0         | 0        )] = _PAGE_CACHE_MODE_WT,

	[__pte2cm_idx( 0        | _PAGE_PCD | 0        )] = _PAGE_CACHE_MODE_UC_MINUS,

	[__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | 0        )] = _PAGE_CACHE_MODE_UC,

	[__pte2cm_idx( 0        | 0         | _PAGE_PAT)] = _PAGE_CACHE_MODE_WB,

	[__pte2cm_idx(_PAGE_PWT | 0         | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS,

	[__pte2cm_idx(_PAGE_PWT | 0         | _PAGE_PAT)] = _PAGE_CACHE_MODE_WT,

	[__pte2cm_idx(0         | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS,

	[__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC,

};