MdeModulePkg/NvmExpressDxe: Make NVME_GENERIC_TIMEOUT configurable via PCD

Adds gEfiMdeModulePkgTokenSpaceGuid.PcdNvmeGenericTimeout (FixedAtBuild, UINT32, default 5 seconds) so platforms can tune the NVMe generic command timeout without patching the driver. NVME_GENERIC_TIMEOUT now resolves via FixedPcdGet32 to preserve compile-time evaluation and existing behavior at the default value.

Author: maheeraeron

MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h

@@ -152,10 +152,14 @@ extern EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL  gNvmExpressDriverSupportedEfiV
 
 #define NVME_CONTROLLER_ID  0
 
+// MU_CHANGE [BEGIN] - Set generic timeout based on PcdNvmeGenericTimeout
+
 //
-// Time out value for Nvme transaction execution
+// Time out value for Nvme transaction execution (in seconds, from PcdNvmeGenericTimeout).
 //
-#define NVME_GENERIC_TIMEOUT  EFI_TIMER_PERIOD_SECONDS (5)
+#define NVME_GENERIC_TIMEOUT  EFI_TIMER_PERIOD_SECONDS (FixedPcdGet32 (PcdNvmeGenericTimeout))
+
+// MU_CHANGE [END] - Set generic timeout based on PcdNvmeGenericTimeout
 
 //
 // Nvme async transfer timer interval, set by experience.

MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

@@ -85,6 +85,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdNvmeNamespaceFilterId         ## CONSUMES
   ## MU_CHANGE [END] - NVMe namespace filtering
 
+## MU_CHANGE [BEGIN] - Configurable NVMe generic command timeout
+[FixedPcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNvmeGenericTimeout            ## CONSUMES
+## MU_CHANGE [END] - Configurable NVMe generic command timeout
+
 # [Event]
 # EVENT_TYPE_RELATIVE_TIMER ## SOMETIMES_CONSUMES
 #

MdeModulePkg/Bus/Pci/NvmExpressDxe/UnitTest/MediaSanitizeUnitTestHost.inf

@@ -35,3 +35,9 @@
   UnitTestLib
   PrintLib
   MemoryAllocationLib
+  PcdLib  # MU_CHANGE - Configurable NVMe generic command timeout
+
+## MU_CHANGE [BEGIN] - Configurable NVMe generic command timeout
+[FixedPcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNvmeGenericTimeout            ## CONSUMES
+## MU_CHANGE [END] - Configurable NVMe generic command timeout

MdeModulePkg/MdeModulePkg.dec

@@ -1416,6 +1416,12 @@
   # Size in pages. Current default is roughly 1.6GB.
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxMemoryTypeInfoPages            |0x60000|UINT32|0x40000150
   # MU_CHANGE TCBZ1086 [END]
+
+  # MU_CHANGE [BEGIN] - Configurable NVMe generic command timeout
+  ## Timeout, in seconds, used for generic NVMe transactions issued by NvmExpressDxe.
+  # @Prompt NVMe generic command timeout (seconds).
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNvmeGenericTimeout|5|UINT32|0x40000154
+  # MU_CHANGE [END] - Configurable NVMe generic command timeout
 
 [PcdsFixedAtBuild, PcdsPatchableInModule]
   ## Dynamic type PCD can be registered callback function for Pcd setting action.