From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=ray.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0898B202E5315 for ; Mon, 18 Feb 2019 00:36:30 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 00:36:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,384,1544515200"; d="scan'208";a="144354594" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 18 Feb 2019 00:36:29 -0800 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 18 Feb 2019 00:36:13 -0800 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 18 Feb 2019 00:36:12 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.232]) with mapi id 14.03.0415.000; Mon, 18 Feb 2019 16:34:56 +0800 From: "Ni, Ray" To: "Gao, Zhichao" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [PATCH 1/2] MdeModulePkg: Add a new API ResetSystem Thread-Index: AQHUx1xYcYQg7OwFq0mR7Jxt45hid6XlO31w Date: Mon, 18 Feb 2019 08:34:55 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C021E57@SHSMSX104.ccr.corp.intel.com> References: <20190218073251.1272-1-zhichao.gao@intel.com> <20190218073251.1272-2-zhichao.gao@intel.com> In-Reply-To: <20190218073251.1272-2-zhichao.gao@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/2] MdeModulePkg: Add a new API ResetSystem X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2019 08:36:31 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Zhichao, Please separate the single patch to multiple patches so that every patch just changes one component. > -----Original Message----- > From: Gao, Zhichao > Sent: Monday, February 18, 2019 3:33 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ray ; Gao, Liming > Subject: [PATCH 1/2] MdeModulePkg: Add a new API ResetSystem >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1460 >=20 > 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. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhichao Gao > Cc: Ray Ni > Cc: Liming Gao > --- > 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(-) >=20 > 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. >=20 > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.
> 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 > ); >=20 > +/** > + 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, EfiResetWar= m, > or EfiResetShutdown > + the data buffer starts with a Null-terminate= d string, optionally > + followed by additional binary data. The stri= ng is a description > + that the caller may use to further indicate = the reason for the > + system reset. ResetData is only valid if Res= etStatus is > something > + other than EFI_SUCCESS unless the ResetType = is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is alway= s 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(). >=20 > - Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> 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, EfiResetWar= m, > or EfiResetShutdown > + the data buffer starts with a Null-terminate= d string, optionally > + followed by additional binary data. The stri= ng is a description > + that the caller may use to further indicate = the reason for the > + system reset. ResetData is only valid if Res= etStatus is > something > + other than EFI_SUCCESS unless the ResetType = is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is alway= s 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 Se= rvice. >=20 > - Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> 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, DataSi= ze, > 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, EfiResetWar= m, > or EfiResetShutdown > + the data buffer starts with a Null-terminate= d string, optionally > + followed by additional binary data. The stri= ng is a description > + that the caller may use to further indicate = the reason for the > + system reset. ResetData is only valid if Res= etStatus is > something > + other than EFI_SUCCESS unless the ResetType = is > EfiResetPlatformSpecific > + where a minimum amount of ResetData is alway= s 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. >=20 > - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
>=20 > 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 =3D ResetSystem; > + gRT->ResetSystem =3D EfiRuntimeResetSystem; >=20 > // > // 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; >=20 > // > - // Only do REPORT_STATUS_CODE() on first call to ResetSystem() > + // Only do REPORT_STATUS_CODE() on first call to > EfiRuntimeResetSystem() > // > if (mResetNotifyDepth =3D=3D 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 >=20 > - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
>=20 > 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