Merged PR 4947: Continue PEI dispatch loop if there are any outstandi…

…ng DelayDispatch registr... Continue PEI dispatch loop if there are any outstanding DelayDispatch registrations
microsoft · May 5, 2023 · b48ca5a · b48ca5a
1 parent b19ebc9
commit b48ca5a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -2016,7 +2016,12 @@ PeiDispatcher (
     //  pass. If we did not dispatch a PEIM/FV there is no point in trying again
     //  as it will fail the next time too (nothing has changed).
     //
-  } while (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass);
+
+    // MS_CHANGE - continue dispatch loop if there are outstanding delay-
+    // dispatch registrations still running.
+  } while (
+           (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass) ||
+           (Private->DelayedDispatchTable->Count > 0));
 
   PERF_FUNCTION_END ();             // MS_CHANGE
 }