There are two paths in the trampoline, and Xen's PAT needs setting up in both,
not just the boot path.
Fixes: 4304ff420e51 ("x86/S3: Drop {save,restore}_rest_processor_state()
completely")
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Wei Liu <w...@xen.org>
CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
CC: Demi Marie Obenour <d...@invisiblethingslab.com>
Entirely untested, but this a fairly embarassing mistake in hindsight.
---
xen/arch/x86/boot/wakeup.S | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S
index c17d613b61ff..08447e193496 100644
--- a/xen/arch/x86/boot/wakeup.S
+++ b/xen/arch/x86/boot/wakeup.S
@@ -130,6 +130,11 @@ wakeup_32:
and %edi, %edx
wrmsr
1:
+ /* Set up PAT before enabling paging. */
+ mov $XEN_MSR_PAT & 0xffffffff, %eax
+ mov $XEN_MSR_PAT >> 32, %edx
+ mov $MSR_IA32_CR_PAT, %ecx
+ wrmsr
/* Set up EFER (Extended Feature Enable Register). */
movl $MSR_EFER,%ecx
--
2.11.0
