OvmfPkg: PlatformBdsLib: signal End-of-Dxe event group

(Paraphrasing git commit 9cd7d3c5 / SVN r17713:)

Currently, OvmfPkg fails to signal the End-of-Dxe event group when
entering the BDS phase, which results in some loss of functionality, eg.
variable reclaim in the variable driver, and the memory region splitting
in the DXE core that belongs to the properties table feature specified in
UEFI-2.5.

As discussed on the edk2-devel mailing list here:

http://thread.gmane.org/gmane.comp.bios.tianocore.devel/16088/focus=16109

it is up to the platform BDS to signal End-of-Dxe, since there may be
platform specific ordering constraints with respect to the signalling of
the event that are difficult to honor at the generic level.

(OvmfPkg specifics:)

(1) In OvmfPkg, we can't signal End-of-Dxe before PCI enumeration
    completes. According to the previous patch, that would trigger
    OvmfPkg/AcpiS3SaveDxe to save S3 state *before* the following chain of
    action happened:

    - PCI enumeration completes
    - ACPI tables are installed by OvmfPkg/AcpiPlatformDxe
    - the FACS table becomes available

    Since OvmfPkg/AcpiS3SaveDxe can only save S3 state once the FACS table
    is available, we must delay the End-of-Dxe signal until after PCI
    enumeration completes (ie. root bridges are connected).

(2) Pre-patch, S3Ready() in OvmfPkg/AcpiS3SaveDxe is entered from
    BdsLibBootViaBootOption()
    [IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c].

    After the patch, we enter S3Ready() earlier than that, by signaling
    End-of-Dxe in PlatformBdsPolicyBehavior(). The timing / location of
    this new call is correct as well, and the original call (that now
    becomes the chronologically second call) becomes a no-op: S3Ready() is
    protected against 2nd and later entries.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18035 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index de13c6b5c34a2ea7bb2af6eec6fbb744953ee008..ce299875cdd21f5a8642717746766a126bf96a7c 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1163,6 +1163,27 @@ Returns:
 }\r
 \r
 \r
+/**\r
+  Empty callback function executed when the EndOfDxe event group is signaled.\r
+\r
+  We only need this function because we'd like to signal EndOfDxe, and for that\r
+  we need to create an event, with a callback function.\r
+\r
+  @param[in] Event    Event whose notification function is being invoked.\r
+  @param[in] Context  The pointer to the notification function's context, which\r
+                      is implementation-dependent.\r
+**/\r
+STATIC\r
+VOID\r
+EFIAPI\r
+OnEndOfDxe (\r
+  IN EFI_EVENT Event,\r
+  IN VOID      *Context\r
+  )\r
+{\r
+}\r
+\r
+\r
 VOID\r
 EFIAPI\r
 PlatformBdsPolicyBehavior (\r
@@ -1197,12 +1218,28 @@ Returns:
 {\r
   EFI_STATUS                         Status;\r
   EFI_BOOT_MODE                      BootMode;\r
+  EFI_EVENT                          EndOfDxeEvent;\r
 \r
   DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior\n"));\r
 \r
   VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,\r
     ConnectRootBridge, NULL);\r
 \r
+  //\r
+  // We can't signal End-of-Dxe earlier than this. Namely, End-of-Dxe triggers\r
+  // the preparation of S3 system information. That logic has a hard dependency\r
+  // on the presence of the FACS ACPI table. Since our ACPI tables are only\r
+  // installed after PCI enumeration completes, we must not trigger the S3 save\r
+  // earlier, hence we can't signal End-of-Dxe earlier.\r
+  //\r
+  Status = gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, TPL_CALLBACK, OnEndOfDxe,\r
+                  NULL /* NotifyContext */, &gEfiEndOfDxeEventGroupGuid,\r
+                  &EndOfDxeEvent);\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->SignalEvent (EndOfDxeEvent);\r
+    gBS->CloseEvent (EndOfDxeEvent);\r
+  }\r
+\r
   if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {\r
     DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "\r
       "from disk since flash variables appear to be supported.\n"));\r

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
index e3e950e4ae09e2e75971e3abe3aed2a8b4cee501..b510178668d57c3ff128e586517a0e40d22dac46 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -59,6 +59,7 @@ Abstract:
 #include <Guid/Mps.h>\r
 #include <Guid/HobList.h>\r
 #include <Guid/GlobalVariable.h>\r
+#include <Guid/EventGroup.h>\r
 \r
 #include <OvmfPlatforms.h>\r
 \r

diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index ce2972013d782f4b6901e7f1e9c7df4a5d3358d3..c40871b673db469dc8913e1b0e148682f61e762d 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -65,3 +65,6 @@
 [Protocols]\r
   gEfiDecompressProtocolGuid\r
   gEfiPciRootBridgeIoProtocolGuid\r
+\r
+[Guids]\r
+  gEfiEndOfDxeEventGroupGuid\r