On 08/28/17 03:54, Star Zeng wrote: > Originally (before 714c2603018a99a514c42c2b511c821f30ba9cdf), > mPhysicalAddressBits was only defined in X64 PageTbl.c, after > 714c2603018a99a514c42c2b511c821f30ba9cdf, mPhysicalAddressBits is > also defined in Ia32 PageTbl.c, then mPhysicalAddressBits is used in > ConvertMemoryPageAttributes() for address check. > > This patch is to centralize mPhysicalAddressBits definition to > PiSmmCpuDxeSmm.c from Ia32 and X64 PageTbl.c. > > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Eric Dong <eric.d...@intel.com> > Suggested-by: Laszlo Ersek <ler...@redhat.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng <star.z...@intel.com> > --- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 2 -- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 2 ++ > UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c > index e88b42d73343..f295c2ebf228 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c > @@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > EXPRESS OR IMPLIED. > > #include "PiSmmCpuDxeSmm.h" > > -UINT8 mPhysicalAddressBits; > - > /** > Create PageTable for SMM use. > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > index 8e7964271125..282d2e69817c 100755 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > @@ -114,6 +114,8 @@ SPIN_LOCK *mConfigSmmCodeAccessCheckLock = > NULL; > EFI_SMRAM_DESCRIPTOR *mSmmCpuSmramRanges; > UINTN mSmmCpuSmramRangeCount; > > +UINT8 mPhysicalAddressBits; > + > /** > Initialize IDT to setup exception handlers for SMM. > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c > index 32385faae470..3dde80f9bad6 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c > @@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > EXPRESS OR IMPLIED. > > LIST_ENTRY mPagePool = > INITIALIZE_LIST_HEAD_VARIABLE (mPagePool); > BOOLEAN m1GPageTableSupport = FALSE; > -UINT8 mPhysicalAddressBits; > BOOLEAN mCpuSmmStaticPageTable; > > /** >
Reviewed-by: Laszlo Ersek <ler...@redhat.com> Thanks! Laszlo _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
