From f85c71816702b068019957e7fd532db51dab9c7e Mon Sep 17 00:00:00 2001 From: Levi Yun Date: Mon, 30 Jun 2025 11:03:36 +0100 Subject: [PATCH] MdeModulePkg/Include: change type of buffer address in ArmFfaRxTxBufferInfo Change type of buffer address type in ArmFfaRxTxBufferInfo so that reduce the type casting. Signed-off-by: Yeoreum Yun --- MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h | 14 ++++++++------ MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c | 2 +- MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.c | 4 ++-- MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.c | 2 +- MdeModulePkg/Library/ArmFfaLib/ArmFfaSecRxTxMap.c | 4 ++-- .../Library/ArmFfaLib/ArmFfaStandaloneMmRxTxMap.c | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h b/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h index 763dd61508..d38f8cec61 100644 --- a/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h +++ b/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h @@ -9,27 +9,29 @@ #ifndef ARM_FFA_RX_TX_BUFFER_INFO_H_ #define ARM_FFA_RX_TX_BUFFER_INFO_H_ +#include + /** * Guid Hob Data for gArmFfaRxTxBufferInfoGuid Guid Hob. */ typedef struct ArmFfaRxTxBuffersInfo { /// Tx Buffer Address. - VOID *TxBufferAddr; + EFI_PHYSICAL_ADDRESS TxBufferAddr; /// Tx Buffer Size. - UINT64 TxBufferSize; + UINT64 TxBufferSize; /// Rx Buffer Address. - VOID *RxBufferAddr; + EFI_PHYSICAL_ADDRESS RxBufferAddr; /// Rx Buffer Size. - UINT64 RxBufferSize; + UINT64 RxBufferSize; /// Rx/Tx buffer should be remapped to permanent memory. - BOOLEAN RemapRequired; + BOOLEAN RemapRequired; /// Rx/Tx buffer offset from its allocation base. - UINT64 RemapOffset; + UINT64 RemapOffset; } ARM_FFA_RX_TX_BUFFER_INFO; extern EFI_GUID gArmFfaRxTxBufferInfoGuid; diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c index a85a616f15..e2dd99be67 100644 --- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c +++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.c @@ -169,7 +169,7 @@ ArmFfaPeiLibConstructor ( RxTxBufferAllocationHob = FindRxTxBufferAllocationHob (FALSE); ASSERT (RxTxBufferAllocationHob != NULL); BufferInfo->RemapOffset = - (UINTN)((EFI_PHYSICAL_ADDRESS)((UINTN)BufferInfo->TxBufferAddr) - + (UINTN)(BufferInfo->TxBufferAddr - RxTxBufferAllocationHob->AllocDescriptor.MemoryBaseAddress); CopyGuid ( diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.c index 6b753320a0..4f0e1a4e8f 100644 --- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.c +++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaRxTxMap.c @@ -230,9 +230,9 @@ UpdateRxTxBufferInfo ( OUT ARM_FFA_RX_TX_BUFFER_INFO *BufferInfo ) { - BufferInfo->TxBufferAddr = (VOID *)(UINTN)PcdGet64 (PcdFfaTxBuffer); + BufferInfo->TxBufferAddr = PcdGet64 (PcdFfaTxBuffer); BufferInfo->TxBufferSize = PcdGet64 (PcdFfaTxRxPageCount) * EFI_PAGE_SIZE; - BufferInfo->RxBufferAddr = (VOID *)(UINTN)PcdGet64 (PcdFfaRxBuffer); + BufferInfo->RxBufferAddr = PcdGet64 (PcdFfaRxBuffer); BufferInfo->RxBufferSize = PcdGet64 (PcdFfaTxRxPageCount) * EFI_PAGE_SIZE; } diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.c index fb62e61eda..7c3d39d270 100644 --- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.c +++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.c @@ -99,7 +99,7 @@ ArmFfaSecLibConstructor ( UpdateRxTxBufferInfo (BufferInfo); BufferInfo->RemapOffset = - (UINTN)((EFI_PHYSICAL_ADDRESS)((UINTN)BufferInfo->TxBufferAddr) - + (UINTN)(BufferInfo->TxBufferAddr - RxTxBufferAllocationHob->AllocDescriptor.MemoryBaseAddress); BufferInfo->RemapRequired = TRUE; diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecRxTxMap.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecRxTxMap.c index 13f52157ca..7c44e80822 100644 --- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecRxTxMap.c +++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaSecRxTxMap.c @@ -276,9 +276,9 @@ UpdateRxTxBufferInfo ( OUT ARM_FFA_RX_TX_BUFFER_INFO *BufferInfo ) { - BufferInfo->TxBufferAddr = mTxBuffer; + BufferInfo->TxBufferAddr = (UINTN)mTxBuffer; BufferInfo->TxBufferSize = PcdGet64 (PcdFfaTxRxPageCount) * EFI_PAGE_SIZE; - BufferInfo->RxBufferAddr = mRxBuffer; + BufferInfo->RxBufferAddr = (UINTN)mRxBuffer; BufferInfo->RxBufferSize = PcdGet64 (PcdFfaTxRxPageCount) * EFI_PAGE_SIZE; } diff --git a/MdeModulePkg/Library/ArmFfaLib/ArmFfaStandaloneMmRxTxMap.c b/MdeModulePkg/Library/ArmFfaLib/ArmFfaStandaloneMmRxTxMap.c index c2c7f1b1f5..d368c329ee 100644 --- a/MdeModulePkg/Library/ArmFfaLib/ArmFfaStandaloneMmRxTxMap.c +++ b/MdeModulePkg/Library/ArmFfaLib/ArmFfaStandaloneMmRxTxMap.c @@ -173,8 +173,8 @@ ArmFfaLibRxTxMap ( goto ErrorHandler; } - mArmFfaRxTxBufferStmmInfo->TxBufferAddr = TxBuffer; - mArmFfaRxTxBufferStmmInfo->RxBufferAddr = RxBuffer; + mArmFfaRxTxBufferStmmInfo->TxBufferAddr = (UINTN)TxBuffer; + mArmFfaRxTxBufferStmmInfo->RxBufferAddr = (UINTN)RxBuffer; mArmFfaRxTxBufferStmmInfo->TxBufferSize = BufferSize; mArmFfaRxTxBufferStmmInfo->RxBufferSize = BufferSize;