From nobody Sat Apr 20 16:32:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61831+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61831+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1593514155; cv=none; d=zohomail.com; s=zohoarc; b=AV4CSk10MoVpJGQgxPFMSh8J4bf5r0SOHR74UMGmsCkR0T+upfARZThjMlyaVp7pPgr8k/vNXJMi/Y2nr5rBVdEE+2DHr4wnDpXgzsobB8swVWfCcefmw/27B8SXBes5IzcPtOQLwuaesFmLIDt0eJE5wTHPY/SxkeBHFauNONo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593514155; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=xvQhbTrN4uv1R5HTHdcg0S+v+m9P9Ex7dtGZt1H0Pi4=; b=fiifx2k/56IHOkRAuFVFjl0ODJxaq7rDrMhLLAjFAJLDCq48Pe0LtKTm4hQ5hWXR1Ceuu72apPEb6Zm1NBBvXL6SI/YNIStq1RzRACLD4vXjgweyS1ywjD7MJLKAlL5w2u0vo/W+s2liu96sxKK7wrYp3XdBYDUvnSrkooHy+5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61831+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1593514155650324.5498643955199; Tue, 30 Jun 2020 03:49:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id du01YY1788612xbyZaEkOmLp; Tue, 30 Jun 2020 03:49:14 -0700 X-Received: from cam-smtp0.cambridge.arm.com (cam-smtp0.cambridge.arm.com [217.140.106.53]) by mx.groups.io with SMTP id smtpd.web11.12891.1593514150731490137 for ; Tue, 30 Jun 2020 03:49:11 -0700 X-Received: from E119881.Arm.com (E119881.Arm.com [10.1.197.28]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id 05UAn70t025781; Tue, 30 Jun 2020 11:49:07 +0100 From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , leif@nuviainc.com, ard.biesheuvel@arm.com, nd@arm.com Subject: [edk2-devel] [PATCH v1 1/2] EmbeddedPkg: Fix build error for MmcDxe Date: Tue, 30 Jun 2020 11:49:00 +0100 Message-Id: <20200630104901.11648-2-pierre.gondois@arm.com> In-Reply-To: <20200630104901.11648-1-pierre.gondois@arm.com> References: <20200630104901.11648-1-pierre.gondois@arm.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: uCAAxuy31wOBfDGUGSdDrY94x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1593514154; bh=OlZ85yfBSc5CkmrnIxPTylC5zgoqiVzAlVVsxkQr/lM=; h=Cc:Date:From:Reply-To:Subject:To; b=MKILvpzxiL8PELuby1nkIzVA1xbxk82CfVpDmPBmAd5nMYiCTr1zBIF9WWb7Iwxke6z 2cv0onz9AGhZP5bGxc/08dhCltGVVQ5Wzek/W/+3qeOUzddAqyrGdhkCmbKimws5LKuBn Qge/Ct37adOhrBSSbBoSRLw0p7X580UBfZs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois The following command line: build -b NOOPT -a IA32 -t VS2017 -p edk2\EmbeddedPkg\EmbeddedPkg.dsc Generates the following error: MmcDxe.lib(Diagnostics.obj) : error LNK2001: unresolved external symbol __allshl MmcDxe.lib(Diagnostics.obj) : error LNK2001: unresolved external symbol __aullshr MmcDxe.lib(MmcBlockIo.obj) : error LNK2001: unresolved external symbol __allmul These erros are due to the use of shift/multiply operations on UINT64 variable on a IA32 architecture. Signed-off-by: Pierre Gondois Reviewed-by: Leif Lindholm --- The changes can be seen at: https://github.com/PierreARM/edk2/commits/831_F= ix_VS2017_build_error_v1 Notes: v1: - Fix VS2017 build errors. [Pierre] EmbeddedPkg/Universal/MmcDxe/Diagnostics.c | 10 +++++++--- EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c b/EmbeddedPkg/Unive= rsal/MmcDxe/Diagnostics.c index 20defeb8745a2eb243f316ba9d4e0d03016e260b..49b069043093544a3cbadc46fda= 4de483803d638 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c +++ b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c @@ -1,7 +1,7 @@ /** @file Diagnostics Protocol implementation for the MMC DXE driver =20 - Copyright (c) 2011-2014, ARM Limited. All rights reserved. + Copyright (c) 2011-2020, ARM Limited. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -56,7 +56,7 @@ GenerateRandomBuffer ( UINT64* Buffer64 =3D (UINT64*)Buffer; =20 for (i =3D 0; i < (BufferSize >> 3); i++) { - *Buffer64 =3D i | (~i << 32); + *Buffer64 =3D i | LShiftU64 (~i, 32); Buffer64++; } } @@ -227,7 +227,11 @@ MmcDriverDiagnosticsRunDiagnostics ( =20 // LBA=3D10 Size=3DBlockSize DiagnosticLog (L"MMC Driver Diagnostics - Test: Any Block\n"); - Status =3D MmcReadWriteDataTest (MmcHostInstance, MmcHostInstance->Block= Io.Media->LastBlock >> 1, MmcHostInstance->BlockIo.Media->BlockSize); + Status =3D MmcReadWriteDataTest ( + MmcHostInstance, + RShiftU64 (MmcHostInstance->BlockIo.Media->LastBlock, 1), + MmcHostInstance->BlockIo.Media->BlockSize + ); =20 // LBA=3DLastBlock Size=3DBlockSize DiagnosticLog (L"MMC Driver Diagnostics - Test: Last Block\n"); diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Univer= sal/MmcDxe/MmcBlockIo.c index b508c466d9c5c52ffff7855ea32cbd427927e27b..2a5d72d4daf6045e691e51d5b82= ed8e6fb721121 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2011-2015, ARM Limited. All rights reserved. +* Copyright (c) 2011-2020, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -149,7 +149,7 @@ MmcTransferBlock ( if (MmcHostInstance->CardInfo.OCRData.AccessMode & SD_CARD_CAPACITY) { CmdArg =3D Lba; } else { - CmdArg =3D Lba * This->Media->BlockSize; + CmdArg =3D MultU64x32 (Lba, This->Media->BlockSize); } } else { //Set command argument based on the card access mode (Byte mode or Blo= ck mode) @@ -157,7 +157,7 @@ MmcTransferBlock ( MMC_OCR_ACCESS_SECTOR) { CmdArg =3D Lba; } else { - CmdArg =3D Lba * This->Media->BlockSize; + CmdArg =3D MultU64x32 (Lba, This->Media->BlockSize); } } =20 --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61831): https://edk2.groups.io/g/devel/message/61831 Mute This Topic: https://groups.io/mt/75211230/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 20 16:32:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61832+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61832+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1593514160; cv=none; d=zohomail.com; s=zohoarc; b=YpzmacHrFNAU+gB7iP5CEujs1IIXygWcCROCMwmPuIAk93/vXHwCTYVsSdfKajqVwsJM8Y1XgzCuBSQlsIO3ce+eomTYVOvyVkf+qsqMXBU/yGSgpf3HWB/6tJX6HzPVlHwEwvjeMhavllpej0W7Z6RG5+3H/VAxcNdVXMjBrpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593514160; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=MFCGUJ3knPTYk3RrKyo6zwGWMLygfCoYd8Udf1wa7Ak=; b=K16ClmKXHYH4vMDa5q+anGPBN1elXLftLSFn/cT8eu2bgD97oqWCS7P66d5nx3jvAdCflghuDf4Ll3dRsWV7p+PZq9tmjuPMWSniYEbBV0IvYIajUSDL7iLAdnRMhI0PCEOOOcKEnT28/37McvvBVOi5TB52t65NAEw9+LnnCEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61832+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1593514160769959.3514481094921; Tue, 30 Jun 2020 03:49:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id rJ0LYY1788612xRtoaF87CRg; Tue, 30 Jun 2020 03:49:19 -0700 X-Received: from cam-smtp0.cambridge.arm.com (cam-smtp0.cambridge.arm.com [217.140.106.53]) by mx.groups.io with SMTP id smtpd.web12.12711.1593514150733839398 for ; Tue, 30 Jun 2020 03:49:11 -0700 X-Received: from E119881.Arm.com (E119881.Arm.com [10.1.197.28]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id 05UAn70u025781; Tue, 30 Jun 2020 11:49:07 +0100 From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , leif@nuviainc.com, ard.biesheuvel@arm.com, nd@arm.com Subject: [edk2-devel] [PATCH v1 2/2] EmbeddedPkg: Add cast from (void*) for VS2017 build Date: Tue, 30 Jun 2020 11:49:01 +0100 Message-Id: <20200630104901.11648-3-pierre.gondois@arm.com> In-Reply-To: <20200630104901.11648-1-pierre.gondois@arm.com> References: <20200630104901.11648-1-pierre.gondois@arm.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: 1jDHdIAecUIo48tqYvJJKYFtx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1593514159; bh=rIcVp0hpG6TmzDKVXqQwFJNIESzjPteGVT3/LBBM1FM=; h=Cc:Date:From:Reply-To:Subject:To; b=Lfb04QN5MZQvPT1FKg2/8QOcvpbcUMughOOq6v5a6TKT0WV4mU0lbQOvT1e202gwDnX /Tb0d1vPd9ovOj5FrInfcEgl5IjKrt0fA6Zzqifqvw+lea3kTDsTppJAm1kTiPV0JNbyz pJOMwIwQiqMvM9vTfxj2eWnWxLPx7b+n4v4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois The following build configrations: build -b DEBUG -a AARCH64 -t VS2017 -p edk2\EmbeddedPkg\EmbeddedPkg.dsc build -b NOOPT -a AARCH64 -t VS2017 -p edk2\EmbeddedPkg\EmbeddedPkg.dsc build -b RELEASE -a AARCH64 -t VS2017 -p edk2\EmbeddedPkg\EmbeddedPkg.dsc are generating the following build errors: edk2\EmbeddedPkg\Library\AndroidBootImgLib\AndroidBootImgLib.c(100): error C2036: 'void *': unknown size edk2\EmbeddedPkg\Library\AndroidBootImgLib\AndroidBootImgLib.c(347): error C2036: 'void *': unknown size Since the size of void* depends on the architecture, it can be dangerous to use void* pointer arithmetic. Plus the C99 doesn't state that void* pointer arithmetic is allowed. This patch adds a cast to fix the Visual Studio errors reported. Signed-off-by: Pierre Gondois --- The changes can be seen at: https://github.com/PierreARM/edk2/commits/831_F= ix_VS2017_build_error_v1 Notes: v1: - Fix VS2017 build errors. [Pierre] EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 13 ++++++++---= -- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/Em= beddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c index e1036954ee586dfc30266eec2897d71bfc949038..bbe0d41018b3d5665c72ee61efe= 737ae57b1b2eb 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2013-2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2013-2020, ARM Ltd. All rights reserved.
Copyright (c) 2017, Linaro. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -97,7 +97,7 @@ AndroidBootImgGetKernelInfo ( ASSERT (IS_VALID_ANDROID_PAGE_SIZE (Header->PageSize)); =20 *KernelSize =3D Header->KernelSize; - *Kernel =3D BootImg + Header->PageSize; + *Kernel =3D (UINT8*)BootImg + Header->PageSize; return EFI_SUCCESS; } =20 @@ -339,9 +339,12 @@ AndroidBootImgUpdateFdt ( goto Fdt_Exit; } =20 - Status =3D AndroidBootImgSetProperty64 (UpdatedFdtBase, ChosenNode, - "linux,initrd-end", - (UINTN)(RamdiskData + RamdiskSize)= ); + Status =3D AndroidBootImgSetProperty64 ( + UpdatedFdtBase, + ChosenNode, + "linux,initrd-end", + (UINTN)((UINT8*)RamdiskData + RamdiskSize) + ); if (EFI_ERROR (Status)) { goto Fdt_Exit; } --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61832): https://edk2.groups.io/g/devel/message/61832 Mute This Topic: https://groups.io/mt/75211231/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-