Skip to content

[Rebase & FF] Fix Partition ID being used for FFA_RUN calls #1827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuqin12 merged 3 commits into from
Jun 24, 2026
+47 −12
Merged

[Rebase & FF] Fix Partition ID being used for FFA_RUN calls #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85252e4
MdePkg/MdeModulePkg: ArmFfaLib: Expand to include first 4 registers
kuqin12 Jun 19, 2026
065ae97
ArmPkg: MmCommunication: FFA run should use the returned ID
kuqin12 Jun 19, 2026
0ce4540
SecurityPkg: Tpm2DeviceLibFfa: FFA run should use the returned ID
kuqin12 Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ SendFfaMmCommunicate (

while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the StMM SP since it is UP.
Status = ArmFfaLibRun (mStMmPartId, 0x00, NULL);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (CommunicateArgs.Header.x1), 0x00, &CommunicateArgs);
}

return Status;
Expand Down
3 changes: 2 additions & 1 deletion ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ SendFfaMmCommunicate (

while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the StMM SP since it is UP.
Status = ArmFfaLibRun (mStMmPartId, 0x00, NULL);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (CommunicateArgs.Header.x1), 0x00, &CommunicateArgs);
Comment thread
cfernald marked this conversation as resolved.
}

return Status;
Expand Down
20 changes: 17 additions & 3 deletions MdeModulePkg/Library/ArmFfaLib/ArmFfaCommon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,13 +741,17 @@ ArmFfaLibRun (
ArmCallFfa (&FfaArgs);

Status = FfaArgsToEfiStatus (&FfaArgs);
if (EFI_ERROR (Status)) {
return Status;
}
// MU_CHANGE: Copy the FFA header to the direct message arguments
// if (EFI_ERROR (Status)) {
// return Status;
// }

if (DirectMsgArg != NULL) {
ZeroMem (DirectMsgArg, sizeof (DIRECT_MSG_ARGS));

// MU_CHANGE: Copy the FFA header to the direct message arguments
CopyMem (&(DirectMsgArg->Header), &FfaArgs, sizeof (DirectMsgArg->Header));

if (FfaArgs.Arg0 == ARM_FID_FFA_MSG_SEND_DIRECT_RESP) {
DirectMsgArg->Arg0 = FfaArgs.Arg3;
DirectMsgArg->Arg1 = FfaArgs.Arg4;
Expand Down Expand Up @@ -782,6 +786,9 @@ ArmFfaLibRun (
@param [in] Flags Message flags
@param [in, out] ImpDefArgs Implemented defined arguments and
Implemented defined return values
// MU_CHANGE: Copy the FFA header to the direct message arguments
The header registers (x0-x2) will be initialized
with the values from DestPartId and Flags.

@retval EFI_SUCCESS Success
@retval Others Error
Expand Down Expand Up @@ -823,6 +830,8 @@ ArmFfaLibMsgSendDirectReq (

Status = FfaArgsToEfiStatus (&FfaArgs);
if (EFI_ERROR (Status)) {
// MU_CHANGE: Copy the FFA header to the direct message arguments
CopyMem (ImpDefArgs, &FfaArgs, sizeof (DIRECT_MSG_ARGS));
return Status;
}

Expand All @@ -842,6 +851,9 @@ ArmFfaLibMsgSendDirectReq (
@param [in] ServiceGuid Service guid
@param [in, out] ImpDefArgs Implemented defined arguments and
Implemented defined return values
// MU_CHANGE: Copy the FFA header to the direct message arguments
The header registers (x0-x3) will be
initialized with the values from DestPartId and ServiceGuid.

@retval EFI_SUCCESS Success
@retval Others Error
Expand Down Expand Up @@ -907,6 +919,8 @@ ArmFfaLibMsgSendDirectReq2 (

Status = FfaArgsToEfiStatus (&FfaArgs);
if (EFI_ERROR (Status)) {
// MU_CHANGE: Copy the FFA header to the direct message arguments
CopyMem (ImpDefArgs, &FfaArgs, sizeof (DIRECT_MSG_ARGS));
return Status;
}

Expand Down
12 changes: 12 additions & 0 deletions MdePkg/Include/Library/ArmFfaLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ typedef struct ArmFfaArgs {
* FFA_SEND_MSG_DIRECT_REQ2/FFA_SEND_MSG_DIRECT_RESP2 (i.e. v2)
*/
typedef struct DirectMsgArgs {
// MU_CHANGE: Carry the FFA header as part of the direct message content
/// Header containing the arguments for the header registers (x0-x2 (v1) or x0-x3 (v2))
struct {
UINTN x0;
UINTN x1;
UINTN x2;
UINTN x3;
} Header;

/// Implementation define argument 0, this will be set to/from x3(v1) or x4(v2)
UINTN Arg0;

Expand Down Expand Up @@ -97,6 +106,9 @@ typedef struct DirectMsgArgs {
UINTN Arg13;
} DIRECT_MSG_ARGS;

// MU_CHANGE: Carry the FFA header as part of the direct message content
STATIC_ASSERT (sizeof (DIRECT_MSG_ARGS) == sizeof (ARM_FFA_ARGS), "DIRECT_MSG_ARGS and ARM_FFA_ARGS must be the same size");

/**
Trigger FF-A ABI call according to PcdFfaLibConduitSmc.

Expand Down
18 changes: 12 additions & 6 deletions SecurityPkg/Library/Tpm2DeviceLibFfa/Tpm2ServiceFfaRaw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ Tpm2GetInterfaceVersion (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down Expand Up @@ -203,7 +204,8 @@ Tpm2GetFeatureInfo (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down Expand Up @@ -243,7 +245,8 @@ Tpm2ServiceStart (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down Expand Up @@ -284,7 +287,8 @@ Tpm2RegisterNotification (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down Expand Up @@ -317,7 +321,8 @@ Tpm2UnregisterNotification (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down Expand Up @@ -350,7 +355,8 @@ Tpm2FinishNotified (
Status = ArmFfaLibMsgSendDirectReq2 (FfaTpm2PartitionId, &gTpm2ServiceFfaGuid, &FfaDirectReq2Args);
while (Status == EFI_INTERRUPT_PENDING) {
// We are assuming vCPU0 of the TPM SP since it is UP.
Status = ArmFfaLibRun (FfaTpm2PartitionId, 0x00, &FfaDirectReq2Args);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (FfaDirectReq2Args.Header.x1), 0x00, &FfaDirectReq2Args);
}

if (EFI_ERROR (Status)) {
Expand Down
3 changes: 2 additions & 1 deletion SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigFfaPeim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ 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);
// MU_CHANGE: Use the source partition ID of the FFA header for the ffa_run call.
Status = ArmFfaLibRun (GET_SOURCE_PARTITION_ID (TpmArgs.Header.x1), 0x00, &TpmArgs);
Comment thread
cfernald marked this conversation as resolved.
}

if (EFI_ERROR (Status) || (TpmArgs.Arg0 != TPM2_FFA_SUCCESS_OK_RESULTS_RETURNED)) {
Expand Down
Loading