ArmPkg/SmbiosMiscDxe: Adjust the priority of getting firmware version

The BIOS Firmware Version in the SMBIOS Type 0 can be fetched from
the fixed PcdFirmwareVersionString or platform specific OemMiscLib.
In fact, the support from OemMiscLib comes into play when the firmware
version may be modified at boot time for extended information.
Therefore, the priority of getting the version from OemMiscLib should
be higher.

In case there is no modification in the OemMiscLib, we have to keep
HII string STR_MISC_BIOS_VERSION empty or 'Not Specified'
to indicate that the firmware version should be fetched from
the PcdFirmwareVersionString.

Signed-off-by: Tinh Nguyen <tinhnguyen@os.amperecomputing.com>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
index 66ead22a6e2ce69d938fd77fb70355e151db2b9e..c9f25b7502540bb5757ef97dd5a099f20d15ab07 100644 (file)
--- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2022, Ampere Computing LLC. All rights reserved.<BR>\r
+  Copyright (c) 2022 - 2023, Ampere Computing LLC. All rights reserved.<BR>\r
   Copyright (c) 2021, NUVIA Inc. All rights reserved.<BR>\r
   Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>\r
@@ -124,22 +124,47 @@ GetBiosReleaseDate (
   return ReleaseDate;\r
 }\r
 \r
-/**\r
-  Fetches the firmware ('BIOS') version from the\r
-  FirmwareVersionInfo HOB.\r
+/**  Fetches the Firmware version string for SMBIOS type 0\r
+\r
+  This function first acquires the firmware version string from OemMiscLib;\r
+  if it is invalid, PcdFirmwareVersionString is used as a fallback,\r
+  and then sets it in SMBIOS type 0.\r
 \r
-  @return The version as a UTF-16 string\r
 **/\r
-CHAR16 *\r
-GetBiosVersion (\r
+VOID\r
+SetBiosVersion (\r
   VOID\r
   )\r
 {\r
-  CHAR16  *ReleaseString;\r
-\r
-  ReleaseString = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString);\r
-\r
-  return ReleaseString;\r
+  CHAR16         *DefaultVersionString;\r
+  CHAR16         *Version;\r
+  EFI_STRING_ID  TokenToUpdate;\r
+\r
+  DefaultVersionString = HiiGetString (\r
+                           mSmbiosMiscHiiHandle,\r
+                           STRING_TOKEN (STR_MISC_BIOS_VERSION),\r
+                           NULL\r
+                           );\r
+\r
+  OemUpdateSmbiosInfo (\r
+    mSmbiosMiscHiiHandle,\r
+    STRING_TOKEN (STR_MISC_BIOS_VERSION),\r
+    BiosVersionType00\r
+    );\r
+\r
+  Version = HiiGetString (\r
+              mSmbiosMiscHiiHandle,\r
+              STRING_TOKEN (STR_MISC_BIOS_VERSION),\r
+              NULL\r
+              );\r
+\r
+  if (((StrCmp (Version, DefaultVersionString) == 0) || (StrLen (Version) == 0))) {\r
+    Version = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString);\r
+    if (StrLen (Version) > 0) {\r
+      TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION);\r
+      HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL);\r
+    }\r
+  }\r
 }\r
 \r
 /**\r
@@ -187,18 +212,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) {
     HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Vendor, NULL);\r
   }\r
 \r
-  Version = GetBiosVersion ();\r
-\r
-  if (StrLen (Version) > 0) {\r
-    TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION);\r
-    HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL);\r
-  } else {\r
-    OemUpdateSmbiosInfo (\r
-      mSmbiosMiscHiiHandle,\r
-      STRING_TOKEN (STR_MISC_BIOS_VERSION),\r
-      BiosVersionType00\r
-      );\r
-  }\r
+  SetBiosVersion ();\r
 \r
   Char16String = GetBiosReleaseDate ();\r
   if (StrLen (Char16String) > 0) {\r