From nobody Tue Feb 10 15:01:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+93705+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+93705+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1663050184296309.8505650396006; Mon, 12 Sep 2022 23:23:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nlYTYY1788612xO3VFvD5Z2Y; Mon, 12 Sep 2022 23:23:03 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.113]) by mx.groups.io with SMTP id smtpd.web09.1735.1663050183096629696 for ; Mon, 12 Sep 2022 23:23:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tlu1yEzZXfgVmX427J/PIMuEs4/II49hMNZQDFvcZclE0uT/cPQ0ggPuc8zKa0yJvKNrYvenQL6sU6dZI88c+zhOmjBpytjEHhFUspq5wAxpdGWusjAw1ZEdhrOaXczP3zcrcv6F9uW38KR1C/O9VSi36YtNAV+lWiXI4LOsN3VO3vkz5GwaX7WO1319zxziM0q41mtX7CLnAOMzF38kPGUY4VLuBbL2DJLEgdHWv/+wPofKqI2HMQc/Z93rD25hUl1gz6XOaLwTfZ6hGoOEKzkI0FKo4bcK1dLtm2FggsDCHcEfeMpDj5pJFzveu8hPEAS9K0iS+CU+JDSqpwXdCw== 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=HbwTL1K4CPdyTtqNke06ojccfOHEFT8WRODSzd0IA+o=; b=ayOeKMb1IB34S+rhNBfwBpHvaacPCu6epJCMiGqCvKbfktZuYjP5E1m/KdrsHoZvRTmwu8gUjh3wRQV0awX1d7Vn+w7UgmMa2gmC82Lzr1AQPYBegOpmF/XHj/UP8ewRvgiAkWj6Bt7FIGG4e1qhCw2Z2SOeuF1UR1oY1KYbKDrmqvu8yA7TtZok+tnMqbhngd80rrVmb6WaRLO4ZlQx57rJocsyz1VYoMOgUbEXrPyC2a0xeMWCya6GdRQskIIbnlsQaIbwxHbhdBY8aNDMJ8P/0gikgbUxgStrYT/GZL2+vMOp3UVYt8TPCdpX1PXnd6AENPb4H9YEHsnfIpp/1g== 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 X-Received: from PH0PR01MB7287.prod.exchangelabs.com (2603:10b6:510:10a::21) by DM6PR01MB3644.prod.exchangelabs.com (2603:10b6:5:92::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Tue, 13 Sep 2022 06:22:59 +0000 X-Received: from PH0PR01MB7287.prod.exchangelabs.com ([fe80::fc6b:4f56:8f32:dfa5]) by PH0PR01MB7287.prod.exchangelabs.com ([fe80::fc6b:4f56:8f32:dfa5%4]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 06:22:59 +0000 From: "Nhi Pham via groups.io" To: devel@edk2.groups.io, quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, sami.mujawar@arm.com, quic_rcran@quicinc.com Cc: patches@amperecomputing.com, Minh Nguyen , Nhi Pham , Rebecca Cran , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 6/6] ArmPkg/SmbiosMiscDxe: Get SMBIOS information from OemMiscLib Date: Tue, 13 Sep 2022 13:19:47 +0700 Message-Id: <20220913061947.735951-7-nhi@os.amperecomputing.com> In-Reply-To: <20220913061947.735951-1-nhi@os.amperecomputing.com> References: <20220913061947.735951-1-nhi@os.amperecomputing.com> X-ClientProxiedBy: SG2PR06CA0194.apcprd06.prod.outlook.com (2603:1096:4:1::26) To PH0PR01MB7287.prod.exchangelabs.com (2603:10b6:510:10a::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR01MB7287:EE_|DM6PR01MB3644:EE_ X-MS-Office365-Filtering-Correlation-Id: 84bb68d3-727b-4b98-5539-08da95506752 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: pmZQ1axObUuTmMvSq3YYQVLwwR/0Bxt7X3qYiWR5+MkLrkeJGxe2/C605RekbMQRW+JMebqmeOBboQIwb7mthjcsdlbDn4r8cVSgKbqfZX1dY9LjWQl5Xk4uiatsfPIFCT6Uy0Pi6V/Sg+4UrCjHr36L8XzzLYtAEpxolsl5F/D2zYZU2Fs0QBn35RyZGeJe1vI7Z/thXVjDmlWg8sjW4OhZ5V6pe7No394HCqUNw0y9ISiww2TIqjiGkOO51itm5hsCm5R+F5fR3lQjazTKF+myLf5QTIzI/wSuBhYtaTFXmYCH/wS+7vpMHmcoWkLaHgPOx4E8p5YjaroSaN8deBLTA2tvOF64vOxt9BdcAatwF7UNvYtxUVpDeasHgdKDxGOsg8iBzriA4++SqB3OqxvDLMVfYZ5I3isMGXZxJtx6bwE8aPMkdrsKkg5W1Sh/7zHdpmpuBVpSsZW1rvRbmvXNNUnOZGwoEdGBK4VPPFUp0lUyYM7jryHaamGdlXmPEgU4PB3YRy7O/Qz0bOjE4t8AjOiwNXbVpG9GV66D/If3fD3AMLdRQ0eA56ySQoMNWrkPVo3xKGGm8efQRnCB++sD87MQpG3FiurjH1pK3qyOJTo+NxqADy9c9+hQf84rU6+aELzMOoPDtIDwe5T8onrTG+IEcEfAb42cUb54dt8jsXefTKj0d3SfH1G4gJS3QuuZba6JTZI1Xiod3ifLyxekgFMx8Jf+EN8449ED9lnM4dmrpfqlHOPMWjO+vKhG1hoEhkOqmC6bGfs0krc4CQTtjXyYM98oS8aWCA5uGmY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?u7iY2jrbzpHVyG3442rTeUz8bbCu7a9VJm6EhX/QgXl8Ftlh/fnXZOw+li/1?= =?us-ascii?Q?5JXGkVYV63hSEXOCIE0PAwOwXfOJmzoFKq9w0Ug+UMV2+7M6/b00DU3gqDeV?= =?us-ascii?Q?/5p7/3UfOULbKSQ2z39P0/fwMEB97ZtG57IxM5LKUZ+tKdO1/hDPCshfsJjb?= =?us-ascii?Q?uFc1t3xf1nOoLi+lZTapOBDqoGNTR/mxKDBHN1XPZmZiOMQe4UtSKlIYmCVO?= =?us-ascii?Q?QFZKTgaLFadLId1ojld7l5P+Dz19VTptxMGsVWtY1yxpKT6i4YL+mqJpqo4W?= =?us-ascii?Q?3893ll56QQHscMyvKhkGOve0p8M4uHKFZSnOEfhyxgZEvhty/Sms5rT/Zbyr?= =?us-ascii?Q?twC0AoIdtUNVtw2dy5GjYFnZGNTwIeM9hL7Leqwf2aRfWMwfTynqDgFxfy9q?= =?us-ascii?Q?4/MEzlLLg0ETsg+Gr2qlCc28qNbKxqnT5JQ/NLWswY+CHHR970w2f9eMWjhb?= =?us-ascii?Q?lm6VtpG6EKQgEBjOV9GCMMGImX+WxuIULgQtBnMrcdgtRJlGvh7xsHwZop36?= =?us-ascii?Q?GCboGJvj5uBd3bzhGqzq4mL7QyTxPewJXtiVe8ydc8yooHEsAOTNmUX65P0D?= =?us-ascii?Q?cTpeGK2BHbF8AeEp8DBPMsgR3gm/ETMPM8es9bcg+pPSxnNm71vqmLhIN0z0?= =?us-ascii?Q?V98OCufjNu0mm83y+vZl3NIXXEJOPRMc/Pxcl8evcY/okrW04XXaepIipc2Q?= =?us-ascii?Q?95aZADSV6fAvayOQQ9hgEkCgPFHEPHsky6V/lR8j37LTG4t5eXNdypQq4th/?= =?us-ascii?Q?c/3CxcfP4VLtpEfLRFtmaVUyPQWjs537tLA8IaubYSwvvTlIrq9iWpEZTCUV?= =?us-ascii?Q?dYaI/VDNgq6bU/NTmRmg+Br4vcBRWML0D3W6JabeSYiJIr9JBidUfrF5UFlR?= =?us-ascii?Q?544PyB0dGQbQDNdj5Zh2/ZUJRbLXxktIGb36Q8kR6OG5JD8VjTzJNJiLUam1?= =?us-ascii?Q?eZAP5HpgVbIgYbeIHTds/0dhtx2RsuRLwOtQAPFARj4Lxlaui9R6kAikS7lB?= =?us-ascii?Q?dNziy3VZdk1x8o0nFpRVMVXetfzJGHT9cL3qi5w3XuwzGEt4fVz6VIrH2JZs?= =?us-ascii?Q?gbn+ejxDYAmbeKqwYGAViFwkgDRBcion/rxupx+njjlFD3Z5wAQ/jnirUWJW?= =?us-ascii?Q?TZCkK99Ckl+3aM7zlRJXD9jJZQ7+NLhrdD0wrIj0OebQZAmH4KRrj05Sf9R8?= =?us-ascii?Q?+KSolMLQnU7xdOqHKj00P/85teRwwOKiruL0Eo+qot7OA4zBUNA6IljUh7lB?= =?us-ascii?Q?MbsUQMW19XW/EI8Hn+6ZZ9ec++97+zMCEXR3v4r6mMHP8Uyw/oE1Du/PPDmp?= =?us-ascii?Q?9yRWB4OUth4rhp4n8aX2vXIYdmU1NEolmHv3ITQ1UBDI8TBXCYDsokPl3dOr?= =?us-ascii?Q?iLvlYJoTE4xpYzjIlBPaM5DIrgAl+h8Oig70Akin+4vToaZePvSAaoqhgR+k?= =?us-ascii?Q?MPjt44oakLR4C24dSCttSxt9nqG3fyqNxvgnZBZ9piwcPG/2vigGx3z3PE74?= =?us-ascii?Q?OPLQKD/zJ1ifgFhLEbuVIOTnduM80QPlnnSBPFa4ON9SMa3O4S+lpFOEdzNu?= =?us-ascii?Q?vlZkxT97D1ui4YMYEFo0om2GgOLF9WHcwIkDc1vUKrsSLEtU3n9YU+NzgH6R?= =?us-ascii?Q?V+sykTU1A1uhslgLrd5qTYM=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84bb68d3-727b-4b98-5539-08da95506752 X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7287.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 06:22:59.2060 (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: wViyTtiQehV9NZdw4LLMKFQM2z8/sHGPJQyCK4gLtsl48dx0f5vAzzb1S9oOuoZgj1akHmLha8oqVO1dyLJ/4Kd24AZ143DZv3wT5n4Zpoo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB3644 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nhi@os.amperecomputing.com X-Gm-Message-State: 0iDHm6xrQvUCPS8fova878K1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050183; bh=4iOXn9Q+MgdBd5UtNNcyyR0tJ6lDyOE5UPapp2GX4PQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=UwZClgjmtEwymGI+G0pJ9QyVUv4P7u/09tz1+pP1jwLRQIQ2mlo/NzM4la19Ifxwtq3 fyYEHYydQbKGH2t6IMSDZPQTWhR835dPMp5uyGXbodshenYPDLm+pzYM9ZS3e0s3Q/qp1 MkTxyUDjiDxDTgaN7K1dsEVpHbGLaxgsghc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050184731100001 Content-Type: text/plain; charset="utf-8" From: Minh Nguyen In some scenarios, the information of Bios Version, Bios Release and Embedded Controller Firmware Release are fetched during UEFI booting. This patch supports updating those fields dynamically when the PCDs are empty. Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Include/Library/OemMiscLib.h | 21= +++++++++++++ ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c | 28= +++++++++++++++++ ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 32= +++++++++++++------- 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 1936619d9b5b..541274999e5c 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -37,6 +37,7 @@ typedef struct { } OEM_MISC_PROCESSOR_DATA; =20 typedef enum { + BiosVersionType00, ProductNameType01, SerialNumType01, UuidType01, @@ -247,4 +248,24 @@ OemGetSystemUuid ( OUT GUID *SystemUuid ); =20 +/** Fetches the BIOS release. + + @return The BIOS release. +**/ +UINT16 +EFIAPI +OemGetBiosRelease ( + VOID + ); + +/** Fetches the embedded controller firmware release. + + @return The embedded controller firmware release. +**/ +UINT16 +EFIAPI +OemGetEmbeddedControllerFirmwareRelease ( + VOID + ); + #endif // OEM_MISC_LIB_H_ diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/U= niversal/Smbios/OemMiscLibNull/OemMiscLib.c index 32f6d55c1a9a..788ccab9e8c1 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c @@ -254,3 +254,31 @@ OemGetSystemUuid ( ASSERT (FALSE); CopyGuid (SystemUuid, &gZeroGuid); } + +/** Fetches the BIOS release. + + @return The BIOS release. +**/ +UINT16 +EFIAPI +OemGetBiosRelease ( + VOID + ) +{ + ASSERT (FALSE); + return 0xFFFF; +} + +/** Fetches the embedded controller firmware release. + + @return The embedded controller firmware release. +**/ +UINT16 +EFIAPI +OemGetEmbeddedControllerFirmwareRelease ( + VOID + ) +{ + ASSERT (FALSE); + return 0xFFFF; +} diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFun= ction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFuncti= on.c index b49c4b754cab..e9106a8a2fec 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -1,5 +1,6 @@ /** @file =20 + Copyright (c) 2022, 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.
@@ -13,6 +14,7 @@ #include #include #include +#include #include #include =20 @@ -191,11 +193,11 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) { TokenToUpdate =3D STRING_TOKEN (STR_MISC_BIOS_VERSION); HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); } else { - Version =3D (CHAR16 *)PcdGetPtr (PcdFirmwareVersionString); - if (StrLen (Version) > 0) { - TokenToUpdate =3D STRING_TOKEN (STR_MISC_BIOS_VERSION); - HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); - } + OemUpdateSmbiosInfo ( + mSmbiosMiscHiiHandle, + STRING_TOKEN (STR_MISC_BIOS_VERSION), + BiosVersionType00 + ); } =20 Char16String =3D GetBiosReleaseDate (); @@ -251,13 +253,21 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) { } } =20 - SmbiosRecord->SystemBiosMajorRelease =3D (UINT8)(PcdGet16 (PcdSystemBios= Release) >> 8); - SmbiosRecord->SystemBiosMinorRelease =3D (UINT8)(PcdGet16 (PcdSystemBios= Release) & 0xFF); + if (PcdGet16 (PcdSystemBiosRelease) !=3D 0xFFFF) { + SmbiosRecord->SystemBiosMajorRelease =3D (UINT8)(PcdGet16 (PcdSystemBi= osRelease) >> 8); + SmbiosRecord->SystemBiosMinorRelease =3D (UINT8)(PcdGet16 (PcdSystemBi= osRelease) & 0xFF); + } else { + SmbiosRecord->SystemBiosMajorRelease =3D (UINT8)(OemGetBiosRelease () = >> 8); + SmbiosRecord->SystemBiosMinorRelease =3D (UINT8)(OemGetBiosRelease () = & 0xFF); + } =20 - SmbiosRecord->EmbeddedControllerFirmwareMajorRelease =3D (UINT16) - (PcdGet16 (PcdEmb= eddedControllerFirmwareRelease) >> 8); - SmbiosRecord->EmbeddedControllerFirmwareMinorRelease =3D (UINT16) - (PcdGet16 (PcdEmb= eddedControllerFirmwareRelease) & 0xFF); + if (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) !=3D 0xFFFF) { + SmbiosRecord->EmbeddedControllerFirmwareMajorRelease =3D (UINT16)(PcdG= et16 (PcdEmbeddedControllerFirmwareRelease) >> 8); + SmbiosRecord->EmbeddedControllerFirmwareMinorRelease =3D (UINT16)(PcdG= et16 (PcdEmbeddedControllerFirmwareRelease) & 0xFF); + } else { + SmbiosRecord->EmbeddedControllerFirmwareMajorRelease =3D (UINT16)(OemG= etEmbeddedControllerFirmwareRelease () >> 8); + SmbiosRecord->EmbeddedControllerFirmwareMinorRelease =3D (UINT16)(OemG= etEmbeddedControllerFirmwareRelease () & 0xFF); + } =20 OptionalStrStart =3D (CHAR8 *)(SmbiosRecord + 1); UnicodeStrToAsciiStrS (Vendor, OptionalStrStart, VendorStrLen + 1); --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#93705): https://edk2.groups.io/g/devel/message/93705 Mute This Topic: https://groups.io/mt/93650292/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-