diff options
Diffstat (limited to 'MdeModulePkg')
6 files changed, 16 insertions, 14 deletions
diff --git a/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h b/MdeModulePkg/Include/Guid/ArmFfaRxTxBufferInfo.h index 763dd61..d38f8ce 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 <Uefi/UefiBaseType.h>
+
/**
* 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 a85a616..e2dd99b 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 6b75332..4f0e1a4 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 fb62e61..7c3d39d 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 13f5215..7c44e80 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 c2c7f1b..d368c32 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;
|