diff options
| author | Sumit Garg <sumit.garg@linaro.org> | 2018-11-02 12:23:14 +0530 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-11-05 12:04:35 +0100 |
| commit | e40f8efb8b06e023689120452e7ed5db199363de (patch) | |
| tree | b4d02bc8f751e1c0597484edc3a89e18e36feb1b /ArmPkg | |
| parent | 6cf3aeaeb1b242ff3bb076ba4c93248b5f387c7f (diff) | |
| download | edk2-e40f8efb8b06e023689120452e7ed5db199363de.tar.gz edk2-e40f8efb8b06e023689120452e7ed5db199363de.tar.bz2 edk2-e40f8efb8b06e023689120452e7ed5db199363de.zip | |
ArmPkg/OpteeLib: Fix compilation issues for ARM (32-bit)
Correct usage of EFI_PHYSICAL_ADDRESS (always 64-bit) vs. pointers
(depending on architecture).
Reported-by: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'ArmPkg')
| -rw-r--r-- | ArmPkg/Library/OpteeLib/Optee.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ArmPkg/Library/OpteeLib/Optee.c b/ArmPkg/Library/OpteeLib/Optee.c index 8ac31cb282..55dcc7853b 100644 --- a/ArmPkg/Library/OpteeLib/Optee.c +++ b/ArmPkg/Library/OpteeLib/Optee.c @@ -134,7 +134,7 @@ OpteeInit ( STATIC
UINT32
OpteeCallWithArg (
- IN EFI_PHYSICAL_ADDRESS PhysicalArg
+ IN UINT64 PhysicalArg
)
{
ARM_SMC_ARGS ArmSmcArgs;
@@ -213,7 +213,7 @@ OpteeOpenSession ( MessageArg->NumParams = 2;
- if (OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg)) {
+ if (OpteeCallWithArg ((UINTN)MessageArg)) {
MessageArg->Return = OPTEE_ERROR_COMMUNICATION;
MessageArg->ReturnOrigin = OPTEE_ORIGIN_COMMUNICATION;
}
@@ -246,7 +246,7 @@ OpteeCloseSession ( MessageArg->Command = OPTEE_MESSAGE_COMMAND_CLOSE_SESSION;
MessageArg->Session = Session;
- OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg);
+ OpteeCallWithArg ((UINTN)MessageArg);
return EFI_SUCCESS;
}
@@ -304,7 +304,7 @@ OpteeToMessageParam ( CopyMem (
(VOID *)ParamSharedMemoryAddress,
- (VOID *)InParam->Union.Memory.BufferAddress,
+ (VOID *)(UINTN)InParam->Union.Memory.BufferAddress,
InParam->Union.Memory.Size
);
MessageParam->Union.Memory.BufferAddress = (UINT64)ParamSharedMemoryAddress;
@@ -368,8 +368,8 @@ OpteeFromMessageParam ( }
CopyMem (
- (VOID *)OutParam->Union.Memory.BufferAddress,
- (VOID *)MessageParam->Union.Memory.BufferAddress,
+ (VOID *)(UINTN)OutParam->Union.Memory.BufferAddress,
+ (VOID *)(UINTN)MessageParam->Union.Memory.BufferAddress,
MessageParam->Union.Memory.Size
);
OutParam->Union.Memory.Size = MessageParam->Union.Memory.Size;
@@ -417,7 +417,7 @@ OpteeInvokeFunction ( MessageArg->NumParams = OPTEE_MAX_CALL_PARAMS;
- if (OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg)) {
+ if (OpteeCallWithArg ((UINTN)MessageArg)) {
MessageArg->Return = OPTEE_ERROR_COMMUNICATION;
MessageArg->ReturnOrigin = OPTEE_ORIGIN_COMMUNICATION;
}
|