OvmfPkg/ResetVector: enable caching in initial page tables

In UEFI X64 we use other mechanisms to disable caching.
(CD/NW in CR0 and MTRRs.)

This fixes a slow boot issue with SVM.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14716 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw b/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw
index ff083636008d2f4cd6836ab8daeee15b29bda600..237d08a293d01f2119fa0b6353605e9d470b14a9 100644 (file)
Binary files a/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw and b/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw differ

diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVector/Ia32/PageTables64.asm
index 5ebf211fbc356d12889b5aa6c1fa2fdf94bbb51f..8280e8f140bf95d3dbe90e6febb05634b2604015 100644 (file)
--- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm
+++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm
@@ -28,14 +28,12 @@ BITS    32
 %define PAGE_2M_PAT          0x01000\r
 \r
 %define PAGE_2M_PDE_ATTR (PAGE_2M_MBO + \\r
-                          PAGE_CACHE_DISABLE + \\r
                           PAGE_ACCESSED + \\r
                           PAGE_DIRTY + \\r
                           PAGE_READ_WRITE + \\r
                           PAGE_PRESENT)\r
 \r
-%define PAGE_PDP_ATTR (PAGE_CACHE_DISABLE + \\r
-                       PAGE_ACCESSED + \\r
+%define PAGE_PDP_ATTR (PAGE_ACCESSED + \\r
                        PAGE_READ_WRITE + \\r
                        PAGE_PRESENT)\r
 \r