OvmfPkg: PlatformPei: set SMBIOS entry point version dynamically

Git commit 54753b60 (SVN r16870), "MdeModulePkg: Update SMBIOS revision to
3.0." changed PcdSmbiosVersion from 0x0208 to 0x0300. This controls the
version number of the SMBIOS entry point table (and other things) that
"MdeModulePkg/Universal/SmbiosDxe" installs.

Alas, this change breaks older Linux guests, like RHEL-6 (up to RHEL-6.7);
those are limited to 2.x (both in the guest kernel firmware driver, and in
the dmidecode utility). The SMBIOS 3.0 entry point has a different GUID --
defined in UEFI 2.5 -- pointing to it in the UEFI Configuration Table, and
guest kernels that lack upstream kernel commit e1ccbbc9d5 don't recognize
it.

The v2.1.0+ machine types of QEMU generate SMBIOS payload for the firmware
to install. The payload includes the entry point table ("anchor" table).
OvmfPkg/SmbiosPlatformDxe cannot install the anchor table (because that is
the jurisdiction of the generic "MdeModulePkg/Universal/SmbiosDxe"
driver); however, we can parse the entry point version from QEMU's anchor
table, and instruct "MdeModulePkg/Universal/SmbiosDxe" to adhere to that
version.

On machine types older than v2.1.0, the feature is not available, but
then, should anything in OVMF install SMBIOS tables, version 2.8 is simply
safer / more widely supported than 3.0 -- hence the default 2.8 value for
the dynamic PCD.

We set the PCD in PlatformPei (when not on the S3 resume path), because
that's an easy and certain way to set the PCD before a DXE driver reads
it. This follows the example of PcdEmuVariableNvStoreReserved (which is
read by EmuVariableFvbRuntimeDxe).

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1232876
Cc: Gabriel Somlo <somlo@cmu.edu>
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>
Acked-by: Gabriel Somlo <somlo@cmu.edu>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17676 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 47 insertions, 0 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 9f015f1aae..6342b5c306 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -357,6 +357,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208

+

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform.

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 2dc92047ef..f1230bf5a7 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -363,6 +363,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208

+

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform.

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 48a7a8d2e9..e5fc90d2e6 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -362,6 +362,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640

   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208

+

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform.

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 1ad5bfc26a..2105787961 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -32,9 +32,11 @@
 #include <Library/PeiServicesLib.h>

 #include <Library/QemuFwCfgLib.h>

 #include <Library/ResourcePublicationLib.h>

+#include <Library/BaseMemoryLib.h>

 #include <Guid/MemoryTypeInformation.h>

 #include <Ppi/MasterBootMode.h>

 #include <IndustryStandard/Pci22.h>

+#include <IndustryStandard/SmBios.h>

 #include <OvmfPlatforms.h>

 

 #include "Platform.h"

@@ -378,6 +380,41 @@ DebugDumpCmos (
 

 

 /**

+  Set the SMBIOS entry point version for the generic SmbiosDxe driver.

+**/

+STATIC

+VOID

+SmbiosVersionInitialization (

+  VOID

+  )

+{

+  FIRMWARE_CONFIG_ITEM     Anchor;

+  UINTN                    AnchorSize;

+  SMBIOS_TABLE_ENTRY_POINT QemuAnchor;

+  UINT16                   SmbiosVersion;

+

+  if (RETURN_ERROR (QemuFwCfgFindFile ("etc/smbios/smbios-anchor", &Anchor,

+                      &AnchorSize)) ||

+      AnchorSize != sizeof QemuAnchor) {

+    return;

+  }

+

+  QemuFwCfgSelectItem (Anchor);

+  QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);

+  if (CompareMem (QemuAnchor.AnchorString, "_SM_", 4) != 0 ||

+      CompareMem (QemuAnchor.IntermediateAnchorString, "_DMI_", 5) != 0) {

+    return;

+  }

+

+  SmbiosVersion = (UINT16)(QemuAnchor.MajorVersion << 8 |

+                           QemuAnchor.MinorVersion);

+  DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,

+    SmbiosVersion));

+  PcdSet16 (PcdSmbiosVersion, SmbiosVersion);

+}

+

+

+/**

   Perform Platform PEI initialization.

 

   @param  FileHandle      Handle of the file being invoked.

@@ -426,6 +463,8 @@ InitializePlatform (
     PeiFvInitialization ();

 

     MemMapInitialization ();

+

+    SmbiosVersionInitialization ();

   }

 

   MiscInitialization ();

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 0307bca913..721495b874 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -58,6 +58,7 @@
   QemuFwCfgLib

   MtrrLib

   PcdLib

+  BaseMemoryLib

 

 [Pcd]

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase

@@ -81,6 +82,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion

   gUefiCpuPkgTokenSpaceGuid.PcdCpuLocalApicBaseAddress

 

 [Ppis]