Reviewed-by: Eric Dong <[email protected]>
> -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of > shenglei > Sent: Wednesday, September 19, 2018 11:02 AM > To: [email protected] > Cc: Dong, Eric <[email protected]> > Subject: [edk2] [PATCH v2] UefiCpuPkg: Remove redundant library classes, > Ppis and GUIDs > > Some redundant library classes Ppis and GUIDs > have been removed in inf, .c and .h files. > > v2: > 1.Remove ReadOnlyVariable2.h in S3Resume.c which should be > deleted in last version in which gEfiPeiReadOnlyVariable2PpiGuid > was removed. > 2.Remove the library class BaseLib in CpuPageTable.c > which is included elsewhere. > 3.Add library classes in SecCore.inf which are removed > at last version. > They are DebugAgentLib and CpuExceptionHandlerLib. > 4.Add two Ppis in SecCore.inf which are removed > at last version. > They are gEfiSecPlatformInformationPpiGuid and > gEfiSecPlatformInformation2PpiGuid. > > https://bugzilla.tianocore.org/show_bug.cgi?id=1043 > https://bugzilla.tianocore.org/show_bug.cgi?id=1013 > https://bugzilla.tianocore.org/show_bug.cgi?id=1032 > https://bugzilla.tianocore.org/show_bug.cgi?id=1016 > > Cc: Eric Dong <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: shenglei <[email protected]> > --- > UefiCpuPkg/CpuDxe/CpuPageTable.c | 7 ------- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 1 - > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 -- > UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h | 1 - > UefiCpuPkg/SecCore/FindPeiCore.c | 2 -- > UefiCpuPkg/SecCore/SecCore.inf | 4 ---- > UefiCpuPkg/SecCore/SecMain.h | 2 -- > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 4 +--- > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf | 3 --- > 9 files changed, 1 insertion(+), 25 deletions(-) > > diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c > b/UefiCpuPkg/CpuDxe/CpuPageTable.c > index 0a980b9753..33e8ee2d2c 100644 > --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c > +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c > @@ -16,17 +16,10 @@ > > #include <Base.h> > #include <Uefi.h> > -#include <Library/BaseLib.h> > -#include <Library/CpuLib.h> > -#include <Library/BaseMemoryLib.h> > -#include <Library/MemoryAllocationLib.h> > -#include <Library/DebugLib.h> > -#include <Library/UefiBootServicesTableLib.h> > #include <Library/PeCoffGetEntryPointLib.h> > #include <Library/SerialPortLib.h> > #include <Library/SynchronizationLib.h> > #include <Library/PrintLib.h> > -#include <Protocol/MpService.h> > #include <Protocol/SmmBase2.h> > #include <Register/Cpuid.h> > #include <Register/Msr.h> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > index e3c7cff81c..8c7f4996d1 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > @@ -38,7 +38,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > #include <Library/DebugLib.h> > #include <Library/BaseMemoryLib.h> > #include <Library/PcdLib.h> > -#include <Library/CacheMaintenanceLib.h> > #include <Library/MtrrLib.h> > #include <Library/SmmCpuPlatformHookLib.h> > #include <Library/SmmServicesTableLib.h> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > index a7fb7b0b14..95a4511225 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > @@ -77,7 +77,6 @@ > [LibraryClasses] > UefiDriverEntryPoint > UefiRuntimeServicesTableLib > - CacheMaintenanceLib > PcdLib > DebugLib > BaseLib > @@ -113,7 +112,6 @@ > > [Guids] > gEfiAcpiVariableGuid ## SOMETIMES_CONSUMES ## HOB # it > is > used for S3 boot. > - gEfiGlobalVariableGuid ## SOMETIMES_PRODUCES ## > Variable:L"SmmProfileData" > gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## > SystemTable > gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## > SystemTable > gEdkiiPiSmmMemoryAttributesTableGuid ## CONSUMES ## SystemTable > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h > index bacb2f8ad3..18a7fe3b07 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h > @@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > #ifndef _SMM_PROFILE_INTERNAL_H_ > #define _SMM_PROFILE_INTERNAL_H_ > > -#include <Guid/GlobalVariable.h> > #include <Guid/Acpi.h> > #include <Protocol/SmmReadyToLock.h> > #include <Library/UefiRuntimeServicesTableLib.h> > diff --git a/UefiCpuPkg/SecCore/FindPeiCore.c > b/UefiCpuPkg/SecCore/FindPeiCore.c > index 60ccaa9667..bb9c434d1e 100644 > --- a/UefiCpuPkg/SecCore/FindPeiCore.c > +++ b/UefiCpuPkg/SecCore/FindPeiCore.c > @@ -13,8 +13,6 @@ > **/ > > #include <PiPei.h> > -#include <Library/BaseLib.h> > -#include <Library/PeCoffGetEntryPointLib.h> > > #include "SecMain.h" > > diff --git a/UefiCpuPkg/SecCore/SecCore.inf > b/UefiCpuPkg/SecCore/SecCore.inf > index 7bcd4f8a96..b228610757 100644 > --- a/UefiCpuPkg/SecCore/SecCore.inf > +++ b/UefiCpuPkg/SecCore/SecCore.inf > @@ -50,7 +50,6 @@ > [LibraryClasses] > BaseMemoryLib > DebugLib > - BaseLib > PlatformSecLib > PcdLib > DebugAgentLib > @@ -71,9 +70,6 @@ > ## SOMETIMES_PRODUCES > gEfiSecPlatformInformation2PpiGuid > gEfiTemporaryRamDonePpiGuid ## PRODUCES > - ## NOTIFY > - ## SOMETIMES_CONSUMES > - gPeiSecPerformancePpiGuid > > [Guids] > ## SOMETIMES_PRODUCES ## HOB > diff --git a/UefiCpuPkg/SecCore/SecMain.h > b/UefiCpuPkg/SecCore/SecMain.h > index 4bc6606044..83244af119 100644 > --- a/UefiCpuPkg/SecCore/SecMain.h > +++ b/UefiCpuPkg/SecCore/SecMain.h > @@ -17,14 +17,12 @@ > > #include <PiPei.h> > > -#include <Ppi/SecPlatformInformation.h> > #include <Ppi/SecPlatformInformation2.h> > #include <Ppi/TemporaryRamDone.h> > #include <Ppi/SecPerformance.h> > > #include <Guid/FirmwarePerformance.h> > > -#include <Library/BaseLib.h> > #include <Library/DebugLib.h> > #include <Library/PcdLib.h> > #include <Library/BaseMemoryLib.h> > diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > index 28e53ac5d3..f164c1713b 100644 > --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > @@ -25,7 +25,6 @@ > #include <Guid/ExtendedFirmwarePerformance.h> > #include <Guid/EndOfS3Resume.h> > #include <Guid/S3SmmInitDone.h> > -#include <Ppi/ReadOnlyVariable2.h> > #include <Ppi/S3Resume2.h> > #include <Ppi/SmmAccess.h> > #include <Ppi/PostBootScriptTable.h> > @@ -34,7 +33,6 @@ > > #include <Library/DebugLib.h> > #include <Library/BaseLib.h> > -#include <Library/TimerLib.h> > #include <Library/PeimEntryPoint.h> > #include <Library/PeiServicesLib.h> > #include <Library/HobLib.h> > @@ -47,7 +45,7 @@ > #include <Library/DebugAgentLib.h> > #include <Library/LocalApicLib.h> > #include <Library/ReportStatusCodeLib.h> > -#include <Library/PrintLib.h> > + > #include <Library/HobLib.h> > #include <Library/LockBoxLib.h> > #include <IndustryStandard/Acpi.h> > diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > index 407aab6735..6ce1bf944c 100644 > --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > @@ -53,7 +53,6 @@ > HobLib > PeiServicesLib > PeimEntryPoint > - TimerLib > BaseLib > DebugLib > PcdLib > @@ -64,7 +63,6 @@ > LocalApicLib > ReportStatusCodeLib > LockBoxLib > - PrintLib > > [Guids] > gEfiBootScriptExecutorVariableGuid ## SOMETIMES_CONSUMES ## > UNDEFINED # LockBox > @@ -79,7 +77,6 @@ > gEdkiiS3SmmInitDoneGuid > > [Ppis] > - gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES > gEfiPeiS3Resume2PpiGuid ## PRODUCES > gPeiSmmAccessPpiGuid ## SOMETIMES_CONSUMES > gPeiPostScriptTablePpiGuid ## SOMETIMES_PRODUCES > -- > 2.18.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
