From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.115]) by mx.groups.io with SMTP id smtpd.web10.9054.1679301273463765194 for ; Mon, 20 Mar 2023 01:34:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@os.amperecomputing.com header.s=selector2 header.b=MB5FsfOE; spf=pass (domain: os.amperecomputing.com, ip: 40.107.101.115, mailfrom: tinhnguyen@os.amperecomputing.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DQBRErZt7gCEIy6ypexHvf1Nw04y1NGN8b3sAa0dP9As/V8khCBNMJES3/RvoKoDWPguuuGlY0rmVjkEqtpIA0zsHeeryuylQiVH/RYiWm10/RGp50BTWACp8AC8iBiOFmty1D2pEF9/18n3V9mRTElOqrFoApT3K6Kpgn3TE6EetkS/jHjH13If8vAZUunw8cYtbr0KiCnSAgTmXn/8hRkqhBAjMrI1WwM397uAnT/DA+fp/mub/6nIVLzg9CVCrXKPXvuKob9RV31Dy/6MCXdI3D6f4VOG5wk76gfgH1l4J6VUW603BKhcDKqZUM9m4r0X3499k6LV/BmropkRmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8UYV+PIE3uQGOxUqC+6wdfH0COhHtZun8zTEQnoqonk=; b=NL1YIgaxtnoTFeDhbB5gm/TNsFVYc89TRqIIMmKAsapdZV2WsP+xp7sfum2sCgNG6buB0iClHl6TynP5iOlBgSC4lEAewXYAgHk1Vh066chiAW9srB75VWzPF6jErJbWWuHkbSrVC41y241JP3/5uizXxT/4y0VKo39W9Ajp2iSJ/RYRxShTR6+htOheBICCxyYOKQA9Wh27nvO9FkAhlUigWe5u2Iv6x3zIKLI60xaUGYmNw1yy6gZS/jvRJTBOR6yLs93/okBJD2qrDyZuIvPc0VzcN3x1/hkFRvI+jppVFlNcybFEw0kl9jlkNjnSfReuMHj/VcZR0hUbhZbkEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8UYV+PIE3uQGOxUqC+6wdfH0COhHtZun8zTEQnoqonk=; b=MB5FsfOEtz24mgl6gyUfEyTbbeidmteegKmX4schkyyjgslCE0KqCs9r5pOtGDS2jZs0ZU59vb1KGGEZxfDNSWbsIcEj9VNGCU28u2k5mDfF1o9lrhWz7baR81Rk69xRGGGmeJ+EB3Zf6tQ6nu4V8aZbcZe0Wm2ZJH7L/Y+J6Wg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from PH0PR01MB7506.prod.exchangelabs.com (2603:10b6:510:f5::22) by DM6PR01MB3900.prod.exchangelabs.com (2603:10b6:5:83::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 08:34:29 +0000 Received: from PH0PR01MB7506.prod.exchangelabs.com ([fe80::db61:2d8e:771e:7e33]) by PH0PR01MB7506.prod.exchangelabs.com ([fe80::db61:2d8e:771e:7e33%5]) with mapi id 15.20.6222.008; Mon, 20 Mar 2023 08:34:28 +0000 From: "Tinh Nguyen" To: devel@edk2.groups.io CC: patches@amperecomputing.com, quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, nhi@os.amperecomputing.com, rebecca@bsdio.com, Tinh Nguyen Subject: [PATCH v2 1/1] ArmPkg/SmbiosMiscDxe: Adjust the priority of getting firmware version Date: Mon, 20 Mar 2023 15:33:02 +0700 Message-ID: <20230320083302.1035934-1-tinhnguyen@os.amperecomputing.com> X-Mailer: git-send-email 2.39.2 X-ClientProxiedBy: SI2PR01CA0050.apcprd01.prod.exchangelabs.com (2603:1096:4:193::21) To PH0PR01MB7506.prod.exchangelabs.com (2603:10b6:510:f5::22) Return-Path: tinhnguyen@os.amperecomputing.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR01MB7506:EE_|DM6PR01MB3900:EE_ X-MS-Office365-Filtering-Correlation-Id: 78cdc968-b6d5-4eb4-707f-08db291deb77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yHieF0EyyuwSR5hsi/f1nFW8FKQ6/O5EOyrOo/WsN+XNGFuskAOiDPvuxoJrJvpIEt5wEgrZqCTRcKP6Q3AUHd6J8r29v2oIurcWvAIwSTDRWTXhDnTj8KLpIJJ1wthIVEzzxisYuqSEGkpKoShpTmnvrFpMxTEPjD09DUWOtHSCPiXD/hzINJU+sOh+RO2fQY0oZjqiMMKfZcQIwos7S2tDL+TbFFZ1QbjokNZzFxK47wfNvKDUAGVgtVos5WGDyoXTKd+1ynTD9u55qBxmHA+csopEo5ZHNLTrhHtxo0oTLg/+CxfGM1mSIt5+vT1IhsWf3ja4nE2R1RqgFbj5lddcHYXSacSnhT0P33JYl1WJHpxfEA0j3O4B1ffQTeWy+AEew/pSSaOn1hHhHFLEH4Jsz41iuqouKfugkSnc6g7v9spLQPwZneCo3Ra5ZzS5wopxufTaXxmy9fQ2uRcSGbAqr9cWP1BP/HHjiVIbZ6hkq3uttZlclW9nkVLUp1VMK3F82wzW+bYk3bvhlzZ86HLWVcWPtljP8SA5oNIF34wsqOH1KX5jAkBOqGug9MMVG6l0RS1SU+pPMWwcDCCcttpTXHFsg8fXK/HEYCLqPnUV2UI+e6aRAlzc4kNBMyHDGiiHt4YE7/Dn9gltuM09L1lrM/C5bhlpwuPHTKW5n0udKfrqNi80SquTS+HMe9JY3CxNIjl1qHn5atE67bL4MA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR01MB7506.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(136003)(366004)(396003)(346002)(39840400004)(451199018)(2616005)(83380400001)(316002)(478600001)(6486002)(6512007)(6506007)(52116002)(26005)(107886003)(1076003)(6666004)(186003)(5660300002)(66946007)(66556008)(38350700002)(86362001)(38100700002)(2906002)(8936002)(4326008)(6916009)(66476007)(8676002)(41300700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i+RQlX6+CLtUamX5bZ9/YyT6pxuiAZGnAd2ZnETAotvaquXSXXGgxTxH4Vph?= =?us-ascii?Q?LEXIJkitK+E81wusyeJxQ7edrVXC+C0LbTpqjkCBuKG2V+UFec4XzTcS13r/?= =?us-ascii?Q?3nPF31CN+2GH5fnBXO+7OZKivv9vfQ0PnqgKNRNgLTUCFcD+n5Y4gjp+L0fv?= =?us-ascii?Q?QNse88DF0qoYxvrA3eI8X7PRsEO2iZNjsus+bCB5IxRq2ZjFZ8rxjQ9kM5eg?= =?us-ascii?Q?cIW1NkipanjYJZ3Uq198e+nonpK+SmEeqPxLOhX1Lq1mXsOEwZFHeaJof47B?= =?us-ascii?Q?MvoLt7YyLs6EDpqxuxXp7lBcy+Yr0gXhqEdjXWRa2HmL6ck/P4FJ9oFRUOB1?= =?us-ascii?Q?4L74mtx1JozEu3GmAw4QcZgKfuQbX/TNM8D+Z9bYhZbu0D0YaXzqVpOach4p?= =?us-ascii?Q?dBCGWY7Soaz7pyEtv6AqF+RLiZ6OaFuhLMJYx/ETFDI/4NwZTn1V2ANs0PJV?= =?us-ascii?Q?M5HuZUkkkLY31zmno/j2mlIZyDkc18909fZayfCVvLm3WkfSHzBKzZqX+1ft?= =?us-ascii?Q?BJNgCzhcaBuDvbqq0EmsQeSHKKsb6UjK6Buvr7iXd1/ZRKzI4hFQ2bowkDw7?= =?us-ascii?Q?UrUekwP3KzpK+JY/UF9brHWHuAJHLNlo0iA3l8Yq87hPKMqQT7fD39jvWQ4S?= =?us-ascii?Q?BbODVkoe1uFUkgtxS1sJr+X6l52xx/XOilhal7b6UHUP6W5PXoYKsxEkEIef?= =?us-ascii?Q?KayDrB5PKOBmjlOeEjGXH1HRpK/saXsJT/7XwA6ijN2YVrMLO50JyzAgYrGo?= =?us-ascii?Q?Xda2Ja78RRXsspT4zmWJSStl5Lobi8d4jeZnxS3cPfBsAlMgqNWbP5Bz7+YO?= =?us-ascii?Q?GYDQd3dwgd6wK/ij8uG3GnEbdxZ7icFiXBm5Gk7Okwn6cMOMkU5+bSXO7Mds?= =?us-ascii?Q?V/Ert0x6erJPkEcS4NmIKxQSoEcAtIp7pdEV7sqln+M5Bq5yFrV08juV9B9c?= =?us-ascii?Q?DItzj8KqKXSkzbZzkqo/ZpU0+RH5YfwdjVfU3PEcqE5bnjMq23yRGnaLmiWT?= =?us-ascii?Q?41We4qNAepsDItF3ljaNBbZFVjaZpeQydKkHyjTaucDagMclterNOicfg3K5?= =?us-ascii?Q?hFyjR1UGRnIXLdxSKbFEZ8sZKko5fUUw8v+irG/hyH4fHXmWaXRH6CsxcPRw?= =?us-ascii?Q?ugn2+B905lMjjkd0Cv1gIF5x1r+YsoJpBTAsHadCf4iW6Nx1AFVdvRkIl7MM?= =?us-ascii?Q?aiiHct3AHYFYP2aEDRT2X2VnkFAf2bHk/k1KmT2N9NDX90AD08G484hzd84L?= =?us-ascii?Q?ulUShOKfVE+AL3joZEZ0nF7j1wnSg9xbxdlUwebvE2ZDWT1wRvmuyvd+0mgt?= =?us-ascii?Q?T1/5uBNoDRdSGGWzAhNBG1jdxbmM8KDpUwwbMIGa5GMggATeUfRRYeY8vrAv?= =?us-ascii?Q?hae2NaEktlQN51gBs1aUSpDl49XtL9ehorDlin5dZwMpH42ZLzFqrock/JDU?= =?us-ascii?Q?9GUwYfeXJD0Ua4zSASVnIYyZSsXRrm1FmmxUOPUom7vV/usb5mPU5D0Zodsh?= =?us-ascii?Q?KYoZkPoc/Eh7UkVEdqhjDeYJsB42LE21uQsayEzdv1aTZ0W51QfQlS8C51iv?= =?us-ascii?Q?9r0ya67dRq84l8XIuTwPk0/JFifkzqm4kSU2FASbg1L0JLuCXcmNdZXzY5QE?= =?us-ascii?Q?881UvqgHcf6w5ngb3IJPor+1WOXlR7r1J8oWnqEmWKqs?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78cdc968-b6d5-4eb4-707f-08db291deb77 X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7506.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 08:34:28.6915 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: teQFrIJSzfUJt9CpmNQFGYnAo1aN8VAE4W1Mkite9Pgi8PE9EcDJqpSTpbynCeJHE37J1IwaQx+Uj65k9wmjfbTIrHbeC2klt1D4t4FHpUpq/pj5Cbml+3/djxLV6jky X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB3900 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain 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 --- Changes since v1: + Change GetBiosVersion () to SetBiosVersion () and move the selection lo= gic fully into SetBiosVersion (). ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 58= ++++++++++++-------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFun= ction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFuncti= on.c index 66ead22a6e2c..01cf4dd16c4f 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2022, Ampere Computing LLC. All rights reserved.
+ Copyright (c) 2022 - 2023, Ampere Computing LLC. All rights reserved. Copyright (c) 2021, NUVIA Inc. All rights reserved.
Copyright (c) 2009, Intel Corporation. All rights reserved.
Copyright (c) 2015, Hisilicon Limited. All rights reserved.
@@ -124,22 +124,47 @@ GetBiosReleaseDate ( return ReleaseDate; } =20 -/** - Fetches the firmware ('BIOS') version from the - FirmwareVersionInfo HOB. +/** Fetches the Firmware version string for SMBIOS type 0 =20 - @return The version as a UTF-16 string + This function get the Firmware version string from OemMiscLib first, + if it is invalid then PcdFirmwareVersionString is used as a fallback. + + @retval VOID **/ -CHAR16 * -GetBiosVersion ( +VOID +SetBiosVersion ( VOID ) { - CHAR16 *ReleaseString; + CHAR16 *DefaultVersionString; + CHAR16 *Version; + EFI_STRING_ID TokenToUpdate; =20 - ReleaseString =3D (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString); + DefaultVersionString =3D HiiGetString ( + mSmbiosMiscHiiHandle, + STRING_TOKEN (STR_MISC_BIOS_VERSION), + NULL + ); =20 - return ReleaseString; + OemUpdateSmbiosInfo ( + mSmbiosMiscHiiHandle, + STRING_TOKEN (STR_MISC_BIOS_VERSION), + BiosVersionType00 + ); + + Version =3D HiiGetString ( + mSmbiosMiscHiiHandle, + STRING_TOKEN (STR_MISC_BIOS_VERSION), + NULL + ); + + if (((StrCmp (Version, DefaultVersionString) =3D=3D 0) || (StrLen (Versi= on) =3D=3D 0))) { + Version =3D (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString); + if (StrLen (Version) > 0) { + TokenToUpdate =3D STRING_TOKEN (STR_MISC_BIOS_VERSION); + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); + } + } } =20 /** @@ -187,18 +212,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) { HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Vendor, NULL); } =20 - Version =3D GetBiosVersion (); - - if (StrLen (Version) > 0) { - TokenToUpdate =3D STRING_TOKEN (STR_MISC_BIOS_VERSION); - HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); - } else { - OemUpdateSmbiosInfo ( - mSmbiosMiscHiiHandle, - STRING_TOKEN (STR_MISC_BIOS_VERSION), - BiosVersionType00 - ); - } + SetBiosVersion (); =20 Char16String =3D GetBiosReleaseDate (); if (StrLen (Char16String) > 0) { -- 2.39.2