MdeModulePkg: Add NVMe Long Delay Time Events

Fire an event if a long delay occurs when starting an NVMe device.
This can be used by platforms to draw pictures on the screen or
take other actions to notify a user or move boot forward.

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>

3 files changed, 15 insertions, 2 deletions

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
index 4c26b2e1b4..2b9ab8a08e 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
@@ -41,6 +41,8 @@
 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/ReportStatusCodeLib.h>

 

+#include <Guid/NVMeEventGroup.h>

+

 typedef struct _NVME_CONTROLLER_PRIVATE_DATA  NVME_CONTROLLER_PRIVATE_DATA;

 typedef struct _NVME_DEVICE_PRIVATE_DATA      NVME_DEVICE_PRIVATE_DATA;

 

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
index dc1990c327..1a29c0b907 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
@@ -41,8 +41,13 @@
   NvmExpressHci.h

   NvmExpressPassthru.c

 

+[Guids]

+  gNVMeEnableStartEventGroupGuid

+  gNVMeEnableCompleteEventGroupGuid

+

 [Packages]

   MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

 

 [LibraryClasses]

   BaseMemoryLib

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index b90c48731c..e1b0ee6051 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -8,6 +8,7 @@
 **/

 

 #include "NvmExpress.h"

+#include <Guid/NVMeEventGroup.h>

 

 #define NVME_SHUTDOWN_PROCESS_TIMEOUT  45

 

@@ -399,6 +400,8 @@ NvmeEnableController (
   UINT32      Index;

   UINT8       Timeout;

 

+  EfiEventGroupSignal (&gNVMeEnableStartEventGroupGuid);

+

   //

   // Enable the controller.

   // CC.AMS, CC.MPS and CC.CSS are all set to 0.

@@ -410,7 +413,7 @@ NvmeEnableController (
 

   Status = WriteNvmeControllerConfiguration (Private, &Cc);

   if (EFI_ERROR (Status)) {

-    return Status;

+    goto Cleanup;

   }

 

   //

@@ -432,7 +435,7 @@ NvmeEnableController (
     Status = ReadNvmeControllerStatus (Private, &Csts);

 

     if (EFI_ERROR (Status)) {

-      return Status;

+      goto Cleanup;

     }

 

     if (Csts.Rdy) {

@@ -449,6 +452,9 @@ NvmeEnableController (
   }

 

   DEBUG ((DEBUG_INFO, "NVMe controller is enabled with status [%r].\n", Status));

+

+Cleanup:

+  EfiEventGroupSignal (&gNVMeEnableCompleteEventGroupGuid);

   return Status;

 }