Skip to content

Commit 1a4e879

Browse files
committed
x86/mm/pat: Revert 'Adjust default caching mode translation tables'
Toshi explains: "No, the default values need to be set to the fallback types, i.e. minimal supported mode. For WC and WT, UC is the fallback type. When PAT is disabled, pat_init() does update the tables below to enable WT per the default BIOS setup. However, when PAT is enabled, but CPU has PAT -errata, WT falls back to UC per the default values." Revert: ca1fec5 'x86/mm/pat: Adjust default caching mode translation tables' Requested-by: Toshi Kani <[email protected]> Cc: Jan Beulich <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent c0c3322 commit 1a4e879

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/mm/init.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = {
4343
[_PAGE_CACHE_MODE_WC ] = 0 | _PAGE_PCD,
4444
[_PAGE_CACHE_MODE_UC_MINUS] = 0 | _PAGE_PCD,
4545
[_PAGE_CACHE_MODE_UC ] = _PAGE_PWT | _PAGE_PCD,
46-
[_PAGE_CACHE_MODE_WT ] = _PAGE_PWT | 0,
46+
[_PAGE_CACHE_MODE_WT ] = 0 | _PAGE_PCD,
4747
[_PAGE_CACHE_MODE_WP ] = 0 | _PAGE_PCD,
4848
};
4949
EXPORT_SYMBOL(__cachemode2pte_tbl);
5050

5151
uint8_t __pte2cachemode_tbl[8] = {
5252
[__pte2cm_idx( 0 | 0 | 0 )] = _PAGE_CACHE_MODE_WB,
53-
[__pte2cm_idx(_PAGE_PWT | 0 | 0 )] = _PAGE_CACHE_MODE_WT,
53+
[__pte2cm_idx(_PAGE_PWT | 0 | 0 )] = _PAGE_CACHE_MODE_UC_MINUS,
5454
[__pte2cm_idx( 0 | _PAGE_PCD | 0 )] = _PAGE_CACHE_MODE_UC_MINUS,
5555
[__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | 0 )] = _PAGE_CACHE_MODE_UC,
5656
[__pte2cm_idx( 0 | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_WB,
57-
[__pte2cm_idx(_PAGE_PWT | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_WT,
57+
[__pte2cm_idx(_PAGE_PWT | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS,
5858
[__pte2cm_idx(0 | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS,
5959
[__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC,
6060
};

0 commit comments

Comments
 (0)