From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.28614.1620633211534822794 for ; Mon, 10 May 2021 00:53:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=qZeHdHbJ; spf=pass (domain: linaro.org, ip: 209.85.128.50, mailfrom: etienne.carriere@linaro.org) Received: by mail-wm1-f50.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so8290659wmh.4 for ; Mon, 10 May 2021 00:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y7DkIT9KTM05c18PgrtjOe/jnOPQSyoKfsaA7J+KnI0=; b=qZeHdHbJoGj5QozEDmVJi0sozrxOaOB6wtzZLOB0s3NVQqM7D4lRl2gp3uM7C4HAjz 7/j91SFHjYRPmj3nFcZRSkMFr+lr4qaXuuw0XiJzAslCae5H1xYEzHKk8lTig6VAdOWD 8JrHqNX2gZ0y5trH2JhYRYZLKe+ZbZUHOn4JDh0CIcoSqhkzV5PjqEa3a0xEaf08vXkM ODgLPZDF0HLz6vpjkUx3QLBaCqji8yCAGe/FZMW0x9FYrYbllmi2IpdfAWwgCGGueoro aj4x8mJpX6+z8VoorX69vRO9xVGGaMM1F91ALjaOZ36dJLJv2Kf187V5Ox5bArBJ2GSA MfFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y7DkIT9KTM05c18PgrtjOe/jnOPQSyoKfsaA7J+KnI0=; b=YUMOzd47mZXK2sYjPfyb4crfe5i6xQ9yGHQRSKvYGsXbZMR/SB9B2BbFjJMa6TKHmy bGtNBEVZDfu0tbUQ6BCyBZl04DRmfDtwQA9qIEnb+oMjsEP8NGbrGeoO4hIoCbDJ6Y4r A1eYlJ0YyBp2JAv4qkvji6e/zGmlI3olsEa0eVhK6H8ObhR0kkMKorYWwcKDejZ9WesZ yHtdYc5BAz4PqPxuSlyl1r8ASw8qd/1Dm8SoplUtncKbuZE/1ImReZmn075MUOgopFw6 NgMRZ4fhQ4nwzOq47/7TC2kb4nozXcMuUO5khQxLoS2HNdSFzf7BrrSrE1RHa1AXm2Jy AAsg== X-Gm-Message-State: AOAM533ZNTFTVJlfiJK3Cp/v/8PuzXBSFlfo+d1VopoAdpjyp2mXNarC crVLZzH0k/ZFbtl86uy1TyBxKPwwIFDSQ7w0 X-Google-Smtp-Source: ABdhPJx9CFO76TZ6yWx07KE0oDYiSaYRoDp5YvnLdU2IdfqLfcR+OyAPn/GPUoBIm38Gh5TyJyPUCQ== X-Received: by 2002:a7b:cbc2:: with SMTP id n2mr24829341wmi.69.1620633209991; Mon, 10 May 2021 00:53:29 -0700 (PDT) Return-Path: Received: from lmecxl0524.home (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id o13sm18237660wmh.34.2021.05.10.00.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:53:29 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [edk2-platforms][PATCH 3/4] Drivers/OpTee: address cast build warning issue in 32b mode Date: Mon, 10 May 2021 09:53:03 +0200 Message-Id: <20210510075304.9125-4-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210510075304.9125-1-etienne.carriere@linaro.org> References: <20210510075304.9125-1-etienne.carriere@linaro.org> Use (UINTN) cast to cast physical or virtual address values to the pointer size before casting from/to a pointer value. Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Signed-off-by: Etienne Carriere --- Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c b/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c index 6eb19bed0e..83c2750368 100644 --- a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c +++ b/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c @@ -305,7 +305,8 @@ OpTeeRpmbFvbRead ( } } - Base = (VOID *)Instance->MemBaseAddress + (Lba * Instance->BlockSize) + Offset; + Base = (VOID *)(UINTN)Instance->MemBaseAddress + (Lba * Instance->BlockSize) + + Offset; // We could read the data from the RPMB instead of memory // The 2 copies should already be identical // Copy from memory image @@ -387,7 +388,8 @@ OpTeeRpmbFvbWrite ( return Status; } } - Base = (VOID *)Instance->MemBaseAddress + Lba * Instance->BlockSize + Offset; + Base = (VOID *)(UINTN)Instance->MemBaseAddress + (Lba * Instance->BlockSize) + + Offset; Status = ReadWriteRpmb ( SP_SVC_RPMB_WRITE, (UINTN)Buffer, @@ -477,7 +479,8 @@ OpTeeRpmbFvbErase ( return EFI_INVALID_PARAMETER; } NumBytes = NumLba * Instance->BlockSize; - Base = (VOID *)Instance->MemBaseAddress + Start * Instance->BlockSize; + Base = (VOID *)(UINTN)Instance->MemBaseAddress + + (Start * Instance->BlockSize); Buf = AllocatePool (NumLba * Instance->BlockSize); if (Buf == NULL) { return EFI_DEVICE_ERROR; @@ -689,7 +692,7 @@ InitializeFvAndVariableStoreHeaders ( goto Exit; } // Install the combined header in memory - CopyMem ((VOID*)Instance->MemBaseAddress, Headers, HeadersLength); + CopyMem ((VOID*)(UINTN)Instance->MemBaseAddress, Headers, HeadersLength); Exit: FreePool (Headers); @@ -747,14 +750,18 @@ FvbInitialize ( // Read the file from disk and copy it to memory ReadEntireFlash (Instance); - FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)Instance->MemBaseAddress; + FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)Instance->MemBaseAddress; Status = ValidateFvHeader (FwVolHeader); if (EFI_ERROR (Status)) { // There is no valid header, so time to install one. DEBUG ((DEBUG_INFO, "%a: The FVB Header is not valid.\n", __FUNCTION__)); // Reset memory - SetMem64 ((VOID *)Instance->MemBaseAddress, Instance->NBlocks * Instance->BlockSize, ~0UL); + SetMem64 ( + (VOID *)(UINTN)Instance->MemBaseAddress, + Instance->NBlocks * Instance->BlockSize, + ~0UL + ); DEBUG ((DEBUG_INFO, "%a: Erasing Flash.\n", __FUNCTION__)); Status = ReadWriteRpmb ( SP_SVC_RPMB_WRITE, @@ -827,7 +834,7 @@ OpTeeRpmbFvbInit ( mInstance.FvbProtocol.Write = OpTeeRpmbFvbWrite; mInstance.FvbProtocol.Read = OpTeeRpmbFvbRead; - mInstance.MemBaseAddress = (EFI_PHYSICAL_ADDRESS)Addr; + mInstance.MemBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Addr; mInstance.Signature = FLASH_SIGNATURE; mInstance.Initialize = FvbInitialize; mInstance.BlockSize = EFI_PAGE_SIZE; -- 2.17.1