SecurityPkg: Tcg2ConfigFfaPeim: FFA run should use the returned ID

kuqin12 · kuqin12 · commit 9a631df224c7 · 2026-06-22T13:52:08.000-07:00
As the FFA function now returns the target ID properly, instead of
hardcoding the FFA_RUN target ID being the TPM SP, we use the parsed
ID to issue the FFA_RUN.

Signed-off-by: Kun Qin &lt;kun.qin@microsoft.com&gt;
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigFfaPeim.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigFfaPeim.c
@@ -69,7 +69,7 @@ Tpm2FfaCheckInterfaceVersion (
   Status = ArmFfaLibMsgSendDirectReq2 (TpmPartId, &gTpm2ServiceFfaGuid, &TpmArgs);
   while (Status == EFI_INTERRUPT_PENDING) {
     // We are assuming vCPU0 of the TPM SP since it is UP.
-    Status = ArmFfaLibRun (TpmPartId, 0x00, &TpmArgs);
+    Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (TpmArgs.Header.x1), 0x00, &TpmArgs);
   }
 
   if (EFI_ERROR (Status) || (TpmArgs.Arg0 != TPM2_FFA_SUCCESS_OK_RESULTS_RETURNED)) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ Tpm2FfaCheckInterfaceVersion (`
`69`	`69`	`Status = ArmFfaLibMsgSendDirectReq2 (TpmPartId, &gTpm2ServiceFfaGuid, &TpmArgs);`
`70`	`70`	`while (Status == EFI_INTERRUPT_PENDING) {`
`71`	`71`	`// We are assuming vCPU0 of the TPM SP since it is UP.`
`72`		`- Status = ArmFfaLibRun (TpmPartId, 0x00, &TpmArgs);`
	`72`	`+ Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (TpmArgs.Header.x1), 0x00, &TpmArgs);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (EFI_ERROR (Status) \|\| (TpmArgs.Arg0 != TPM2_FFA_SUCCESS_OK_RESULTS_RETURNED)) {`