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>

diff --git a/ArmPkg/Library/OpteeLib/Optee.c b/ArmPkg/Library/OpteeLib/Optee.c
index 8ac31cb282663f2a1dd3c99acbf9ffe434573e2c..55dcc7853b596de2fb8dce2c9da02cc818f3191d 100644 (file)
--- a/ArmPkg/Library/OpteeLib/Optee.c
+++ b/ArmPkg/Library/OpteeLib/Optee.c
@@ -134,7 +134,7 @@ OpteeInit (
 STATIC\r
 UINT32\r
 OpteeCallWithArg (\r
-  IN EFI_PHYSICAL_ADDRESS PhysicalArg\r
+  IN UINT64 PhysicalArg\r
   )\r
 {\r
   ARM_SMC_ARGS ArmSmcArgs;\r
@@ -213,7 +213,7 @@ OpteeOpenSession (
 \r
   MessageArg->NumParams = 2;\r
 \r
-  if (OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg)) {\r
+  if (OpteeCallWithArg ((UINTN)MessageArg)) {\r
     MessageArg->Return = OPTEE_ERROR_COMMUNICATION;\r
     MessageArg->ReturnOrigin = OPTEE_ORIGIN_COMMUNICATION;\r
   }\r
@@ -246,7 +246,7 @@ OpteeCloseSession (
   MessageArg->Command = OPTEE_MESSAGE_COMMAND_CLOSE_SESSION;\r
   MessageArg->Session = Session;\r
 \r
-  OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg);\r
+  OpteeCallWithArg ((UINTN)MessageArg);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -304,7 +304,7 @@ OpteeToMessageParam (
 \r
       CopyMem (\r
         (VOID *)ParamSharedMemoryAddress,\r
-        (VOID *)InParam->Union.Memory.BufferAddress,\r
+        (VOID *)(UINTN)InParam->Union.Memory.BufferAddress,\r
         InParam->Union.Memory.Size\r
         );\r
       MessageParam->Union.Memory.BufferAddress = (UINT64)ParamSharedMemoryAddress;\r
@@ -368,8 +368,8 @@ OpteeFromMessageParam (
       }\r
 \r
       CopyMem (\r
-        (VOID *)OutParam->Union.Memory.BufferAddress,\r
-        (VOID *)MessageParam->Union.Memory.BufferAddress,\r
+        (VOID *)(UINTN)OutParam->Union.Memory.BufferAddress,\r
+        (VOID *)(UINTN)MessageParam->Union.Memory.BufferAddress,\r
         MessageParam->Union.Memory.Size\r
         );\r
       OutParam->Union.Memory.Size = MessageParam->Union.Memory.Size;\r
@@ -417,7 +417,7 @@ OpteeInvokeFunction (
 \r
   MessageArg->NumParams = OPTEE_MAX_CALL_PARAMS;\r
 \r
-  if (OpteeCallWithArg ((EFI_PHYSICAL_ADDRESS)MessageArg)) {\r
+  if (OpteeCallWithArg ((UINTN)MessageArg)) {\r
     MessageArg->Return = OPTEE_ERROR_COMMUNICATION;\r
     MessageArg->ReturnOrigin = OPTEE_ORIGIN_COMMUNICATION;\r
   }\r