From 0b53c6a5b796f3b1a146f612fd06fa37d1bf7714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Fri, 24 May 2024 00:11:59 +0200 Subject: [PATCH] xen/arch/x86/slaunch.c: Map the TPM event log after TXT regions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Map the TPM event log after the TXT regions are mapped to avoid an early page fault when booting with slaunch. Signed-off-by: Michał Żygowski --- xen/arch/x86/slaunch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/slaunch.c b/xen/arch/x86/slaunch.c index 051376465b..3a6e2f19a8 100644 --- a/xen/arch/x86/slaunch.c +++ b/xen/arch/x86/slaunch.c @@ -61,9 +61,6 @@ void __init map_slaunch_mem_regions(void) map_l2(TPM_TIS_BASE, TPM_TIS_SIZE); - find_evt_log(__va(slaunch_slrt), &evt_log_addr, &evt_log_size); - map_l2((unsigned long)evt_log_addr, evt_log_size); - /* Vendor-specific part. */ if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) { @@ -73,6 +70,10 @@ void __init map_slaunch_mem_regions(void) { map_l2(get_slb_start(), SKINIT_SLB_SIZE); } + + find_evt_log(__va(slaunch_slrt), &evt_log_addr, &evt_log_size); + map_l2((unsigned long)evt_log_addr, evt_log_size); + } void __init protect_slaunch_mem_regions(void)