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: Ni Ray <ray...@intel.com> CC: Wu Hao A <hao.a...@intel.com> Signed-off-by: Xu Wei6 <wei6...@intel.com> --- MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf | 2 +- MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf | 2 +- MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf | 2 +- MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf | 2 +- MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf | 2 +- MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf | 2 +- MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf index a810c3c6bc..0fc09ffca4 100644 --- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf +++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf @@ -57,9 +57,9 @@ gPeiUsbControllerPpiGuid ## CONSUMES gEdkiiIoMmuPpiGuid ## CONSUMES gEfiEndOfPeiSignalPpiGuid ## CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid [UserExtensions.TianoCore."ExtraFiles"] EhciPeiExtra.uni diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf index 074f12586c..ad50d4c0c9 100644 --- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf +++ b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf @@ -54,9 +54,9 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdSataSpinUpDelayInSecForRecoveryPath ## CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid AND gPeiAtaControllerPpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiAtaControllerPpiGuid [UserExtensions.TianoCore."ExtraFiles"] IdeBusPeiExtra.uni diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf index accb0e2460..06515b7ca7 100644 --- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf +++ b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf @@ -52,9 +52,9 @@ gEdkiiIoMmuPpiGuid ## CONSUMES gEfiEndOfPeiSignalPpiGuid ## CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid [UserExtensions.TianoCore."ExtraFiles"] UhciPeiExtra.uni diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf index 89bb28ee53..f216538f4d 100644 --- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf +++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf @@ -52,9 +52,9 @@ gPeiUsbControllerPpiGuid ## CONSUMES gEdkiiIoMmuPpiGuid ## CONSUMES gEfiEndOfPeiSignalPpiGuid ## CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbControllerPpiGuid [UserExtensions.TianoCore."ExtraFiles"] XhciPeiExtra.uni diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf index f9f44a883e..de2df5fe3c 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf @@ -54,9 +54,9 @@ ## CONSUMES ## NOTIFY gPeiUsbIoPpiGuid [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbIoPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsbIoPpiGuid [UserExtensions.TianoCore."ExtraFiles"] UsbBotPeiExtra.uni diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf index 617aa3bb10..31d7c2e2fe 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf @@ -52,9 +52,9 @@ gPeiUsbIoPpiGuid ## PRODUCES gPeiUsbHostControllerPpiGuid ## SOMETIMES_CONSUMES gPeiUsb2HostControllerPpiGuid ## SOMETIMES_CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid AND gPeiUsb2HostControllerPpiGuid OR gPeiUsbHostControllerPpiGuid + gEfiPeiMemoryDiscoveredPpiGuid AND gPeiUsb2HostControllerPpiGuid OR gPeiUsbHostControllerPpiGuid [UserExtensions.TianoCore."ExtraFiles"] UsbBusPeiExtra.uni diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf index 11ab49b33b..6a8f3c2da8 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf @@ -63,9 +63,9 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES [Depex] - gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid + gEfiPeiMemoryDiscoveredPpiGuid [UserExtensions.TianoCore."ExtraFiles"] CdExpressPeiExtra.uni -- 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40102): https://edk2.groups.io/g/devel/message/40102 Mute This Topic: https://groups.io/mt/31530233/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
