* [PATCH v2 1/3] IntelFrameworkModulePkg: Remove PeiS3Lib and PeiRecoveryLib
2018-11-19 7:30 [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Shenglei Zhang
@ 2018-11-19 7:30 ` Shenglei Zhang
2018-11-19 7:30 ` [PATCH v2 2/3] Vlv2TbltDevicePkg: Remove PeiS3Lib in DSC Shenglei Zhang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Shenglei Zhang @ 2018-11-19 7:30 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
As was described in 5933acc3cb1ac1a344a34342d0ac46d3afed929a,
there was no code using AcpiS3ResumeOs() interface in S3Lib and
PeiRecoverFirmware() interface in RecoveryLib.
PeiS3Lib and PeiRecoveryLib were deprecated,so they should be removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.../IntelFrameworkModulePkg.dsc | 2 -
.../Library/PeiRecoveryLib/PeiRecoveryLib.c | 50 ------------------
.../Library/PeiRecoveryLib/PeiRecoveryLib.inf | 50 ------------------
.../Library/PeiRecoveryLib/PeiRecoveryLib.uni | 23 ---------
.../Library/PeiS3Lib/PeiS3Lib.c | 51 -------------------
.../Library/PeiS3Lib/PeiS3Lib.inf | 49 ------------------
.../Library/PeiS3Lib/PeiS3Lib.uni | 23 ---------
7 files changed, 248 deletions(-)
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 894c5340a0..28e8a3f6e1 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -110,8 +110,6 @@
[Components]
IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
- IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
- IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
deleted file mode 100644
index d9430483d5..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/** @file
- This Library uses Framework RecoveryModule PPI to do system recovery.
-
- This library instance is no longer used and module using this library
- class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
- in PI 1.2 specification.
-
-Copyright (c) 2006 - 2018, 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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-#include <PiPei.h>
-#include <Library/PeiServicesLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/DebugLib.h>
-
-#include <Ppi/RecoveryModule.h>
-
-/**
- Calling this function causes the system do recovery.
-
- @retval EFI_SUCESS Sucess to do recovery.
- @retval Others Fail to do recovery.
-**/
-EFI_STATUS
-EFIAPI
-PeiRecoverFirmware (
- VOID
- )
-{
- EFI_STATUS Status;
- EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery;
-
- Status = PeiServicesLocatePpi (
- &gEfiPeiRecoveryModulePpiGuid,
- 0,
- NULL,
- (VOID **)&PeiRecovery
- );
- ASSERT_EFI_ERROR (Status);
-
- return PeiRecovery->LoadRecoveryCapsule ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer(), PeiRecovery);
-}
-
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
deleted file mode 100644
index f62b42e40f..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
+++ /dev/null
@@ -1,50 +0,0 @@
-## @file
-# PEIM Recovery Library supports system recovery boot.
-#
-# This library instance is no longer used and module using this library
-# class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
-# in PI 1.2 specification.
-#
-# Copyright (c) 2006 - 2018, 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
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiRecoveryLib
- MODULE_UNI_FILE = PeiRecoveryLib.uni
- FILE_GUID = C0227547-0811-4cbb-ABEA-DECD22829122
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = RecoveryLib|PEIM
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 EBC
-#
-
-[Sources]
- PeiRecoveryLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
-
-[LibraryClasses]
- BaseLib
- PeiServicesTablePointerLib
- DebugLib
-
-[Ppis]
- gEfiPeiRecoveryModulePpiGuid ## CONSUMES
-
-
diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
deleted file mode 100644
index 3a2ab714aa..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
+++ /dev/null
@@ -1,23 +0,0 @@
-// /** @file
-// PEIM Recovery Library supports system recovery boot.
-//
-// This library instance is no longer used and module using this library
-// class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
-// in PI 1.2 specification.
-//
-// Copyright (c) 2006 - 2014, 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
-// http://opensource.org/licenses/bsd-license.php
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "PEIM Recovery Library supports system recovery boot"
-
-#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and any module using this library class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in the PI 1.2 Specification."
-
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
deleted file mode 100644
index 9db5b7e09c..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/** @file
- This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode.
-
- 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.<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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <PiPei.h>
-#include <Library/PeiServicesLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/DebugLib.h>
-
-#include <Ppi/S3Resume.h>
-
-/**
- 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
- )
-{
- EFI_STATUS Status;
- EFI_PEI_S3_RESUME_PPI *S3Resume;
-
- Status = PeiServicesLocatePpi (
- &gEfiPeiS3ResumePpiGuid,
- 0,
- NULL,
- (VOID **)&S3Resume
- );
- ASSERT_EFI_ERROR (Status);
-
- return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer());
-}
-
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
deleted file mode 100644
index 130b64878e..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
+++ /dev/null
@@ -1,49 +0,0 @@
-## @file
-# This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode.
-#
-# 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.<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
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiS3Lib
- MODULE_UNI_FILE = PeiS3Lib.uni
- FILE_GUID = EFB7D3A8-DEB9-4bed-B6D6-3B09BEEB835A
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = S3Lib|PEIM
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 EBC
-#
-
-[Sources]
- PeiS3Lib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
-
-[LibraryClasses]
- PeiServicesTablePointerLib
- DebugLib
-
-[Ppis]
- gEfiPeiS3ResumePpiGuid ## CONSUMES
-
diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
deleted file mode 100644
index 43610d2ae1..0000000000
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
+++ /dev/null
@@ -1,23 +0,0 @@
-// /** @file
-// This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode.
-//
-// 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 - 2014, 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
-// http://opensource.org/licenses/bsd-license.php
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "Provides an API to invoke the S3 resume vector in the ACPI Table in S3 resume mode"
-
-#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and any module using this library class should update to directly locate EFI_PEI_S3_RESUME_PPI defined in the PI 1.2 Specification."
-
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/3] Vlv2TbltDevicePkg: Remove PeiS3Lib in DSC
2018-11-19 7:30 [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Shenglei Zhang
2018-11-19 7:30 ` [PATCH v2 1/3] IntelFrameworkModulePkg: Remove PeiS3Lib and PeiRecoveryLib Shenglei Zhang
@ 2018-11-19 7:30 ` Shenglei Zhang
2018-11-19 7:30 ` [PATCH v2 3/3] MdeModulePkg: Remove PeiS3LibNull and PeiRecoveryLibNull Shenglei Zhang
2018-11-20 1:15 ` [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Wang, Jian J
3 siblings, 0 replies; 5+ messages in thread
From: Shenglei Zhang @ 2018-11-19 7:30 UTC (permalink / raw)
To: edk2-devel
PeiS3Lib is not actually used in Vlv2TbltDevicePkg, so it
is removed in DSC.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 ---
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 ---
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 ---
3 files changed, 9 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index f0a689c2c4..736155f4e0 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -180,9 +180,6 @@
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
!endif
-!if $(S3_ENABLE) == TRUE
- S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
-!endif
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
!if $(CAPSULE_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index c7908818b4..3bb37a34ab 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -180,9 +180,6 @@
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
!endif
-!if $(S3_ENABLE) == TRUE
- S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
-!endif
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
!if $(CAPSULE_ENABLE) == TRUE
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index cc8ad9508e..1e405dfb1b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -180,9 +180,6 @@
TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
!endif
-!if $(S3_ENABLE) == TRUE
- S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
-!endif
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
!if $(CAPSULE_ENABLE) == TRUE
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] MdeModulePkg: Remove PeiS3LibNull and PeiRecoveryLibNull
2018-11-19 7:30 [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Shenglei Zhang
2018-11-19 7:30 ` [PATCH v2 1/3] IntelFrameworkModulePkg: Remove PeiS3Lib and PeiRecoveryLib Shenglei Zhang
2018-11-19 7:30 ` [PATCH v2 2/3] Vlv2TbltDevicePkg: Remove PeiS3Lib in DSC Shenglei Zhang
@ 2018-11-19 7:30 ` Shenglei Zhang
2018-11-20 1:15 ` [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Wang, Jian J
3 siblings, 0 replies; 5+ messages in thread
From: Shenglei Zhang @ 2018-11-19 7:30 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Jian J Wang, Ruiyu Ni
As was described in 5933acc3cb1ac1a344a34342d0ac46d3afed929a,
there was no code using AcpiS3ResumeOs() interface in S3Lib and
PeiRecoverFirmware() interface in RecoveryLib.
PeiS3LibNull and PeiRecoveryLibNull were deprecated,
so they should be removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
v2:Remove S3Lib.h and RecoveryLib.h.
Cc: Star Zeng <star.zeng@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 2 -
MdeModulePkg/Include/Library/RecoveryLib.h | 35 ----------------
MdeModulePkg/Include/Library/S3Lib.h | 34 ----------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 34 ----------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 39 ------------------
.../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 24 -----------
.../Library/PeiS3LibNull/PeiS3LibNull.c | 35 ----------------
.../Library/PeiS3LibNull/PeiS3LibNull.inf | 40 -------------------
.../Library/PeiS3LibNull/PeiS3LibNull.uni | 24 -----------
MdeModulePkg/MdeModulePkg.dec | 10 -----
MdeModulePkg/MdeModulePkg.dsc | 2 -
11 files changed, 279 deletions(-)
delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h
delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
delete mode 100644 MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 9ea88a399b..bd0c967d75 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -44,8 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/PcdLib.h>
-#include <Library/S3Lib.h>
-#include <Library/RecoveryLib.h>
#include <Library/DebugAgentLib.h>
#include <Library/PeiServicesTablePointerLib.h>
#include <Library/PerformanceLib.h>
diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
deleted file mode 100644
index da5cb771bf..0000000000
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** @file
- Recovery library class defines a set of methods related recovery boot mode.
- This library class is no longer used and modules using this library should
- directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 specification.
-
-Copyright (c) 2005 - 2018, 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
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef __RECOVERY_LIB_H__
-#define __RECOVERY_LIB_H__
-
-/**
- Calling this function causes the system to carry out a recovery boot path.
-
- @retval EFI_SUCCESS Recovery boot path succeeded.
- @retval Others Recovery boot path failure.
-
-**/
-EFI_STATUS
-EFIAPI
-PeiRecoverFirmware (
- VOID
- );
-
-#endif
-
-
diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h
deleted file mode 100644
index 2a309034fa..0000000000
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ /dev/null
@@ -1,34 +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 should
- directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specification.
-
-Copyright (c) 2005 - 2018, 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
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#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/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
deleted file mode 100644
index f39a21b711..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/** @file
- Null Recovery 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_RECOVERY_MODULE_PPI defined
- in PI 1.2 specification.
-
-Copyright (c) 2006 - 2018, 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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-#include <PiPei.h>
-#include <Library/RecoveryLib.h>
-
-/**
- Calling this function causes the system do recovery boot path.
-
- @retval EFI_UNSUPPORTED Recovery is not supported.
-**/
-EFI_STATUS
-EFIAPI
-PeiRecoverFirmware (
- VOID
- )
-{
- return EFI_UNSUPPORTED;
-}
-
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
deleted file mode 100644
index c1cdd70162..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-## @file
-# Null Recovery library instance for PEIM module
-# This library instance is no longer used and module using this library
-# class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
-# in PI 1.2 specification.
-#
-# Copyright (c) 2006 - 2018, 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
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiRecoveryLibNull
- MODULE_UNI_FILE = PeiRecoveryLibNull.uni
- FILE_GUID = 41789FB9-02AC-4484-BD40-A3147D7EDA25
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = RecoveryLib|PEIM
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 EBC (EBC is for build only)
-#
-
-[Sources]
- PeiRecoveryLibNull.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
-
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
deleted file mode 100644
index 14385297f4..0000000000
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
+++ /dev/null
@@ -1,24 +0,0 @@
-// /** @file
-// Null Recovery library instance for PEIM module
-//
-// This library instance is no longer used and module using this library
-// class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
-// in PI 1.2 specification.
-//
-// Copyright (c) 2006 - 2018, 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
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "Null Recovery library instance for PEIM module"
-
-#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and module using this library class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 Specification."
-
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
deleted file mode 100644
index d0b53917f9..0000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ /dev/null
@@ -1,35 +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.<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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-#include <PiPei.h>
-#include <Library/S3Lib.h>
-
-/**
- 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/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
deleted file mode 100644
index c9b7ba1d69..0000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-## @file
-# Null S3 library instance for PEIM module.
-# 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.<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
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiS3LibNull
- MODULE_UNI_FILE = PeiS3LibNull.uni
- FILE_GUID = 018E1925-D6A2-4a2a-8958-817610A15ADF
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = S3Lib|PEIM
-
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 EBC (EBC is for build only)
-#
-
-[Sources]
- PeiS3LibNull.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
deleted file mode 100644
index 5a8a91a12e..0000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
+++ /dev/null
@@ -1,24 +0,0 @@
-// /** @file
-// Null S3 library instance for PEIM module.
-//
-// 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.<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
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "Null S3 library instance for PEIM module"
-
-#string STR_MODULE_DESCRIPTION #language en-US "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."
-
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 428eeeb670..e628bb2fb8 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -57,16 +57,6 @@
## @libraryclass Defines a set of helper functions for resetting the system.
ResetUtilityLib|Include/Library/ResetUtilityLib.h
- ## @libraryclass Defines a set of methods related do S3 mode.
- # This library class is no longer used and modules using this library should
- # directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specification.
- 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 library should
- # directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 specification.
- RecoveryLib|Include/Library/RecoveryLib.h
-
## @libraryclass Provides HII related functions.
HiiLib|Include/Library/HiiLib.h
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 2465d39fd7..0e7a173add 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -267,9 +267,7 @@
MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
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.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 0/3] Remove S3Lib and RecoveryLib class
2018-11-19 7:30 [PATCH v2 0/3] Remove S3Lib and RecoveryLib class Shenglei Zhang
` (2 preceding siblings ...)
2018-11-19 7:30 ` [PATCH v2 3/3] MdeModulePkg: Remove PeiS3LibNull and PeiRecoveryLibNull Shenglei Zhang
@ 2018-11-20 1:15 ` Wang, Jian J
3 siblings, 0 replies; 5+ messages in thread
From: Wang, Jian J @ 2018-11-20 1:15 UTC (permalink / raw)
To: Zhang, Shenglei, edk2-devel@lists.01.org
Cc: Sun, Zailiang, Zeng, Star, Ni, Ruiyu, Gao, Liming
Shenglei,
I think it would be better to split the patch series in following order:
1. package dec/dsc/uni
2. changes of each module (one patch per module)
3. public header files
Regards,
Jian
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, November 19, 2018 3:30 PM
> To: edk2-devel@lists.01.org
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Zeng, Star <star.zeng@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Gao,
> Liming <liming.gao@intel.com>
> Subject: [PATCH v2 0/3] Remove S3Lib and RecoveryLib class
>
> S3Lib and RecoveryLib have been deprecated since 2009.
> There is no code using AcpiS3ResumeOs() interface in
> S3Lib and PeiRecoverFirmware() interface in RecoveryLib.
> So they can be removed from edk2 repo.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1299
>
> v2:Remove S3Lib.h and RecoveryLib.h. in MdeModulePkg.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> Shenglei Zhang (3):
> IntelFrameworkModulePkg: Remove PeiS3Lib and PeiRecoveryLib
> Vlv2TbltDevicePkg: Remove PeiS3Lib in DSC
> MdeModulePkg: Remove PeiS3LibNull and PeiRecoveryLibNull
>
> .../IntelFrameworkModulePkg.dsc | 2 -
> .../Library/PeiRecoveryLib/PeiRecoveryLib.c | 50 ------------------
> .../Library/PeiRecoveryLib/PeiRecoveryLib.inf | 50 ------------------
> .../Library/PeiRecoveryLib/PeiRecoveryLib.uni | 23 ---------
> .../Library/PeiS3Lib/PeiS3Lib.c | 51 -------------------
> .../Library/PeiS3Lib/PeiS3Lib.inf | 49 ------------------
> .../Library/PeiS3Lib/PeiS3Lib.uni | 23 ---------
> MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 2 -
> MdeModulePkg/Include/Library/RecoveryLib.h | 35 -------------
> MdeModulePkg/Include/Library/S3Lib.h | 34 -------------
> .../PeiRecoveryLibNull/PeiRecoveryLibNull.c | 34 -------------
> .../PeiRecoveryLibNull/PeiRecoveryLibNull.inf | 39 --------------
> .../PeiRecoveryLibNull/PeiRecoveryLibNull.uni | 24 ---------
> .../Library/PeiS3LibNull/PeiS3LibNull.c | 35 -------------
> .../Library/PeiS3LibNull/PeiS3LibNull.inf | 40 ---------------
> .../Library/PeiS3LibNull/PeiS3LibNull.uni | 24 ---------
> MdeModulePkg/MdeModulePkg.dec | 10 ----
> MdeModulePkg/MdeModulePkg.dsc | 2 -
> Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 --
> Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 --
> Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 --
> 21 files changed, 536 deletions(-)
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
> delete mode 100644
> IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.uni
> delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
> delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni
> delete mode 100644 MdeModulePkg/Include/Library/RecoveryLib.h
> delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h
> delete mode 100644
> MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
> delete mode 100644
> MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
> delete mode 100644
> MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
> delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
> delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
> delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
>
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 5+ messages in thread