Zhichao, Please separate the single patch to multiple patches so that every patch just changes one component.
> -----Original Message----- > From: Gao, Zhichao <zhichao....@intel.com> > Sent: Monday, February 18, 2019 3:33 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ray <ray...@intel.com>; Gao, Liming <liming....@intel.com> > Subject: [PATCH 1/2] MdeModulePkg: Add a new API ResetSystem > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 > > Add a new API ResetSystem: > VOID > EFIAPI > ResetSystem ( > IN EFI_RESET_TYPE ResetType, > IN EFI_STATUS ResetStatus, > IN UINTN DataSize, > IN VOID *ResetData OPTIONAL > ) > The Consumer of ResetSystemLib can use this new API to reset > system with additional reset data.Because ResetSystemRuntimeDxe > has a same function name with it, change the function name from > ResetSystem to EfiRuntimeResetSystem(both ResetSystem and > EfiResetSystem are used in ResetSystemLiband RuntimeLib, and the > driver consumes these two library) in driver ResetSystemRuntimeDxe. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhichao Gao <zhichao....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Liming Gao <liming....@intel.com> > --- > MdeModulePkg/Include/Library/ResetSystemLib.h | 25 > ++++++++++++++++++- > .../Library/DxeResetSystemLib/DxeResetSystemLib.c | 28 > +++++++++++++++++++++- > .../Library/PeiResetSystemLib/PeiResetSystemLib.c | 28 > +++++++++++++++++++++- > .../Universal/ResetSystemRuntimeDxe/ResetSystem.c | 8 +++---- > .../Universal/ResetSystemRuntimeDxe/ResetSystem.h | 4 ++-- > 5 files changed, 84 insertions(+), 9 deletions(-) > > diff --git a/MdeModulePkg/Include/Library/ResetSystemLib.h > b/MdeModulePkg/Include/Library/ResetSystemLib.h > index 55d1923ae1..2f5d15ade8 100644 > --- a/MdeModulePkg/Include/Library/ResetSystemLib.h > +++ b/MdeModulePkg/Include/Library/ResetSystemLib.h > @@ -2,7 +2,7 @@ > System reset Library Services. This library class defines a set of > methods that reset the whole system. > > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials are licensed and made > available under > the terms and conditions of the BSD License that accompanies this > distribution. > The full text of the license may be found at > @@ -83,4 +83,27 @@ ResetPlatformSpecific ( > IN VOID *ResetData > ); > > +/** > + The ResetSystem function resets the entire platform. > + > + @param[in] ResetType The type of reset to perform. > + @param[in] ResetStatus The status code for the reset. > + @param[in] DataSize The size, in bytes, of ResetData. > + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, > or EfiResetShutdown > + the data buffer starts with a Null-terminated > string, optionally > + followed by additional binary data. The string > is a description > + that the caller may use to further indicate the > reason for the > + system reset. ResetData is only valid if > ResetStatus is > something > + other than EFI_SUCCESS unless the ResetType is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is always > required. > +**/ > +VOID > +EFIAPI > +ResetSystem ( > + IN EFI_RESET_TYPE ResetType, > + IN EFI_STATUS ResetStatus, > + IN UINTN DataSize, > + IN VOID *ResetData OPTIONAL > + ); > + > #endif > diff --git > a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c > b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c > index ea4878cab1..f5c7386c9a 100644 > --- a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c > +++ b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c > @@ -1,7 +1,7 @@ > /** @file > DXE Reset System Library instance that calls gRT->ResetSystem(). > > - Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > @@ -96,3 +96,29 @@ ResetPlatformSpecific ( > { > gRT->ResetSystem (EfiResetPlatformSpecific, EFI_SUCCESS, DataSize, > ResetData); > } > + > +/** > + The ResetSystem function resets the entire platform. > + > + @param[in] ResetType The type of reset to perform. > + @param[in] ResetStatus The status code for the reset. > + @param[in] DataSize The size, in bytes, of ResetData. > + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, > or EfiResetShutdown > + the data buffer starts with a Null-terminated > string, optionally > + followed by additional binary data. The string > is a description > + that the caller may use to further indicate the > reason for the > + system reset. ResetData is only valid if > ResetStatus is > something > + other than EFI_SUCCESS unless the ResetType is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is always > required. > +**/ > +VOID > +EFIAPI > +ResetSystem ( > + IN EFI_RESET_TYPE ResetType, > + IN EFI_STATUS ResetStatus, > + IN UINTN DataSize, > + IN VOID *ResetData OPTIONAL > + ) > +{ > + gRT->ResetSystem (ResetType, ResetStatus, DataSize, ResetData); > +} > diff --git a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c > b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c > index d8219775d1..f35acb3c6e 100644 > --- a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c > +++ b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c > @@ -1,7 +1,7 @@ > /** @file > PEI Reset System Library instance that calls the ResetSystem2() PEI > Service. > > - Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > @@ -96,3 +96,29 @@ ResetPlatformSpecific ( > { > PeiServicesResetSystem2 (EfiResetPlatformSpecific, EFI_SUCCESS, DataSize, > ResetData); > } > + > +/** > + The ResetSystem function resets the entire platform. > + > + @param[in] ResetType The type of reset to perform. > + @param[in] ResetStatus The status code for the reset. > + @param[in] DataSize The size, in bytes, of ResetData. > + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, > or EfiResetShutdown > + the data buffer starts with a Null-terminated > string, optionally > + followed by additional binary data. The string > is a description > + that the caller may use to further indicate the > reason for the > + system reset. ResetData is only valid if > ResetStatus is > something > + other than EFI_SUCCESS unless the ResetType is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is always > required. > +**/ > +VOID > +EFIAPI > +ResetSystem ( > + IN EFI_RESET_TYPE ResetType, > + IN EFI_STATUS ResetStatus, > + IN UINTN DataSize, > + IN VOID *ResetData OPTIONAL > + ) > +{ > + PeiServicesResetSystem2 (ResetType, ResetStatus, DataSize, ResetData); > +} > diff --git > a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c > b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c > index afc35587fc..e16b0cda7b 100644 > --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c > +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c > @@ -1,7 +1,7 @@ > /** @file > Reset Architectural and Reset Notification protocols implementation. > > - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > @@ -187,7 +187,7 @@ InitializeResetSystem ( > // > // Hook the runtime service table > // > - gRT->ResetSystem = ResetSystem; > + gRT->ResetSystem = EfiRuntimeResetSystem; > > // > // Now install the Reset RT AP on a new handle > @@ -242,7 +242,7 @@ DoS3 ( > **/ > VOID > EFIAPI > -ResetSystem ( > +EfiRuntimeResetSystem ( > IN EFI_RESET_TYPE ResetType, > IN EFI_STATUS ResetStatus, > IN UINTN DataSize, > @@ -256,7 +256,7 @@ ResetSystem ( > RESET_NOTIFY_ENTRY *Entry; > > // > - // Only do REPORT_STATUS_CODE() on first call to ResetSystem() > + // Only do REPORT_STATUS_CODE() on first call to > EfiRuntimeResetSystem() > // > if (mResetNotifyDepth == 0) { > // > diff --git > a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h > b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h > index 8529de675c..448e30f079 100644 > --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h > +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h > @@ -1,6 +1,6 @@ > /** @file > > - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > @@ -97,7 +97,7 @@ InitializeResetSystem ( > **/ > VOID > EFIAPI > -ResetSystem ( > +EfiRuntimeResetSystem ( > IN EFI_RESET_TYPE ResetType, > IN EFI_STATUS ResetStatus, > IN UINTN DataSize, > -- > 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
