X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FCore%2FDxe%2FDxeMain%2FDxeProtocolNotify.c;h=a4d653c5aab2d9d998323bf0c7eaa6ada332c6c5;hp=0ceb82d2c2fb4d9ea27e85482de27b1dccbe7a9b;hb=3ec2611d34aec117fec295ab55dbf62363a7a7a9;hpb=d43eee260fdd3080c85a7d6860c19100d7e48e6b

diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 0ceb82d2c2..a4d653c5aa 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -128,6 +128,8 @@ Returns:
   ARCHITECTURAL_PROTOCOL_ENTRY    *Entry;
   VOID                            *Protocol;
   BOOLEAN                         Found;
+  LIST_ENTRY                      *Link;
+  LIST_ENTRY                      TempLinkNode;
 
   Found = FALSE;
   for (Entry = mArchProtocols; Entry->ProtocolGuid != NULL; Entry++) {
@@ -160,6 +162,34 @@ Returns:
       // When runtime architectural protocol is available, updates CRC32 in the Debug Table
       //
       CoreUpdateDebugTableCrc32 ();
+
+      //
+      // Update the Runtime Architectural protocol with the template that the core was
+      // using so there would not need to be a dependency on the Runtime AP
+      //
+
+      //
+      // Copy all the registered Image to new gRuntime protocol
+      //
+      for (Link = gRuntimeTemplate.ImageHead.ForwardLink; Link != &gRuntimeTemplate.ImageHead; Link = TempLinkNode.ForwardLink) {
+        CopyMem (&TempLinkNode, Link, sizeof(LIST_ENTRY));
+        InsertTailList (&gRuntime->ImageHead, Link);
+      }
+      //
+      // Copy all the registered Event to new gRuntime protocol
+      //
+      for (Link = gRuntimeTemplate.EventHead.ForwardLink; Link != &gRuntimeTemplate.EventHead; Link = TempLinkNode.ForwardLink) {
+        CopyMem (&TempLinkNode, Link, sizeof(LIST_ENTRY));
+        InsertTailList (&gRuntime->EventHead, Link);
+      }
+      
+      //
+      // Clean up gRuntimeTemplate
+      //
+      gRuntimeTemplate.ImageHead.ForwardLink = &gRuntimeTemplate.ImageHead;
+      gRuntimeTemplate.ImageHead.BackLink    = &gRuntimeTemplate.ImageHead;
+      gRuntimeTemplate.EventHead.ForwardLink = &gRuntimeTemplate.EventHead;
+      gRuntimeTemplate.EventHead.BackLink    = &gRuntimeTemplate.EventHead;
     }
   }