From nobody Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101564+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101564+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468584; cv=none; d=zohomail.com; s=zohoarc; b=A2YK9Rtf2gXwxJsTAnn7xbMvKpN2xn3Hwh/lmPMJHuNl0X1x+kMTv3aGLKwWQP5vhOPA6EP4SIuajIa8aDkPokSRZyzKSMPyWTi4mgTXBkA5TJX31NnKgLITcApKjQcxJkxVtdup+uYYy1+v9kwFS7gm/GCGvFB+JuGtPjBSKjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468584; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Md+l9jp8irFUXdu/ke+g1TgfkIKXhlxHpfACA1sd+4U=; b=hWhofx2hyjUErZZn36bc6FwLiKyjZZy4DLOCTlkABfbiCnQyYwQRZGWs1hB4F6RJZ2BkqHLPvMozyTnk3KkTVDzHPa1ZndgQHHc3DEGC34A8bT9HXEOi7326CxNy5mls8E01iDG/x1cVenWTWuGnxKpE4QduZb25w2hYj6USf+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101564+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468584596320.3435570499381; Wed, 22 Mar 2023 00:03:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jPO0YY1788612x3PV0Av9vQs; Wed, 22 Mar 2023 00:03:04 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.36979.1679468583354630380 for ; Wed, 22 Mar 2023 00:03:03 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-2EO8Mn-HM5u9kBCK2NShpg-1; Wed, 22 Mar 2023 03:02:58 -0400 X-MC-Unique: 2EO8Mn-HM5u9kBCK2NShpg-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 078D6101A531; Wed, 22 Mar 2023 07:02:58 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E82D240C20FA; Wed, 22 Mar 2023 07:02:44 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BAFDB1800394; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen Subject: [edk2-devel] [PATCH v2 1/6] MdeModulePkg: Rename IS_ALIGNED macros to avoid name collisions Date: Wed, 22 Mar 2023 08:02:38 +0100 Message-Id: <20230322070243.410903-2-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: OvpI74CPeyI9nvJ7HBI5A1ncx1787277AA= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468584; bh=9Axaep5P82wiWieSpSzLrSMNR2dBYNM5pFsfoNyG4cg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=SxKw32SdnYsxpbkrcWqM0suVBhaOgsn8brySsp52qES5KJ0gHaDNSaGSmlrfOpRhvbt qtbQBMde1Zn5j6mFuHN1bMaTxhC84ugsxTQktHfFzvCIkBwW1ucBinmd37fNoK3fghBJi OSppbmm3SJT2zmfrkEr1yA9bGgNowmlsKpo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468585850100020 From: Marvin H=C3=A4user This patch is a preparation for the patches that follow. The subsequent patches will introduce and integrate new alignment-related macros, which collide with existing definitions in MdeModulePkg. Temporarily rename them to avoid build failure, till they can be substituted with the new, shared definitions. Cc: Jian J Wang Cc: Hao A Wu Cc: Ray Ni Signed-off-by: Marvin H=C3=A4user Signed-off-by: Gerd Hoffmann Reviewed-by: Hao A Wu Reviewed-by: Michael D Kinney --- MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h | 4 +-- .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.h | 2 +- MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h | 2 +- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h | 2 +- .../Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h | 2 +- .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.h | 2 +- MdeModulePkg/Universal/EbcDxe/EbcExecute.h | 4 +-- MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c | 2 +- .../Bus/Ata/AhciPei/AhciPeiPassThru.c | 6 ++-- .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.c | 12 +++---- .../Bus/Ata/AtaBusDxe/AtaPassThruExecute.c | 2 +- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 +-- .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.c | 6 ++-- MdeModulePkg/Universal/EbcDxe/EbcExecute.c | 36 +++++++++---------- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h b/MdeModulePkg/Bus/Ata/= AhciPei/AhciPei.h index 4aed1cb7ad8a..71d34c962ad1 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h @@ -146,8 +146,8 @@ typedef union { #define AHCI_PORT_SERR 0x0030 #define AHCI_PORT_CI 0x0038 =20 -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D= =3D 0) -#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds), 10000= 000) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) +#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds), 100= 00000) =20 #pragma pack(1) =20 diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/Mde= ModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h index 62ba6d6680dd..7937886614e1 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h @@ -148,7 +148,7 @@ struct _ATA_NONBLOCK_TASK { #define ATA_ATAPI_TIMEOUT EFI_TIMER_PERIOD_SECONDS(3) #define ATA_SPINUP_TIMEOUT EFI_TIMER_PERIOD_SECONDS(10) =20 -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D=3D 0) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 #define ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \ CR (a, \ diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h b/MdeModulePkg/Bus/Ata= /AtaBusDxe/AtaBus.h index 4428c484fd6c..47346e911d47 100644 --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h @@ -76,7 +76,7 @@ #define ATA_TASK_SIGNATURE SIGNATURE_32 ('A', 'T', 'S', 'K') #define ATA_DEVICE_SIGNATURE SIGNATURE_32 ('A', 'B', 'I', 'D') #define ATA_SUB_TASK_SIGNATURE SIGNATURE_32 ('A', 'S', 'T', 'S') -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D=3D 0) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 // // ATA bus data structure for ATA controller diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bu= s/Scsi/ScsiDiskDxe/ScsiDisk.h index 5b4047e1dbdd..ed384ad52182 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h @@ -38,7 +38,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #define IS_DEVICE_FIXED(a) (a)->FixedDevice ? 1 : 0 =20 -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D=3D 0) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 #define UFS_WLUN_RPMB 0xC4 =20 diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h b/MdeModule= Pkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h index a0b615b7eab3..1adb382aa8c3 100644 --- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h +++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h @@ -133,7 +133,7 @@ typedef struct _UFS_PEIM_HC_PRIVATE_DATA { =20 #define ROUNDUP8(x) (((x) % 8 =3D=3D 0) ? (x) : ((x) / 8 + 1) * 8) =20 -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D=3D 0) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS(a) CR (a, UFS_PEIM_= HC_PRIVATE_DATA, BlkIoPpi, UFS_PEIM_HC_SIG) #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2(a) CR (a, UFS_PEIM_= HC_PRIVATE_DATA, BlkIo2Ppi, UFS_PEIM_HC_SIG) diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/MdeModuleP= kg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h index 2b4f5d32d901..0ec37e56652b 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h @@ -105,7 +105,7 @@ typedef struct { =20 #define ROUNDUP8(x) (((x) % 8 =3D=3D 0) ? (x) : ((x) / 8 + 1) * 8) =20 -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) =3D=3D 0) +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 #define UFS_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \ CR (a, \ diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Univ= ersal/EbcDxe/EbcExecute.h index 32b8670c5b2a..6dc6730ab095 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h @@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Macros to check and set alignment // -#define ASSERT_ALIGNED(addr, size) ASSERT (!((UINT32) (addr) & (size - 1)= )) -#define IS_ALIGNED(addr, size) !((UINT32) (addr) & (size - 1)) +#define ASSERT_ALIGNED(addr, size) ASSERT (!((UINT32) (addr) & (size= - 1))) +#define ADDRESS_IS_ALIGNED_(addr, size) !((UINT32) (addr) & (size - 1)) =20 // // Debug macro diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c b/MdeModulePkg/Bus/Ata= /AhciPei/AhciMode.c index 7b97887c5dbd..d93fa78c81f3 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c @@ -2126,7 +2126,7 @@ TrustTransferAtaDevice ( // ATA PassThru PPI. // if ((AtaPassThru->Mode->IoAlign > 1) && - !IS_ALIGNED (Buffer, AtaPassThru->Mode->IoAlign)) + !ADDRESS_IS_ALIGNED_ (Buffer, AtaPassThru->Mode->IoAlign)) { NewBuffer =3D AllocateAlignedPages ( EFI_SIZE_TO_PAGES (TransferLength), diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c b/MdeModulePkg/= Bus/Ata/AhciPei/AhciPeiPassThru.c index d5ed93dc4f67..0c49059a00d5 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c @@ -194,15 +194,15 @@ AhciAtaPassThruPassThru ( } =20 IoAlign =3D This->Mode->IoAlign; - if ((IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, IoAlign)) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, IoAlign= )) { return EFI_INVALID_PARAMETER; } =20 - if ((IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, IoAlign)) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, IoAlig= n)) { return EFI_INVALID_PARAMETER; } =20 - if ((IoAlign > 1) && !IS_ALIGNED (Packet->Asb, IoAlign)) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/Mde= ModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c index 1070516b358a..324abadd02dd 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c @@ -1299,15 +1299,15 @@ AtaPassThruPassThru ( =20 Instance =3D ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This); =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, This= ->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, Thi= s->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->Asb, This->Mode->I= oAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, This= ->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 @@ -2039,15 +2039,15 @@ ExtScsiPassThruPassThru ( return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, This= ->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, Thi= s->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->SenseData, This->M= ode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData= , This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModul= ePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c index 4334169d256a..18aa4f9bb666 100644 --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c @@ -1040,7 +1040,7 @@ TrustTransferAtaDevice ( // Check the alignment of the incoming buffer prior to invoking underl= ying ATA PassThru // AtaPassThru =3D AtaDevice->AtaBusDriverData->AtaPassThru; - if ((AtaPassThru->Mode->IoAlign > 1) && !IS_ALIGNED (Buffer, AtaPassTh= ru->Mode->IoAlign)) { + if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Buffer, = AtaPassThru->Mode->IoAlign)) { NewBuffer =3D AllocateAlignedBuffer (AtaDevice, TransferLength); if (NewBuffer =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bu= s/Scsi/ScsiDiskDxe/ScsiDisk.c index fbc236cb465e..faf4ae332e46 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c @@ -2029,7 +2029,7 @@ ScsiDiskReceiveData ( goto Done; } =20 - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !IS_ALIGNED (PayloadBuffe= r, ScsiDiskDevice->ScsiIo->IoAlign)) { + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Pay= loadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { AlignedBuffer =3D AllocateAlignedBuffer (ScsiDiskDevice, PayloadBuff= erSize); if (AlignedBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; @@ -2249,7 +2249,7 @@ ScsiDiskSendData ( goto Done; } =20 - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !IS_ALIGNED (PayloadBuffe= r, ScsiDiskDevice->ScsiIo->IoAlign)) { + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Pay= loadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { AlignedBuffer =3D AllocateAlignedBuffer (ScsiDiskDevice, PayloadBuff= erSize); if (AlignedBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModuleP= kg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c index ae593ff03a0d..392a295caf04 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c @@ -171,15 +171,15 @@ UfsPassThruPassThru ( return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, This= ->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, Thi= s->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->SenseData, This->M= ode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData= , This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Univ= ersal/EbcDxe/EbcExecute.c index 82a7782fb99a..28f108c44873 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c @@ -2015,7 +2015,7 @@ ExecuteJMP ( // check for alignment, and jump absolute. // Data64 =3D (UINT64)VmReadImmed64 (VmPtr, 2); - if (!IS_ALIGNED ((UINTN)Data64, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Data64, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -2074,7 +2074,7 @@ ExecuteJMP ( // Form: JMP32 @Rx {Index32} // Addr =3D VmReadMemN (VmPtr, (UINTN)Data64 + Index32); - if (!IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -2097,7 +2097,7 @@ ExecuteJMP ( // Form: JMP32 Rx {Immed32} // Addr =3D (UINTN)(Data64 + Index32); - if (!IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -3158,7 +3158,7 @@ ExecuteRET ( // Pull the return address off the VM app's stack and set the IP // to it // - if (!IS_ALIGNED ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -4733,7 +4733,7 @@ VmWriteMem16 ( // // Do a simple write if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) { *(UINT16 *)Addr =3D Data; } else { // @@ -4795,7 +4795,7 @@ VmWriteMem32 ( // // Do a simple write if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) { *(UINT32 *)Addr =3D Data; } else { // @@ -4857,7 +4857,7 @@ VmWriteMem64 ( // // Do a simple write if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) { *(UINT64 *)Addr =3D Data; } else { // @@ -4922,7 +4922,7 @@ VmWriteMemN ( // // Do a simple write if aligned // - if (IS_ALIGNED (Addr, sizeof (UINTN))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) { *(UINTN *)Addr =3D Data; } else { for (Index =3D 0; Index < sizeof (UINTN) / sizeof (UINT32); Index++) { @@ -4985,7 +4985,7 @@ VmReadImmed16 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) { return *(INT16 *)(VmPtr->Ip + Offset); } else { // @@ -5029,7 +5029,7 @@ VmReadImmed32 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { return *(INT32 *)(VmPtr->Ip + Offset); } =20 @@ -5068,7 +5068,7 @@ VmReadImmed64 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { return *(UINT64 *)(VmPtr->Ip + Offset); } =20 @@ -5105,7 +5105,7 @@ VmReadCode16 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) { return *(UINT16 *)(VmPtr->Ip + Offset); } else { // @@ -5147,7 +5147,7 @@ VmReadCode32 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { return *(UINT32 *)(VmPtr->Ip + Offset); } =20 @@ -5184,7 +5184,7 @@ VmReadCode64 ( // // Read direct if aligned // - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { return *(UINT64 *)(VmPtr->Ip + Offset); } =20 @@ -5247,7 +5247,7 @@ VmReadMem16 ( // // Read direct if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) { return *(UINT16 *)Addr; } =20 @@ -5281,7 +5281,7 @@ VmReadMem32 ( // // Read direct if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) { return *(UINT32 *)Addr; } =20 @@ -5319,7 +5319,7 @@ VmReadMem64 ( // // Read direct if aligned // - if (IS_ALIGNED (Addr, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) { return *(UINT64 *)Addr; } =20 @@ -5388,7 +5388,7 @@ VmReadMemN ( // // Read direct if aligned // - if (IS_ALIGNED (Addr, sizeof (UINTN))) { + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) { return *(UINTN *)Addr; } =20 --=20 2.39.2 -=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 (#101564): https://edk2.groups.io/g/devel/message/101564 Mute This Topic: https://groups.io/mt/97773227/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 Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101560+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101560+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468580; cv=none; d=zohomail.com; s=zohoarc; b=JDxX9rplx1GfumeDqypTY+hoCvILjkpxcjBmGsex0Vq8Xr/GGlXdpS9dBzqcDCMruBNBicenaiJpKi2yUnJcwqbMGlQIe+y9+64tOp/sy+kyTs16jH0CsMZcnswa3JsgTo3YMshW9FTYmGrEds5m+lwSTwDETjHZYWMJ75ETc+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468580; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=GBYULbQcDUiBkqCfAd5agCCgg43nrW7D1ieWasROTh4=; b=B9hV21k8nSkJbf6rWvwTyxOnzxb5sdOdNy83eaTeWEOSG/ny9LYusLo4BlCTgNLnnED1hHUPrl00eVmlNVy0zFzaZckU8YMNEaOkHXm+FTIwo1UbRLLpOq0decpXy7hWuKDpkTJ7JsV/ceAIrc8uRVYSRQfnkFs7LBGpNytiQQU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101560+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468580481373.69819104117767; Wed, 22 Mar 2023 00:03:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WNBfYY1788612xSdIWGCBUv4; Wed, 22 Mar 2023 00:03:00 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.36975.1679468579412020565 for ; Wed, 22 Mar 2023 00:02:59 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-326-tneX8USKMk2iu23J9AmNlQ-1; Wed, 22 Mar 2023 03:02:54 -0400 X-MC-Unique: tneX8USKMk2iu23J9AmNlQ-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 354333810B1F; Wed, 22 Mar 2023 07:02:53 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4BC52027041; Wed, 22 Mar 2023 07:02:52 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C0AE6180039D; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen , Jiewen Yao Subject: [edk2-devel] [PATCH v2 2/6] OvmfPkg: Rename IS_ALIGNED macros to avoid name collisions Date: Wed, 22 Mar 2023 08:02:39 +0100 Message-Id: <20230322070243.410903-3-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: n0JhvIwPscMGiI19Dys7eLfzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468580; bh=UTctkGG067XqMdCg14IykNakL30v1mtCYpi7qis5yNU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=mrKxDrIiEpXGjjVILubtLMiUL04hJ4RxagUjj+RCtQ40HiPdoYYu/dUSpVy57paoiX4 r+bMNWZ2ODbdA9ZuMjv4l1NDPF7lU8m4bD17iaC82bELf7U7h3/aXaN771Nc+NsjgcHDY Ow6A77JeZvquxyJviBNeJByX8iaXGtijGnM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468581789100006 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch is a preparation for the patches that follow. The subsequent patches will introduce and integrate new alignment-related macros, which collide with existing definitions in OvmfPkg. Temporarily rename them to avoid build failure, till they can be substituted with the new, shared definitions. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael D Kinney Reviewed-by: Jiewen Yao Acked-by: Tom Lendacky --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 6 +++--- .../BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index a726498e2792..71a1eaaf0a1d 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -44,7 +44,7 @@ STATIC BOOLEAN mAcceptAllMemoryAtEBS =3D TRUE; =20 STATIC EFI_EVENT mAcceptAllMemoryEvent =3D NULL; =20 -#define IS_ALIGNED(x, y) ((((x) & ((y) - 1)) =3D=3D 0)) +#define IS_ALIGNED_(x, y) ((((x) & ((y) - 1)) =3D=3D 0)) =20 STATIC EFI_STATUS @@ -60,8 +60,8 @@ AmdSevMemoryAccept ( // multiple of SIZE_4KB. Use an assert instead of returning an erros sin= ce // this is an EDK2-internal protocol. // - ASSERT (IS_ALIGNED (StartAddress, SIZE_4KB)); - ASSERT (IS_ALIGNED (Size, SIZE_4KB)); + ASSERT (IS_ALIGNED_ (StartAddress, SIZE_4KB)); + ASSERT (IS_ALIGNED_ (Size, SIZE_4KB)); ASSERT (Size !=3D 0); =20 MemEncryptSevSnpPreValidateSystemRam ( diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInt= ernal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern= al.c index 4d684964d838..f35bba5deb46 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c @@ -20,7 +20,7 @@ =20 #include "SnpPageStateChange.h" =20 -#define IS_ALIGNED(x, y) ((((x) & (y - 1)) =3D=3D 0)) +#define IS_ALIGNED_(x, y) ((((x) & (y - 1)) =3D=3D 0)) #define PAGES_PER_LARGE_ENTRY 512 =20 STATIC @@ -150,7 +150,7 @@ BuildPageStateBuffer ( // // Is this a 2MB aligned page? Check if we can use the Large RMP entry. // - if (UseLargeEntry && IS_ALIGNED (BaseAddress, SIZE_2MB) && + if (UseLargeEntry && IS_ALIGNED_ (BaseAddress, SIZE_2MB) && ((EndAddress - BaseAddress) >=3D SIZE_2MB)) { RmpPageSize =3D PvalidatePageSize2MB; --=20 2.39.2 -=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 (#101560): https://edk2.groups.io/g/devel/message/101560 Mute This Topic: https://groups.io/mt/97773222/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 Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101561+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101561+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468582; cv=none; d=zohomail.com; s=zohoarc; b=HLpJgvlyYDYbGQlotLBs1L48ynRcvqQyBygux1n9eYV6oCHroux3CKmpO00g2QgW9z+GMx6MjvtanHLY1FVxVgQb6vLaH79HuyPs4sbczKZXb8jleJB6X38G/IqYcB1zvSTVr1EdMVyzdOtJ4CisfjjwqqCehgUtezWe7T0w2Pk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468582; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hyhjJJOPnhMb0ZIvgMbLrZmaho/fjzqXAI5gD8iU83A=; b=aG/kXo5jefB93FsVF03kKXeu5ki3vyHpd/5cfTyu4VAmRSV+9txM7ncwvOZxMhl15+iAOjM4/uRzs3EYjQ7rBtwOTHCJo4hfoKhdA0RC5uSrRa5shlBUt0ILh/r22E9JMtlj1fLwvMK9SBJ+Pj1YfCpgILI256gFmhtnwqi3b4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101561+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468582713847.3816108777528; Wed, 22 Mar 2023 00:03:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yiiXYY1788612xGUfke4AxjJ; Wed, 22 Mar 2023 00:03:02 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.36976.1679468581485252140 for ; Wed, 22 Mar 2023 00:03:01 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-416-EU_sat1KPbOI7qw6J-7nTQ-1; Wed, 22 Mar 2023 03:02:55 -0400 X-MC-Unique: EU_sat1KPbOI7qw6J-7nTQ-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D79923C5426F; Wed, 22 Mar 2023 07:02:54 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 581E92027040; Wed, 22 Mar 2023 07:02:54 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C62B7180039F; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen , Vitaly Cheptsov Subject: [edk2-devel] [PATCH v2 3/6] MdePkg/Base.h: Introduce various alignment-related macros Date: Wed, 22 Mar 2023 08:02:40 +0100 Message-Id: <20230322070243.410903-4-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: ABLdXDFMFzfsMe0k28fJmVF3x1787277AA= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468582; bh=AbpxrUFav7sFwfYOJcvY14ddr4o5bzuKYumQ0Ku4slM=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=UQYEIdp1viw4x5dJl3NNNdMefQZXyuLlvwUWs7OnAcUehXi7m+Aups32+ughvs42NSP rDwOdRXlgiPAUBDfrlQR3Kk9Vyw413w7ARuwW4nlJbek0L4MA8MeT05jSe15xl/jbgg1G rHpMy+W8tvXqA419+PUmoaRd39kHJkypCM4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468583884100012 From: Marvin H=C3=A4user ALIGNOF: Determining the alignment requirement of data types is crucial to ensure safe memory accesses when parsing untrusted data. IS_POW2: Determining whether a value is a power of two is important to verify whether untrusted values are valid alignment values. IS_ALIGNED: In combination with ALIGNOF data offsets can be verified. A more general version of the IS_ALIGNED macro previously defined by severa= l modules. ADDRESS_IS_ALIGNED: Variant of IS_ALIGNED for pointers and addresses. Replaces module-specific definitions throughout the codebase. ALIGN_VALUE_ADDEND: The addend to align up can be used to directly determine the required offset for data alignment. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Vitaly Cheptsov Signed-off-by: Marvin H=C3=A4user Signed-off-by: Gerd Hoffmann Reviewed-by: Michael D Kinney --- MdePkg/Include/Base.h | 98 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index e89c84962ab2..6597e441a6e2 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -758,6 +758,40 @@ typedef UINTN *BASE_LIST; #define OFFSET_OF(TYPE, Field) ((UINTN) &(((TYPE *)0)->Field)) #endif =20 +/** + Returns the alignment requirement of a type. + + @param TYPE The name of the type to retrieve the alignment requiremen= t of. + + @return Alignment requirement, in Bytes, of TYPE. +**/ +#if defined (__cplusplus) +// +// Standard C++ operator. +// +#define ALIGNOF(TYPE) alignof (TYPE) +#elif defined (__GNUC__) || defined (__clang__) || (defined (_MSC_VER) && = _MSC_VER >=3D 1900) +// +// All supported versions of GCC and Clang, as well as MSVC 2015 and later, +// support the standard operator _Alignof. +// +#define ALIGNOF(TYPE) _Alignof (TYPE) +#elif defined (_MSC_EXTENSIONS) +// +// Earlier versions of MSVC, at least MSVC 2008 and later, support the ven= dor +// extension __alignof. +// +#define ALIGNOF(TYPE) __alignof (TYPE) +#else +// +// For compilers that do not support inbuilt alignof operators, use OFFSET= _OF. +// CHAR8 is known to have both a size and an alignment requirement of 1 By= te. +// As such, A must be located exactly at the offset equal to its alignment +// requirement. +// +#define ALIGNOF(TYPE) OFFSET_OF (struct { CHAR8 C; TYPE A; }, A) +#endif + /** Portable definition for compile time assertions. Equivalent to C11 static_assert macro from assert.h. @@ -793,6 +827,21 @@ STATIC_ASSERT (sizeof (CHAR16) =3D=3D 2, "sizeof (CHA= R16) does not meet UEFI Specif STATIC_ASSERT (sizeof (L'A') =3D=3D 2, "sizeof (L'A') does not meet UEF= I Specification Data Type requirements"); STATIC_ASSERT (sizeof (L"A") =3D=3D 4, "sizeof (L\"A\") does not meet U= EFI Specification Data Type requirements"); =20 +STATIC_ASSERT (ALIGNOF (BOOLEAN) =3D=3D sizeof (BOOLEAN), "Alignment of BO= OLEAN does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (INT8) =3D=3D sizeof (INT8), "Alignment of INT8 = does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (UINT8) =3D=3D sizeof (UINT8), "Alignment of INT1= 6 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (INT16) =3D=3D sizeof (INT16), "Alignment of INT1= 6 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (UINT16) =3D=3D sizeof (UINT16), "Alignment of UIN= T16 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (INT32) =3D=3D sizeof (INT32), "Alignment of INT3= 2 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (UINT32) =3D=3D sizeof (UINT32), "Alignment of UIN= T32 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (INT64) =3D=3D sizeof (INT64), "Alignment of INT6= 4 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (UINT64) =3D=3D sizeof (UINT64), "Alignment of UIN= T64 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (CHAR8) =3D=3D sizeof (CHAR8), "Alignment of CHAR= 8 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (CHAR16) =3D=3D sizeof (CHAR16), "Alignment of CHA= R16 does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (INTN) =3D=3D sizeof (INTN), "Alignment of INTN = does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (UINTN) =3D=3D sizeof (UINTN), "Alignment of UINT= N does not meet UEFI Specification Data Type requirements"); +STATIC_ASSERT (ALIGNOF (VOID *) =3D=3D sizeof (VOID *), "Alignment of VOI= D * does not meet UEFI Specification Data Type requirements"); + // // The following three enum types are used to verify that the compiler // configuration for enum types is compliant with Section 2.3.1 of the @@ -816,6 +865,10 @@ STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) =3D= =3D 4, "Size of enum does not me STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) =3D=3D 4, "Size of enum = does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) =3D=3D 4, "Size of enum d= oes not meet UEFI Specification Data Type requirements"); =20 +STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) =3D=3D sizeof (__VERIFY= _UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data= Type requirements"); +STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) =3D=3D sizeof (__VERIFY= _UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Dat= a Type requirements"); +STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) =3D=3D sizeof (__VERIFY_= INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data = Type requirements"); + /** Macro that returns a pointer to the data structure that contains a speci= fied field of that data structure. This is a lightweight method to hide information b= y placing a @@ -837,6 +890,49 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) =3D= =3D 4, "Size of enum does not me **/ #define BASE_CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - OFFS= ET_OF (TYPE, Field))) =20 +/** + Checks whether a value is a power of two. + + @param Value The value to check. + + @retval TRUE Value is a power of two. + @retval FALSE Value is not a power of two. +**/ +#define IS_POW2(Value) ((Value) !=3D 0U && ((Value) & ((Value) - 1U)) =3D= =3D 0U) + +/** + Checks whether a value is aligned by a specified alignment. + + @param Value The value to check. + @param Alignment The alignment boundary used to check against. + + @retval TRUE Value is aligned by Alignment. + @retval FALSE Value is not aligned by Alignment. +**/ +#define IS_ALIGNED(Value, Alignment) (((Value) & ((Alignment) - 1U)) =3D= =3D 0U) + +/** + Checks whether a pointer or address is aligned by a specified alignment. + + @param Address The pointer or address to check. + @param Alignment The alignment boundary used to check against. + + @retval TRUE Address is aligned by Alignment. + @retval FALSE Address is not aligned by Alignment. +**/ +#define ADDRESS_IS_ALIGNED(Address, Alignment) IS_ALIGNED ((UINTN) (Addre= ss), Alignment) + +/** + Determines the addend to add to a value to round it up to the next bound= ary of + a specified alignment. + + @param Value The value to round up. + @param Alignment The alignment boundary used to return the addend. + + @return Addend to round Value up to alignment boundary Alignment. +**/ +#define ALIGN_VALUE_ADDEND(Value, Alignment) (((Alignment) - (Value)) & (= (Alignment) - 1U)) + /** Rounds a value up to the next boundary using a specified alignment. =20 @@ -849,7 +945,7 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) =3D=3D= 4, "Size of enum does not me @return A value up to the next boundary. =20 **/ -#define ALIGN_VALUE(Value, Alignment) ((Value) + (((Alignment) - (Value))= & ((Alignment) - 1))) +#define ALIGN_VALUE(Value, Alignment) ((Value) + ALIGN_VALUE_ADDEND (Valu= e, Alignment)) =20 /** Adjust a pointer by adding the minimum offset required for it to be alig= ned on --=20 2.39.2 -=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 (#101561): https://edk2.groups.io/g/devel/message/101561 Mute This Topic: https://groups.io/mt/97773224/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 Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101563+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101563+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468584; cv=none; d=zohomail.com; s=zohoarc; b=iAAiVr4MnQOxgfaVgcr7EsbttuofAfjl2sK+IHZdvdEneoK3TH+LbIXiXa9vZ6TuJBUldCyGOA2qAg9GEW+iN9gKuOtGBvxMTJlAbszGb2aET0tQ9tCTurhRWAtKnJ7k3oS+jr5ZtO6+grWoJOgnGGyHoevQ/a241r3R3aqaiLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468584; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Vo0HlWMbSvLV+Bp447MZ/RxHjeCK5DZ9ZMt5doAC61w=; b=K+QuHIq/+PrlWEOQjlJqGKEdBaWL/ZmYQc+e8ESgygDLo5Fif/ySIFknpKbORb5eg1yeXR+Irvu7zkWNgXFEzltqeLWAlyl563MuzkKXJaryG8d2Jyq7qyQEkDruTERm2Viv395mT2+uI+75FBBv9L4DmhqVFYJX9uCvhgX9634= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101563+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468584099478.569289317237; Wed, 22 Mar 2023 00:03:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id STF4YY1788612xF7LYI8tL9F; Wed, 22 Mar 2023 00:03:03 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.36978.1679468582771022450 for ; Wed, 22 Mar 2023 00:03:03 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-97-lkS8hhU8NhGhmpGo4d1qxw-1; Wed, 22 Mar 2023 03:02:57 -0400 X-MC-Unique: lkS8hhU8NhGhmpGo4d1qxw-1 X-Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D932A1C02D37; Wed, 22 Mar 2023 07:02:56 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 27F13463DFB; Wed, 22 Mar 2023 07:02:56 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CB48318003AB; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen , Vitaly Cheptsov Subject: [edk2-devel] [PATCH v2 4/6] MdeModulePkg: Consume new alignment-related macros Date: Wed, 22 Mar 2023 08:02:41 +0100 Message-Id: <20230322070243.410903-5-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: CZLrhphcVMS8TSco8QZRxAKMx1787277AA= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468583; bh=zYXG+79CPXXT5zaizj6zgDrx3cI4QabOu/vYGzJwCGQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=tk4rY6CmxO85IduqhNUDXJg0ZjqoGA8fwk+mKL43CvrgcnSdwcUXTrgxi7TfyUiKXqv FCN//7EbbHhbPPaSI9evqLmZZkWYr5+kOw3Sdv9tfNEVWBUF3FGFpm2MBJlRrhKusaDNs sNZ3eENlJSu8FfgtKyMOMu2JqmNht46thVw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468585849100019 From: Marvin H=C3=A4user This patch substitutes the macros that were renamed in the first patch with the new, shared alignment macros. Cc: Jian J Wang Cc: Hao A Wu Cc: Ray Ni Cc: Vitaly Cheptsov Signed-off-by: Marvin H=C3=A4user Signed-off-by: Gerd Hoffmann Reviewed-by: Hao A Wu Reviewed-by: Michael D Kinney >michael.d.kinney@intel.com> --- MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h | 3 +- .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.h | 2 -- MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h | 1 - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h | 2 -- .../Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h | 2 -- .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.h | 2 -- MdeModulePkg/Universal/EbcDxe/EbcExecute.h | 3 +- MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c | 2 +- .../Bus/Ata/AhciPei/AhciPeiPassThru.c | 6 ++-- .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.c | 12 +++---- .../Bus/Ata/AtaBusDxe/AtaPassThruExecute.c | 2 +- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 +-- .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.c | 6 ++-- MdeModulePkg/Universal/EbcDxe/EbcExecute.c | 36 +++++++++---------- 14 files changed, 36 insertions(+), 47 deletions(-) diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h b/MdeModulePkg/Bus/Ata/= AhciPei/AhciPei.h index 71d34c962ad1..e2e4ba43e7c4 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h @@ -146,8 +146,7 @@ typedef union { #define AHCI_PORT_SERR 0x0030 #define AHCI_PORT_CI 0x0038 =20 -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) -#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds), 100= 00000) +#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds), 10000= 000) =20 #pragma pack(1) =20 diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/Mde= ModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h index 7937886614e1..016fc6890ae9 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h @@ -148,8 +148,6 @@ struct _ATA_NONBLOCK_TASK { #define ATA_ATAPI_TIMEOUT EFI_TIMER_PERIOD_SECONDS(3) #define ATA_SPINUP_TIMEOUT EFI_TIMER_PERIOD_SECONDS(10) =20 -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) - #define ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \ CR (a, \ ATA_ATAPI_PASS_THRU_INSTANCE, \ diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h b/MdeModulePkg/Bus/Ata= /AtaBusDxe/AtaBus.h index 47346e911d47..6bc345f7e777 100644 --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h @@ -76,7 +76,6 @@ #define ATA_TASK_SIGNATURE SIGNATURE_32 ('A', 'T', 'S', 'K') #define ATA_DEVICE_SIGNATURE SIGNATURE_32 ('A', 'B', 'I', 'D') #define ATA_SUB_TASK_SIGNATURE SIGNATURE_32 ('A', 'S', 'T', 'S') -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) =20 // // ATA bus data structure for ATA controller diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bu= s/Scsi/ScsiDiskDxe/ScsiDisk.h index ed384ad52182..5a25b55c4952 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h @@ -38,8 +38,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #define IS_DEVICE_FIXED(a) (a)->FixedDevice ? 1 : 0 =20 -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) - #define UFS_WLUN_RPMB 0xC4 =20 typedef struct { diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h b/MdeModule= Pkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h index 1adb382aa8c3..ed4776f548e0 100644 --- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h +++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h @@ -133,8 +133,6 @@ typedef struct _UFS_PEIM_HC_PRIVATE_DATA { =20 #define ROUNDUP8(x) (((x) % 8 =3D=3D 0) ? (x) : ((x) / 8 + 1) * 8) =20 -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) - #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS(a) CR (a, UFS_PEIM_= HC_PRIVATE_DATA, BlkIoPpi, UFS_PEIM_HC_SIG) #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2(a) CR (a, UFS_PEIM_= HC_PRIVATE_DATA, BlkIo2Ppi, UFS_PEIM_HC_SIG) #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS_NOTIFY(a) CR (a, UFS_PEIM_= HC_PRIVATE_DATA, EndOfPeiNotifyList, UFS_PEIM_HC_SIG) diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/MdeModuleP= kg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h index 0ec37e56652b..bc1139da6e3b 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h @@ -105,8 +105,6 @@ typedef struct { =20 #define ROUNDUP8(x) (((x) % 8 =3D=3D 0) ? (x) : ((x) / 8 + 1) * 8) =20 -#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) = =3D=3D 0) - #define UFS_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \ CR (a, \ UFS_PASS_THRU_PRIVATE_DATA, \ diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Univ= ersal/EbcDxe/EbcExecute.h index 6dc6730ab095..f3768e79528e 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h @@ -14,8 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Macros to check and set alignment // -#define ASSERT_ALIGNED(addr, size) ASSERT (!((UINT32) (addr) & (size= - 1))) -#define ADDRESS_IS_ALIGNED_(addr, size) !((UINT32) (addr) & (size - 1)) +#define ASSERT_ALIGNED(addr, size) ASSERT (ADDRESS_IS_ALIGNED (addr, size= )) =20 // // Debug macro diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c b/MdeModulePkg/Bus/Ata= /AhciPei/AhciMode.c index d93fa78c81f3..0f0198d3085b 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c @@ -2126,7 +2126,7 @@ TrustTransferAtaDevice ( // ATA PassThru PPI. // if ((AtaPassThru->Mode->IoAlign > 1) && - !ADDRESS_IS_ALIGNED_ (Buffer, AtaPassThru->Mode->IoAlign)) + !ADDRESS_IS_ALIGNED (Buffer, AtaPassThru->Mode->IoAlign)) { NewBuffer =3D AllocateAlignedPages ( EFI_SIZE_TO_PAGES (TransferLength), diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c b/MdeModulePkg/= Bus/Ata/AhciPei/AhciPeiPassThru.c index 0c49059a00d5..cd55272c96cd 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c @@ -194,15 +194,15 @@ AhciAtaPassThruPassThru ( } =20 IoAlign =3D This->Mode->IoAlign; - if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, IoAlign= )) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuffer, IoAlign)= ) { return EFI_INVALID_PARAMETER; } =20 - if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, IoAlig= n)) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuffer, IoAlign= )) { return EFI_INVALID_PARAMETER; } =20 - if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, IoAlign)) { + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->Asb, IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/Mde= ModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c index 324abadd02dd..50406fe0270d 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c @@ -1299,15 +1299,15 @@ AtaPassThruPassThru ( =20 Instance =3D ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This); =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuff= er, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, This= ->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->Asb, This-= >Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 @@ -2039,15 +2039,15 @@ ExtScsiPassThruPassThru ( return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuff= er, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData= , This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->SenseData,= This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModul= ePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c index 18aa4f9bb666..a77852bae054 100644 --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c @@ -1040,7 +1040,7 @@ TrustTransferAtaDevice ( // Check the alignment of the incoming buffer prior to invoking underl= ying ATA PassThru // AtaPassThru =3D AtaDevice->AtaBusDriverData->AtaPassThru; - if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Buffer, = AtaPassThru->Mode->IoAlign)) { + if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Buffer, A= taPassThru->Mode->IoAlign)) { NewBuffer =3D AllocateAlignedBuffer (AtaDevice, TransferLength); if (NewBuffer =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bu= s/Scsi/ScsiDiskDxe/ScsiDisk.c index faf4ae332e46..873581d817ce 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c @@ -2029,7 +2029,7 @@ ScsiDiskReceiveData ( goto Done; } =20 - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Pay= loadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Payl= oadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { AlignedBuffer =3D AllocateAlignedBuffer (ScsiDiskDevice, PayloadBuff= erSize); if (AlignedBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; @@ -2249,7 +2249,7 @@ ScsiDiskSendData ( goto Done; } =20 - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Pay= loadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Payl= oadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) { AlignedBuffer =3D AllocateAlignedBuffer (ScsiDiskDevice, PayloadBuff= erSize); if (AlignedBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModuleP= kg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c index 392a295caf04..880e7d85114e 100644 --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c @@ -171,15 +171,15 @@ UfsPassThruPassThru ( return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuf= fer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuff= er, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBu= ffer, This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuf= fer, This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 - if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData= , This->Mode->IoAlign)) { + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->SenseData,= This->Mode->IoAlign)) { return EFI_INVALID_PARAMETER; } =20 diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Univ= ersal/EbcDxe/EbcExecute.c index 28f108c44873..3221f95a739f 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c @@ -2015,7 +2015,7 @@ ExecuteJMP ( // check for alignment, and jump absolute. // Data64 =3D (UINT64)VmReadImmed64 (VmPtr, 2); - if (!ADDRESS_IS_ALIGNED_ ((UINTN)Data64, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED ((UINTN)Data64, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -2074,7 +2074,7 @@ ExecuteJMP ( // Form: JMP32 @Rx {Index32} // Addr =3D VmReadMemN (VmPtr, (UINTN)Data64 + Index32); - if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -2097,7 +2097,7 @@ ExecuteJMP ( // Form: JMP32 Rx {Immed32} // Addr =3D (UINTN)(Data64 + Index32); - if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -3158,7 +3158,7 @@ ExecuteRET ( // Pull the return address off the VM app's stack and set the IP // to it // - if (!ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) { + if (!ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) { EbcDebugSignalException ( EXCEPT_EBC_ALIGNMENT_CHECK, EXCEPTION_FLAG_FATAL, @@ -4733,7 +4733,7 @@ VmWriteMem16 ( // // Do a simple write if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT16))) { *(UINT16 *)Addr =3D Data; } else { // @@ -4795,7 +4795,7 @@ VmWriteMem32 ( // // Do a simple write if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT32))) { *(UINT32 *)Addr =3D Data; } else { // @@ -4857,7 +4857,7 @@ VmWriteMem64 ( // // Do a simple write if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT64))) { *(UINT64 *)Addr =3D Data; } else { // @@ -4922,7 +4922,7 @@ VmWriteMemN ( // // Do a simple write if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINTN))) { *(UINTN *)Addr =3D Data; } else { for (Index =3D 0; Index < sizeof (UINTN) / sizeof (UINT32); Index++) { @@ -4985,7 +4985,7 @@ VmReadImmed16 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) { return *(INT16 *)(VmPtr->Ip + Offset); } else { // @@ -5029,7 +5029,7 @@ VmReadImmed32 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { return *(INT32 *)(VmPtr->Ip + Offset); } =20 @@ -5068,7 +5068,7 @@ VmReadImmed64 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { return *(UINT64 *)(VmPtr->Ip + Offset); } =20 @@ -5105,7 +5105,7 @@ VmReadCode16 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) { return *(UINT16 *)(VmPtr->Ip + Offset); } else { // @@ -5147,7 +5147,7 @@ VmReadCode32 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) { return *(UINT32 *)(VmPtr->Ip + Offset); } =20 @@ -5184,7 +5184,7 @@ VmReadCode64 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) { return *(UINT64 *)(VmPtr->Ip + Offset); } =20 @@ -5247,7 +5247,7 @@ VmReadMem16 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT16))) { return *(UINT16 *)Addr; } =20 @@ -5281,7 +5281,7 @@ VmReadMem32 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT32))) { return *(UINT32 *)Addr; } =20 @@ -5319,7 +5319,7 @@ VmReadMem64 ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT64))) { return *(UINT64 *)Addr; } =20 @@ -5388,7 +5388,7 @@ VmReadMemN ( // // Read direct if aligned // - if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) { + if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINTN))) { return *(UINTN *)Addr; } =20 --=20 2.39.2 -=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 (#101563): https://edk2.groups.io/g/devel/message/101563 Mute This Topic: https://groups.io/mt/97773226/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 Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101565+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101565+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468588; cv=none; d=zohomail.com; s=zohoarc; b=SSXaHTUjIAVVx0JNubjyjLON2c6ApHJoZLzVX4muDLaH5NQrn/jS1vCBVhnGo2XC1UEzksYCsp8jAMVqByzbZo2bxeq+ABZQeg88S8dtryjNyfGbEVPmOlWUbSW9cUu2JIE435WPdZ0IzViv6JVGagJ/rj5oTf0F5PKu21QYKZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468588; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5TFQQIkPlEfKJPr4Tr8sgHOTS/Rk/oAekUoU+0Uhko8=; b=h+zUZMnJH8rYq+YJGI0jbr7By4HwicENinPxaugcq8iAOkApvvJ+0UTfnR/fUbu2DFoU3ugzOTOHrX6xU4YmEb71rv2z6/fveDlGMZ5NHuVMsZnRqJlQFqjExvL55yN62hU7ooI0CKKrt3XGkV03cm/QvzBx0q5CS3JXRsLl3YI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101565+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468588578457.5973036228411; Wed, 22 Mar 2023 00:03:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id PiOCYY1788612xO7OmChswtw; Wed, 22 Mar 2023 00:03:08 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.36980.1679468587538061068 for ; Wed, 22 Mar 2023 00:03:07 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-627-rbN4KpLHPcKm4PaB94Q2MQ-1; Wed, 22 Mar 2023 03:02:59 -0400 X-MC-Unique: rbN4KpLHPcKm4PaB94Q2MQ-1 X-Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A68052808E66; Wed, 22 Mar 2023 07:02:58 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 692EE2166B29; Wed, 22 Mar 2023 07:02:58 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D029218003B3; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen , Jiewen Yao Subject: [edk2-devel] [PATCH v2 5/6] OvmfPkg: Consume new alignment-related macros Date: Wed, 22 Mar 2023 08:02:42 +0100 Message-Id: <20230322070243.410903-6-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: bY55QoJiAR9Y0kjvrLCjjZcYx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468588; bh=00xMvBr64z3nl6M9sqS1MqPcYpxHM/Cr1Jn6iM7qxdU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=USYw5Kn5VlnxKTfVdjEzPj7529R3WKypckZ3Z4XVeASIF0/Hnm9RUrtGor/xbHob44N TbcoeXeMCLunGhT1dKhyGM86QZuMc8A26QUOIkg1/ahOCiKyWYe6wcuFXHlfd2UZjpc/S tmneq+bYMsJw9TvTw4iNA24gSqKn6UHQ3PE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468589814100002 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch substitutes the macros that were renamed in the second patch with the new, shared alignment macros. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael D Kinney Reviewed-by: Jiewen Yao Acked-by: Tom Lendacky --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 6 ++---- .../BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 71a1eaaf0a1d..9b0d0e92b6f7 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -44,8 +44,6 @@ STATIC BOOLEAN mAcceptAllMemoryAtEBS =3D TRUE; =20 STATIC EFI_EVENT mAcceptAllMemoryEvent =3D NULL; =20 -#define IS_ALIGNED_(x, y) ((((x) & ((y) - 1)) =3D=3D 0)) - STATIC EFI_STATUS EFIAPI @@ -60,8 +58,8 @@ AmdSevMemoryAccept ( // multiple of SIZE_4KB. Use an assert instead of returning an erros sin= ce // this is an EDK2-internal protocol. // - ASSERT (IS_ALIGNED_ (StartAddress, SIZE_4KB)); - ASSERT (IS_ALIGNED_ (Size, SIZE_4KB)); + ASSERT (IS_ALIGNED (StartAddress, SIZE_4KB)); + ASSERT (IS_ALIGNED (Size, SIZE_4KB)); ASSERT (Size !=3D 0); =20 MemEncryptSevSnpPreValidateSystemRam ( diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInt= ernal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern= al.c index f35bba5deb46..7a8878b1a9c2 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c @@ -20,7 +20,6 @@ =20 #include "SnpPageStateChange.h" =20 -#define IS_ALIGNED_(x, y) ((((x) & (y - 1)) =3D=3D 0)) #define PAGES_PER_LARGE_ENTRY 512 =20 STATIC @@ -150,7 +149,7 @@ BuildPageStateBuffer ( // // Is this a 2MB aligned page? Check if we can use the Large RMP entry. // - if (UseLargeEntry && IS_ALIGNED_ (BaseAddress, SIZE_2MB) && + if (UseLargeEntry && IS_ALIGNED (BaseAddress, SIZE_2MB) && ((EndAddress - BaseAddress) >=3D SIZE_2MB)) { RmpPageSize =3D PvalidatePageSize2MB; --=20 2.39.2 -=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 (#101565): https://edk2.groups.io/g/devel/message/101565 Mute This Topic: https://groups.io/mt/97773228/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 Fri Apr 26 15:16:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101562+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101562+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679468583; cv=none; d=zohomail.com; s=zohoarc; b=lqxskhiMC3d+n6/iW9rOqUcmL78yCGB1LFvN+XJeIIBuwUOb4rvO2/eF6OsPQmMdT46+pSzT/PYSVP37nLfe0ieGSD0X5frJ6cBgPJM9CpAwshqYtAuT5JGkNNeGXLlkcJWkmKkpqZtyb5UmTAaOqgfMWwFYNyz5TXSA4nYrCxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679468583; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JXZSPcoF7sYRoGGaVb6rUuu110bGXWx5fqzCFr1amWk=; b=DAMaz5vuQzmUmIwHnX25oZlB/4+iZjuKzXVmwYU2CqLuRKtZ03PFaVAbn+o0Ro7R2arbVcbSL60nCmUMPOGksJOW9rijSr7dlbxBR/PBl5dvy1At7tYuKLQd0DncQJ6dQQvIQkQb2QTnDpkkPILteW2QWOmvyby0CXgzsCCVVOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101562+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1679468583390316.3367160976428; Wed, 22 Mar 2023 00:03:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1oQVYY1788612x5b5FutONRS; Wed, 22 Mar 2023 00:03:03 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.36765.1679468582485583700 for ; Wed, 22 Mar 2023 00:03:02 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-1P-kopCLOsiLPLMK2I383A-1; Wed, 22 Mar 2023 03:03:00 -0400 X-MC-Unique: 1P-kopCLOsiLPLMK2I383A-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A54C185A78F; Wed, 22 Mar 2023 07:02:59 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33B3C40C6E67; Wed, 22 Mar 2023 07:02:59 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D4D8318003B8; Wed, 22 Mar 2023 08:02:43 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael D Kinney , Erdem Aktas , James Bottomley , Liming Gao , =?UTF-8?q?Marvin=20H=C3=A4user?= , Pawel Polawski , Michael Roth , Tom Lendacky , Gerd Hoffmann , Jiewen Yao , Jian J Wang , Ard Biesheuvel , Jordan Justen , Hao A Wu , Zhiguang Liu , Ray Ni , Min Xu , Oliver Steffen Subject: [edk2-devel] [PATCH v2 6/6] UefiCpuPkg/MtrrLib: use new IS_POW2() macro. Date: Wed, 22 Mar 2023 08:02:43 +0100 Message-Id: <20230322070243.410903-7-kraxel@redhat.com> In-Reply-To: <20230322070243.410903-1-kraxel@redhat.com> References: <20230322070243.410903-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,kraxel@redhat.com X-Gm-Message-State: 1YkuCwmt37aJQ3h5xNjAgcPOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1679468583; bh=1qdhe9NJiQsBPejWRvCf1VzVEE9bUzDlXIG1ytfRnwY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=tMEKEdKmEQj/Agc28iA7/GqeEdFEXyedFjOPCc2Spd8+0yYhsXHyfhfPRSa5e1IxtJK lBrVE483LrfeFR4Cf0DoE8NTZLZtd6BwGsIjOiY2gvGjWp/bYFEuuhqJPRE8ha66vU5Tp qDcniO0GzrBoirG0Zt0M/HyPe3UaKN06v9U= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1679468583847100010 Content-Type: text/plain; charset="utf-8"; x-default="true" Drop MtrrLibIsPowerOfTwo function, use the new IS_POW2() macro instead. The ASSERT() removed (inside MtrrLibIsPowerOfTwo) is superfluous, another ASSERT() a few lines up in MtrrLibCalculateMtrrs() already guarantees that Length can not be zero at this point. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael D Kinney Reviewed-by: Ray Ni --- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/Mtrr= Lib/MtrrLib.c index e5c862c83d61..dd0b668d7782 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -1253,21 +1253,6 @@ MtrrLibLowestType ( return (MTRR_MEMORY_CACHE_TYPE)Type; } =20 -/** - Return TRUE when the Operand is exactly power of 2. - - @retval TRUE Operand is exactly power of 2. - @retval FALSE Operand is not power of 2. -**/ -BOOLEAN -MtrrLibIsPowerOfTwo ( - IN UINT64 Operand - ) -{ - ASSERT (Operand !=3D 0); - return (BOOLEAN)((Operand & (Operand - 1)) =3D=3D 0); -} - /** Calculate the subtractive path from vertex Start to Stop. =20 @@ -1638,7 +1623,7 @@ MtrrLibCalculateMtrrs ( break; } =20 - if ((Weight[M (Start, Stop)] =3D=3D MAX_WEIGHT) && MtrrLibIsPowerO= fTwo (Length)) { + if ((Weight[M (Start, Stop)] =3D=3D MAX_WEIGHT) && IS_POW2 (Length= )) { if (MtrrLibGetNumberOfTypes ( Ranges, RangeCount, --=20 2.39.2 -=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 (#101562): https://edk2.groups.io/g/devel/message/101562 Mute This Topic: https://groups.io/mt/97773225/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-