From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ray.ni@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Fri, 02 Aug 2019 08:14:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Aug 2019 08:14:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,338,1559545200"; d="scan'208";a="324597870" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 02 Aug 2019 08:14:03 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 2 Aug 2019 08:14:02 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 2 Aug 2019 08:14:02 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.80]) with mapi id 14.03.0439.000; Fri, 2 Aug 2019 23:14:00 +0800 From: "Ni, Ray" To: "devel@edk2.groups.io" , "Zhang, Shenglei" CC: "Wang, Jian J" , "Wu, Hao A" , "Zeng, Star" Subject: Re: [edk2-devel] [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Thread-Topic: [edk2-devel] [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3LibNull Thread-Index: AQHVSP9QcBToxLXpfECenf71jOMVz6bn90yA Date: Fri, 2 Aug 2019 15:13:59 +0000 Deferred-Delivery: Fri, 2 Aug 2019 15:13:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C26B100@SHSMSX104.ccr.corp.intel.com> References: <20190802065527.17208-1-shenglei.zhang@intel.com> <20190802065527.17208-2-shenglei.zhang@intel.com> In-Reply-To: <20190802065527.17208-2-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjYxOTZmMmQtM2U3MC00YjQyLThmNDYtNGY4OTg0ZWM3NzcxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZlRvYjVlbjhEaHdYMmc0TWhCSDRtQXNPZzlSY1NRR25cL0xBYWlRWFpCdys4RWcyVGt2cElaR25TQ1dmWklVOUQifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Zhang, Sh= englei > Sent: Friday, August 2, 2019 2:55 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Hao A = ; Ni, Ray ; Zeng, Star > > Subject: [edk2-devel] [PATCH 1/2] MdeModulePkg: Remove S3Lib.h and PeiS3= LibNull >=20 > S3Lib.h and PeiS3LibNull have been deprecated since 2009, so remove them= . > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1299 >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Ray Ni > Cc: Star Zeng > Signed-off-by: Shenglei Zhang > --- > .../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ---------------- > MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 1 - > MdeModulePkg/Include/Library/S3Lib.h | 28 --------------- > .../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 ------------------- > .../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ---------- > MdeModulePkg/MdeModulePkg.dec | 5 --- > MdeModulePkg/MdeModulePkg.dsc | 1 - > 7 files changed, 116 deletions(-) > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni >=20 > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModul= ePkg/Library/PeiS3LibNull/PeiS3LibNull.c > deleted file mode 100644 > index a864413bc891..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c > +++ /dev/null > @@ -1,29 +0,0 @@ > -/** @file > - Null S3 Library instance does nothing and returns unsupported status. > - > - This library instance is no longer used and module using this library > - class should update to directly locate EFI_PEI_S3_RESUME_PPI defined > - in PI 1.2 specification. > - > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > -#include > -#include > - > -/** > - This function is responsible for calling the S3 resume vector in the = ACPI Tables. > - > - @retval EFI_SUCESS Success to restore config from S3. > - @retval Others Fail to restore config from S3. > -**/ > -EFI_STATUS > -EFIAPI > -AcpiS3ResumeOs ( > - VOID > - ) > -{ > - return EFI_UNSUPPORTED; > -} > - > diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/D= xeIplPeim/DxeIpl.h > index 90b5b5b21199..ebed1c902ed2 100644 > --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h > +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h > @@ -39,7 +39,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include > #include > #include > -#include > #include > #include > #include > diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include= /Library/S3Lib.h > deleted file mode 100644 > index 171c0ccb92db..000000000000 > --- a/MdeModulePkg/Include/Library/S3Lib.h > +++ /dev/null > @@ -1,28 +0,0 @@ > -/** @file > - S3 library class defines a set of methods related to S3 boot mode. > - This library class is no longer used and modules using this library s= hould > - directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specific= ation. > - > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#ifndef __S3_LIB_H__ > -#define __S3_LIB_H__ > - > -/** > - This function is responsible for calling the S3 resume vector in the = ACPI Tables. > - > - @retval EFI_SUCCESS Successfully restored the configuration from S3= . > - @retval Others Failed to restore the configuration from S3. > - > -**/ > -EFI_STATUS > -EFIAPI > -AcpiS3ResumeOs ( > - VOID > - ); > - > -#endif > - > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeMod= ulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > deleted file mode 100644 > index 3076c17d5cdd..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > +++ /dev/null > @@ -1,34 +0,0 @@ > -## @file > -# Null S3 library instance for PEIM module. > -# This library instance is no longer used and module using this librar= y > -# class should update to directly locate EFI_PEI_S3_RESUME_PPI defined > -# in PI 1.2 specification. > -# > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. > -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > -## > - > -[Defines] > - INF_VERSION =3D 0x00010005 > - BASE_NAME =3D PeiS3LibNull > - MODULE_UNI_FILE =3D PeiS3LibNull.uni > - FILE_GUID =3D 018E1925-D6A2-4a2a-8958-817610A15A= DF > - MODULE_TYPE =3D PEIM > - VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D S3Lib|PEIM > - > - > -# > -# The following information is for reference only and not required by t= he build tools. > -# > -# VALID_ARCHITECTURES =3D IA32 X64 EBC (EBC is for build onl= y) > -# > - > -[Sources] > - PeiS3LibNull.c > - > -[Packages] > - MdePkg/MdePkg.dec > - MdeModulePkg/MdeModulePkg.dec > diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeMod= ulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > deleted file mode 100644 > index 97ec62979ee0..000000000000 > --- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni > +++ /dev/null > @@ -1,18 +0,0 @@ > -// /** @file > -// Null S3 library instance for PEIM module. > -// > -// This library instance is no longer used and module using this librar= y > -// class should update to directly locate EFI_PEI_S3_RESUME_PPI defined > -// in PI 1.2 specification. > -// > -// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. > -// > -// SPDX-License-Identifier: BSD-2-Clause-Patent > -// > -// **/ > - > - > -#string STR_MODULE_ABSTRACT #language en-US "Null S3 librar= y instance for PEIM module" > - > -#string STR_MODULE_DESCRIPTION #language en-US "This library i= nstance is no longer used and module using this library > class should update to directly locate EFI_PEI_S3_RESUME_PPI defined in = PI 1.2 Specification." > - > diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.d= ec > index 12e0bbf57997..60c69feeaa23 100644 > --- a/MdeModulePkg/MdeModulePkg.dec > +++ b/MdeModulePkg/MdeModulePkg.dec > @@ -31,11 +31,6 @@ [LibraryClasses] > ## @libraryclass Defines a set of helper functions for resetting th= e system. > ResetUtilityLib|Include/Library/ResetUtilityLib.h >=20 > - ## @libraryclass Defines a set of methods related do S3 mode. > - # This library class is no longer used and modules using this libra= ry should > - # directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specifica= tion. > - S3Lib|Include/Library/S3Lib.h > - > ## @libraryclass Defines a set of methods related recovery mode. > # This library class is no longer used and modules using this libra= ry should > # directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 spe= cification. > diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.d= sc > index 6ca7d9ade4e1..1c4525cd588c 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -284,7 +284,6 @@ [Components] > MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf > MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf > MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf > - MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf > MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf > MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.in= f > -- > 2.18.0.windows.1 >=20 >=20 >=20