Reviewed-by: Michael D Kinney <[email protected]> > -----Original Message----- > From: Gerd Hoffmann <[email protected]> > Sent: Thursday, March 2, 2023 10:51 PM > To: [email protected] > Cc: Ard Biesheuvel <[email protected]>; Gerd Hoffmann > <[email protected]>; Wang, Jian J <[email protected]>; Yao, > Jiewen <[email protected]>; Marvin Häuser <[email protected]>; James > Bottomley <[email protected]>; Michael Roth > <[email protected]>; Wu, Hao A <[email protected]>; Kinney, Michael D > <[email protected]>; Oliver Steffen > <[email protected]>; Xu, Min M <[email protected]>; Gao, Liming > <[email protected]>; Ni, Ray <[email protected]>; Tom > Lendacky <[email protected]>; Aktas, Erdem <[email protected]>; > Liu, Zhiguang <[email protected]>; Pawel Polawski > <[email protected]>; Justen, Jordan L <[email protected]> > Subject: [PATCH 5/5] OvmfPkg: Consume new alignment-related macros > > This patch substitutes the macros that were renamed in the second > patch with the new, shared alignment macros. > > Signed-off-by: Gerd Hoffmann <[email protected]> > --- > 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 = TRUE; > > STATIC EFI_EVENT mAcceptAllMemoryEvent = NULL; > > -#define IS_ALIGNED_(x, y) ((((x) & ((y) - 1)) == 0)) > - > STATIC > EFI_STATUS > EFIAPI > @@ -60,8 +58,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/SnpPageStateChangeInternal.c > b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c > index f35bba5deb46..7a8878b1a9c2 100644 > --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c > +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c > @@ -20,7 +20,6 @@ > > #include "SnpPageStateChange.h" > > -#define IS_ALIGNED_(x, y) ((((x) & (y - 1)) == 0)) > #define PAGES_PER_LARGE_ENTRY 512 > > 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) >= SIZE_2MB)) > { > RmpPageSize = PvalidatePageSize2MB; > -- > 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101510): https://edk2.groups.io/g/devel/message/101510 Mute This Topic: https://groups.io/mt/97357272/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
