util/x86/x86_page_tables: update PAT mapping to match linux

The linux kernel uses the following mapping for PAT entries:
  PTE encoding:
      PAT
      |PCD
      ||PWT  PAT
      |||    slot
      000    0    WB : _PAGE_CACHE_MODE_WB
      001    1    WC : _PAGE_CACHE_MODE_WC
      010    2    UC-: _PAGE_CACHE_MODE_UC_MINUS
      011    3    UC : _PAGE_CACHE_MODE_UC
      100    4    WB : Reserved
      101    5    WP : _PAGE_CACHE_MODE_WP
      110    6    UC-: Reserved
      111    7    WT : _PAGE_CACHE_MODE_WT

Update the page table generator to match what the linux kernel is
using. This just makes things consistent with linux.

BUG=b:72728953

Change-Id: Ie5ddab5c86d4e03688d7e808fcae34ce954b64f9
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/25711
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
This commit is contained in:
Aaron Durbin 2018-04-17 08:45:36 -06:00 committed by Patrick Georgi
parent 9a1bb36137
commit 2b72e6bdfd
1 changed files with 15 additions and 6 deletions

View File

@ -185,16 +185,25 @@ func (cw *cWriter) WritePageEntry(data interface{}) error {
return nil return nil
} }
// This map represents what the IA32_PAT MSR // This map represents what the IA32_PAT MSR should be at runtime. The indicies
var patMsrIndexByType = map[uint]uint{ // are what the linux kernel uses. Reserved entries are not used.
PAT_WB: 0, // 0 WB : _PAGE_CACHE_MODE_WB
PAT_WT: 1, // 1 WC : _PAGE_CACHE_MODE_WC
PAT_UCMINUS: 2, // 2 UC-: _PAGE_CACHE_MODE_UC_MINUS
PAT_UC: 3, // 3 UC : _PAGE_CACHE_MODE_UC
// 4 WB : Reserved
// 5 WP : _PAGE_CACHE_MODE_WP
// 6 UC-: Reserved
// 7 WT : _PAGE_CACHE_MODE_WT
// In order to use WP and WC then the IA32_PAT MSR needs to be updated // In order to use WP and WC then the IA32_PAT MSR needs to be updated
// as these are not the power on reset values. // as these are not the power on reset values.
PAT_WP: 6, var patMsrIndexByType = map[uint]uint{
PAT_WC: 7, PAT_WB: 0,
PAT_WC: 1,
PAT_UCMINUS: 2,
PAT_UC: 3,
PAT_WP: 5,
PAT_WT: 7,
} }
type addressRange struct { type addressRange struct {