From: Sumit Garg <sumit.garg@linaro.org>
To: edk2-devel@lists.01.org
Subject: [PATCH v1 1/1] ArmPkg/OpteeLib: Fix compilation issues for ARM (32-bit)
Date: Fri, 2 Nov 2018 12:23:14 +0530 [thread overview]
Message-ID: <1541141594-31500-1-git-send-email-sumit.garg@linaro.org> (raw)
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>
---
ArmPkg/Library/OpteeLib/Optee.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ArmPkg/Library/OpteeLib/Optee.c b/ArmPkg/Library/OpteeLib/Optee.c
index 8ac31cb28266..55dcc7853b59 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;
}
--
2.7.4
next reply other threads:[~2018-11-02 6:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 6:53 Sumit Garg [this message]
2018-11-05 11:05 ` [PATCH v1 1/1] ArmPkg/OpteeLib: Fix compilation issues for ARM (32-bit) Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1541141594-31500-1-git-send-email-sumit.garg@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox