MdeModulePkg: Remove BootInRecoveryMode PPI

DEPEX from PEI storage stack.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1777

BootInRecoveryMode Ppi dependency should be removed from PEI storage stack
drivers. Besides recovery, more features are using the storage stack.
Platform can apply Ppi dependency in Recovery FV which contains full
storage driver stack. Platform storage stack modules, such as host
controller init PEI module, should also remove this dependency.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Wei6 Xu <wei6.xu@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Chao B Zhang <chao.b.zhang@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
index a810c3c6bc6db524bd49bef749ce76d9d9bd4cae..0fc09ffca43495e60f5393a8f8030f795c6106ee 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
@@ -59,7 +59,7 @@
   gEfiEndOfPeiSignalPpiGuid                     ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   EhciPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
index 074f12586c0b57054abb75c25087fcb4d67f3455..ad50d4c0c9607274522df1017c67e9ffa850cc80 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
@@ -56,7 +56,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSataSpinUpDelayInSecForRecoveryPath   ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid AND gPeiAtaControllerPpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiAtaControllerPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   IdeBusPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
index accb0e246038200f5f1f2c21dc4746f24a7ebb4f..06515b7ca7ced9082c1511b53c00d33a8ee9a387 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
+++ b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
@@ -54,7 +54,7 @@
 \r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UhciPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
index 89bb28ee536d6455c85e3191b8c79122c9d80804..f216538f4d0e916e062916f953728be433cb6f7c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
@@ -54,7 +54,7 @@
   gEfiEndOfPeiSignalPpiGuid                     ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   XhciPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
index f9f44a883ed40cfeba18c7d3b0a7039bcfcfe2aa..de2df5fe3cb2ef00689ddf95645819f11dec942d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
@@ -56,7 +56,7 @@
   gPeiUsbIoPpiGuid\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbIoPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbIoPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UsbBotPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
index 617aa3bb109f44352b74057c40a91e5501b9f3ec..31d7c2e2fe7887b2b283b0bfdaa7084e1cdaed68 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
@@ -54,7 +54,7 @@
   gPeiUsb2HostControllerPpiGuid                 ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid AND gPeiUsb2HostControllerPpiGuid OR gPeiUsbHostControllerPpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsb2HostControllerPpiGuid OR gPeiUsbHostControllerPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UsbBusPeiExtra.uni\r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index 184036bfb960d146d99d0892f23c9d334ac5dfa3..691203816716d026d3fa99427b07c85d89b634bc 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
@@ -62,7 +62,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName         ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   CdExpressPeiExtra.uni\r