Skip to content

Commit 0b53c6a

Browse files
committed
xen/arch/x86/slaunch.c: Map the TPM event log after TXT regions
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 <michal.zygowski@3mdeb.com>
1 parent e19e079 commit 0b53c6a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

xen/arch/x86/slaunch.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ void __init map_slaunch_mem_regions(void)
6161

6262
map_l2(TPM_TIS_BASE, TPM_TIS_SIZE);
6363

64-
find_evt_log(__va(slaunch_slrt), &evt_log_addr, &evt_log_size);
65-
map_l2((unsigned long)evt_log_addr, evt_log_size);
66-
6764
/* Vendor-specific part. */
6865
if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL )
6966
{
@@ -73,6 +70,10 @@ void __init map_slaunch_mem_regions(void)
7370
{
7471
map_l2(get_slb_start(), SKINIT_SLB_SIZE);
7572
}
73+
74+
find_evt_log(__va(slaunch_slrt), &evt_log_addr, &evt_log_size);
75+
map_l2((unsigned long)evt_log_addr, evt_log_size);
76+
7677
}
7778

7879
void __init protect_slaunch_mem_regions(void)

0 commit comments

Comments
 (0)