From nobody Sat Feb 7 07:11:14 2026 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+100666+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+100666+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677826289; cv=none; d=zohomail.com; s=zohoarc; b=HCUYrUG5nMs+dsRyesL80g/bX4Kn9Xb6ZdT23P8grMhaDHWigcinSnm2PtPWszFrK8mr4AVvm+l26OQy5KohX0ZcHDdZGnFwJFKYWVe4fc2POWWMxaRCd1DOZMKitH08HwjShJLYrxxBDhaJNRIB/HBOxoio8z3A1XqAFBP+cHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677826289; 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=nJ7PjVPfu90Mk7n/LM0nHtBLNbqr5aL/k32JPrhK4h0=; b=CXfRmS3Lk3qeERRup9Lr9M6JguqPsvow0XFXI6TzXA7stO6DlH/Kn8N1LYfbtX3a/K1Lrj+rWrzAG1C9xmYsHWg/x1P13B2EZSe4ApS0wttlzo3Uaam/16WykL7gX2Ognbb1/UqqxoZ/N5/yksfPPlzqDB5l1RJk9Fq/5fbjTUY= 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+100666+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 1677826289663160.14039805785637; Thu, 2 Mar 2023 22:51:29 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IhXlYY1788612xxKx7i4B0ia; Thu, 02 Mar 2023 22:51:29 -0800 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.17739.1677826288464580336 for ; Thu, 02 Mar 2023 22:51:28 -0800 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-472-IT1hR0DdPlqIU6L5vvGwgQ-1; Fri, 03 Mar 2023 01:51:24 -0500 X-MC-Unique: IT1hR0DdPlqIU6L5vvGwgQ-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 CA6A918A64E0; Fri, 3 Mar 2023 06:51:23 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17E51492C3E; Fri, 3 Mar 2023 06:51:23 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 11C061801020; Fri, 3 Mar 2023 07:51:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Gerd Hoffmann , Jian J Wang , Jiewen Yao , =?UTF-8?q?Marvin=20H=C3=A4user?= , James Bottomley , Michael Roth , Hao A Wu , Michael D Kinney , Oliver Steffen , Min Xu , Liming Gao , Ray Ni , Tom Lendacky , Erdem Aktas , Zhiguang Liu , Pawel Polawski , Jordan Justen , Vitaly Cheptsov Subject: [edk2-devel] [PATCH 4/5] MdeModulePkg: Consume new alignment-related macros Date: Fri, 3 Mar 2023 07:51:14 +0100 Message-Id: <20230303065115.406020-5-kraxel@redhat.com> In-Reply-To: <20230303065115.406020-1-kraxel@redhat.com> References: <20230303065115.406020-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: GtpC5VMIigVWy3eCmq2D89Ejx1787277AA= 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=1677826289; bh=zNW1OYWInPm3sY/FggabBFxYbPj4e6hXW5Y7BeMyq64=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=qIDILaJRE+HdTyiuiUnAvqvfa91iTgELY3zJncYe0UNadVDkv/B/Hdquge6MyDafpa7 vUWI8sI6u5TUCVOBYNEM2nzoh4Nk3IgjYptJpsFO9OgtgyheU60lkne7X72c/IqXOIkhG HZliTCqO0OAu2i4wZtsr2f9SI7yz3VULw7E= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1677826290766100006 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 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 (#100666): https://edk2.groups.io/g/devel/message/100666 Mute This Topic: https://groups.io/mt/97357270/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-