From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::d43; helo=mail-io1-xd43.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1BD2421A00AE6 for ; Mon, 5 Nov 2018 03:06:00 -0800 (PST) Received: by mail-io1-xd43.google.com with SMTP id a23-v6so6172276iod.7 for ; Mon, 05 Nov 2018 03:06:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=wfDOTOSm8dZoA6TSIsZw9+J6loho8SsJgdy1gMoUA2w=; b=FkoxpFvIma9T4p/bI4IWHR6kMNEHQjUjCrPi8ITTog1UfZXB6pENyzCNVmf9js1GBX cNHmAx+4NY0bc9ELnBBNBoYPXEC7rXUiFL4LT5tVhmbW2h02psvHewLzgrp/zfOJG7o9 nhKR8/PnQ1og9uhBz9YBmR3tFwtfC1fL4NfWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=wfDOTOSm8dZoA6TSIsZw9+J6loho8SsJgdy1gMoUA2w=; b=rGhLbcUFabq3l7qJ1CilwcDYJJ74Ow1xQY5dW1xujFwfwK9E/BprTFbRUuXBmhfOfI 4zM4q6pglt5Eg1rlS8Iym8UYw8EacgnlwcEDv7bPXxJ+qIY017J6LPl3Ngv932wkOUYj /LeLK4XuakJNFdR2OPaIDJjYtbSgubV2uc8fZhX9cLZqNC1jaUBObUDjvIR4LFlovmHS 6CpUOnimTKCh0LRS1cn97L8xYVhJYHGnJiNsF15FGhdeJWMLYvRmafe5aizBVrqd8ekS 6iLdub4+llvfbwrYbqUf+mInxh767pExye4fBBVWp4o4LXSqHEAFjLwx7szDAJjH0k/2 XVTw== X-Gm-Message-State: AGRZ1gIfbj0+ndPw5cRKeXeeFj4ZMmJu1yRJ1H1GDCEaRCb+bWcJvyDX pQGg/jDD0FlJp66+ME8HfTCSepWeWMGO1H6Q30F4Hg== X-Google-Smtp-Source: AJdET5dk9V2a5MpfLASM/QJBK0lh85idBWFTDaLua6w6hE6GmkkptpPrCZRGEGMB9gXS2aXyFSKHhaMNnJ7+FP370RY= X-Received: by 2002:a6b:3707:: with SMTP id e7-v6mr18233940ioa.60.1541415959673; Mon, 05 Nov 2018 03:05:59 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a6b:4f16:0:0:0:0:0 with HTTP; Mon, 5 Nov 2018 03:05:58 -0800 (PST) In-Reply-To: <1541141594-31500-1-git-send-email-sumit.garg@linaro.org> References: <1541141594-31500-1-git-send-email-sumit.garg@linaro.org> From: Ard Biesheuvel Date: Mon, 5 Nov 2018 12:05:58 +0100 Message-ID: To: Sumit Garg Cc: "edk2-devel@lists.01.org" , Leif Lindholm Subject: Re: [PATCH v1 1/1] ArmPkg/OpteeLib: Fix compilation issues for ARM (32-bit) X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2018 11:06:01 -0000 Content-Type: text/plain; charset="UTF-8" On 2 November 2018 at 07:53, Sumit Garg wrote: > Correct usage of EFI_PHYSICAL_ADDRESS (always 64-bit) vs. pointers > (depending on architecture). > > Reported-by: Leif Lindholm > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Sumit Garg Thanks for the fix Reviewed-by: Ard Biesheuvel Pushed as e40f8efb8b06e023689120452e7ed5db199363de > --- > 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 >