[edk2-devel] [PATCH 2/5] OvmfPkg: Rename IS_ALIGNED macros to avoid name collisions

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao at intel.com>

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney at intel.com>
> Sent: Wednesday, March 22, 2023 5:41 AM
> To: devel at edk2.groups.io; kraxel at redhat.com
> Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>; Wang, Jian J
> <jian.j.wang at intel.com>; Yao, Jiewen <jiewen.yao at intel.com>; Marvin
> Häuser <mhaeuser at posteo.de>; James Bottomley <jejb at linux.ibm.com>;
> Michael Roth <michael.roth at amd.com>; Wu, Hao A <hao.a.wu at intel.com>;
> Oliver Steffen <osteffen at redhat.com>; Xu, Min M <min.m.xu at intel.com>;
> Gao, Liming <gaoliming at byosoft.com.cn>; Ni, Ray <ray.ni at intel.com>; Tom
> Lendacky <thomas.lendacky at amd.com>; Aktas, Erdem
> <erdemaktas at google.com>; Liu, Zhiguang <zhiguang.liu at intel.com>; Pawel
> Polawski <ppolawsk at redhat.com>; Justen, Jordan L
> <jordan.l.justen at intel.com>; Kinney, Michael D
> <michael.d.kinney at intel.com>
> Subject: RE: [edk2-devel] [PATCH 2/5] OvmfPkg: Rename IS_ALIGNED
> macros to avoid name collisions
> 
> Reviewed-by: Michael D Kinney <michael.d.kinney at intel.com>
> 
> > -----Original Message-----
> > From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> > Sent: Thursday, March 2, 2023 10:51 PM
> > To: devel at edk2.groups.io
> > Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>; Gerd Hoffmann
> <kraxel at redhat.com>; Wang, Jian J <jian.j.wang at intel.com>; Yao,
> > Jiewen <jiewen.yao at intel.com>; Marvin Häuser <mhaeuser at posteo.de>;
> James Bottomley <jejb at linux.ibm.com>; Michael Roth
> > <michael.roth at amd.com>; Wu, Hao A <hao.a.wu at intel.com>; Kinney,
> Michael D <michael.d.kinney at intel.com>; Oliver Steffen
> > <osteffen at redhat.com>; Xu, Min M <min.m.xu at intel.com>; Gao, Liming
> <gaoliming at byosoft.com.cn>; Ni, Ray <ray.ni at intel.com>; Tom
> > Lendacky <thomas.lendacky at amd.com>; Aktas, Erdem
> <erdemaktas at google.com>; Liu, Zhiguang <zhiguang.liu at intel.com>; Pawel
> Polawski
> > <ppolawsk at redhat.com>; Justen, Jordan L <jordan.l.justen at intel.com>
> > Subject: [edk2-devel] [PATCH 2/5] OvmfPkg: Rename IS_ALIGNED macros
> to avoid name collisions
> >
> > 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 <kraxel at redhat.com>
> > ---
> >  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 = TRUE;
> >
> >  STATIC EFI_EVENT  mAcceptAllMemoryEvent = NULL;
> >
> > -#define IS_ALIGNED(x, y)  ((((x) & ((y) - 1)) == 0))
> > +#define IS_ALIGNED_(x, y)  ((((x) & ((y) - 1)) == 0))
> >
> >  STATIC
> >  EFI_STATUS
> > @@ -60,8 +60,8 @@ AmdSevMemoryAccept (
> >    // multiple of SIZE_4KB. Use an assert instead of returning an erros since
> >    // 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 != 0);
> >
> >    MemEncryptSevSnpPreValidateSystemRam (
> > diff --git
> a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern
> al.c
> >
> b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern
> al.c
> > index 4d684964d838..f35bba5deb46 100644
> > ---
> a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern
> al.c
> > +++
> b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeIntern
> al.c
> > @@ -20,7 +20,7 @@
> >
> >  #include "SnpPageStateChange.h"
> >
> > -#define IS_ALIGNED(x, y)  ((((x) & (y - 1)) == 0))
> > +#define IS_ALIGNED_(x, y)  ((((x) & (y - 1)) == 0))
> >  #define PAGES_PER_LARGE_ENTRY  512
> >
> >  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) >= SIZE_2MB))
> >      {
> >        RmpPageSize = PvalidatePageSize2MB;
> > --
> > 2.39.2
> >
> >
> >
> > 
> >



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101516): https://edk2.groups.io/g/devel/message/101516
Mute This Topic: https://groups.io/mt/97357269/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-