xen/arch/x86/slaunch.c: Map the TPM event log after TXT regions

miczyg1 · miczyg1 · commit 0b53c6a5b796 · 2024-05-24T00:11:59.000+02:00
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 &lt;michal.zygowski@3mdeb.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,6 @@ void __init map_slaunch_mem_regions(void)`
`61`	`61`
`62`	`62`	`map_l2(TPM_TIS_BASE, TPM_TIS_SIZE);`
`63`	`63`
`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`		`-`
`67`	`64`	`/* Vendor-specific part. */`
`68`	`65`	`if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL )`
`69`	`66`	`{`
`@@ -73,6 +70,10 @@ void __init map_slaunch_mem_regions(void)`
`73`	`70`	`{`
`74`	`71`	`map_l2(get_slb_start(), SKINIT_SLB_SIZE);`
`75`	`72`	`}`
	`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`	`+`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`void __init protect_slaunch_mem_regions(void)`