uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ArmPkg/Driver: use ArmFfaGetPartitionInfo() in Mmcommunication

Browse source 
Use ArmFfaGetPartitionInfo() to get partition information.
This simplifies the code to get partition information.

Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
This commit is contained in:
Levi Yun 2025-10-12 22:03:26 +01:00 • committed by mergify[bot]
parent c16f1cc684
commit 8955d8db32
2 changed files with 12 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

56
ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c
View file

@ -547,13 +547,7 @@ InitializeFfaCommunication (
)
{
EFI_STATUS Status;
VOID *TxBuffer;
UINT64 TxBufferSize;
VOID *RxBuffer;
UINT64 RxBufferSize;
EFI_FFA_PART_INFO_DESC *StmmPartInfo;
UINT32 Count;
UINT32 Size;
EFI_FFA_PART_INFO_DESC StmmPartInfo;
Status = ArmFfaLibPartitionIdGet (&mPartId);
if (EFI_ERROR (Status)) {
@ -565,62 +559,26 @@ InitializeFfaCommunication (
return Status;
}
Status = ArmFfaLibGetRxTxBuffers (
&TxBuffer,
&TxBufferSize,
&RxBuffer,
&RxBufferSize
);
Status = ArmFfaLibGetPartitionInfo (&gEfiMmCommunication2ProtocolGuid, &StmmPartInfo);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"Failed to get Rx/Tx Buffer. Status: %r\n",
Status
));
return Status;
}
Status = ArmFfaLibPartitionInfoGet (
&gEfiMmCommunication2ProtocolGuid,
FFA_PART_INFO_FLAG_TYPE_DESC,
&Count,
&Size
);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"Failed to get Stmm(%g) partition Info. Status: %r\n",
"Failed to get partition Info(%g). Status: %r\n",
&gEfiMmCommunication2ProtocolGuid,
Status
));
return Status;
}
if ((Count != 1) || (Size < sizeof (EFI_FFA_PART_INFO_DESC))) {
Status = EFI_INVALID_PARAMETER;
DEBUG ((
DEBUG_ERROR,
"Invalid partition Info(%g). Count: %d, Size: %d\n",
&gEfiMmCommunication2ProtocolGuid,
Count,
Size
));
goto ErrorHandler;
}
StmmPartInfo = (EFI_FFA_PART_INFO_DESC *)RxBuffer;
if ((StmmPartInfo->PartitionProps & FFA_PART_PROP_RECV_DIRECT_REQ) == 0x00) {
if ((StmmPartInfo.PartitionProps & FFA_PART_PROP_RECV_DIRECT_REQ) == 0x00) {
Status = EFI_UNSUPPORTED;
DEBUG ((DEBUG_ERROR, "StandaloneMm doesn't receive DIRECT_MSG_REQ...\n"));
goto ErrorHandler;
return Status;
}
mStMmPartId = StmmPartInfo->PartitionId;
mStMmPartId = StmmPartInfo.PartitionId;
ErrorHandler:
ArmFfaLibRxRelease (mPartId);
return Status;
return EFI_SUCCESS;
}
/**

50
ArmPkg/Drivers/MmCommunicationPei/MmCommunicationPei.c
View file

@ -142,13 +142,7 @@ InitializeFfaCommunication (
)
{
EFI_STATUS Status;
VOID *TxBuffer;
UINT64 TxBufferSize;
VOID *RxBuffer;
UINT64 RxBufferSize;
EFI_FFA_PART_INFO_DESC *StmmPartInfo;
UINT32 Count;
UINT32 Size;
EFI_FFA_PART_INFO_DESC StmmPartInfo;
Status = ArmFfaLibPartitionIdGet (&mPartId);
if (EFI_ERROR (Status)) {
@ -160,58 +154,24 @@ InitializeFfaCommunication (
return Status;
}
Status = ArmFfaLibGetRxTxBuffers (
&TxBuffer,
&TxBufferSize,
&RxBuffer,
&RxBufferSize
);
Status = ArmFfaLibGetPartitionInfo (&gEfiMmCommunication2ProtocolGuid, &StmmPartInfo);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"Failed to get Rx/Tx Buffer. Status: %r\n",
Status
));
return Status;
}
Status = ArmFfaLibPartitionInfoGet (
&gEfiMmCommunication2ProtocolGuid,
FFA_PART_INFO_FLAG_TYPE_DESC,
&Count,
&Size
);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
"Failed to get Stmm(%g) partition Info. Status: %r\n",
"Failed to get partition Info(%g). Status: %r\n",
&gEfiMmCommunication2ProtocolGuid,
Status
));
return Status;
}
if ((Count != 1) || (Size < sizeof (EFI_FFA_PART_INFO_DESC))) {
Status = EFI_INVALID_PARAMETER;
DEBUG ((
DEBUG_ERROR,
"Invalid partition Info(%g). Count: %d, Size: %d\n",
&gEfiMmCommunication2ProtocolGuid,
Count,
Size
));
goto ErrorHandler;
}
StmmPartInfo = (EFI_FFA_PART_INFO_DESC *)RxBuffer;
if ((StmmPartInfo->PartitionProps & FFA_PART_PROP_RECV_DIRECT_REQ) == 0x00) {
if ((StmmPartInfo.PartitionProps & FFA_PART_PROP_RECV_DIRECT_REQ) == 0x00) {
Status = EFI_UNSUPPORTED;
DEBUG ((DEBUG_ERROR, "StandaloneMm doesn't receive DIRECT_MSG_REQ...\n"));
goto ErrorHandler;
}
mStMmPartId = StmmPartInfo->PartitionId;
mStMmPartId = StmmPartInfo.PartitionId;
ErrorHandler:
ArmFfaLibRxRelease (mPartId);