AmpereAltraPkg: Fix TPM PCR changes after reboot

tinhnampere · tinhnampere · commit 69b212c9db54 · 2022-05-24T12:29:36.000+07:00
Currently, TPM PCR changes because of corruption of PreUefi event log.

With current observation, after DxeIpl decoded FVMAIN section, PreUefi
events log are read correctly. This patch changes flash layout in order
that PeiCore executes PEI Guided Section Extraction PPI before
executing Tcg2Pei module.

Signed-off-by: Tinh Nguyen &lt;tinhn@amperecomputing.com&gt;
diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
@@ -164,11 +164,6 @@ APRIORI PEI {
   INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
   INF Silicon/Ampere/AmpereAltraPkg/Drivers/PcieInitPei/PcieInitPei.inf
 
-!if $(TPM2_ENABLE) == TRUE
-  INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf
-  INF Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Pei/Tcg2Pei.inf
-!endif
-
   #
   # Print platform information before passing control into the Driver Execution Environment (DXE) phase
   #
@@ -184,6 +179,11 @@ APRIORI PEI {
     }
   }
 
+!if $(TPM2_ENABLE) == TRUE
+  INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf
+  INF Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Pei/Tcg2Pei.inf
+!endif
+
 [FV.FvMain]
 FvAlignment        = 16
 ERASE_POLARITY     = 1

Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,6 @@ APRIORI PEI {`
`164`	`164`	`INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf`
`165`	`165`	`INF Silicon/Ampere/AmpereAltraPkg/Drivers/PcieInitPei/PcieInitPei.inf`
`166`	`166`
`167`		`-!if $(TPM2_ENABLE) == TRUE`
`168`		`- INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf`
`169`		`- INF Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Pei/Tcg2Pei.inf`
`170`		`-!endif`
`171`		`-`
`172`	`167`	`#`
`173`	`168`	`# Print platform information before passing control into the Driver Execution Environment (DXE) phase`
`174`	`169`	`#`
`@@ -184,6 +179,11 @@ APRIORI PEI {`
`184`	`179`	`}`
`185`	`180`	`}`
`186`	`181`
	`182`	`+!if $(TPM2_ENABLE) == TRUE`
	`183`	`+ INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf`
	`184`	`+ INF Silicon/Ampere/AmpereAltraPkg/Drivers/Tcg2Pei/Tcg2Pei.inf`
	`185`	`+!endif`
	`186`	`+`
`187`	`187`	`[FV.FvMain]`
`188`	`188`	`FvAlignment = 16`
`189`	`189`	`ERASE_POLARITY = 1`