From nobody Thu May 9 14:38:54 2024 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+93700+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+93700+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 1663050167511415.6229046916101; Mon, 12 Sep 2022 23:22:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id t7sbYY1788612xL85FEjFdt8; Mon, 12 Sep 2022 23:22:47 -0700 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.96]) by mx.groups.io with SMTP id smtpd.web12.1670.1663050166495091101 for ; Mon, 12 Sep 2022 23:22:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Po1iLV3eQ42KGogrsSNtxrlhFsf1TnDgvwxMGnWHxslvtZCp/viDxtJL2wVCPFh01YIYJh13PEiAJ1QDDPJK86rKmF1Q4XISqQ64dQQN2JIeMC/Ks46HDwmV9lnZseWEQerTCJp7YQhbKf8GDulAjbzCgCyXs8umj/9HSq76GIhqf2PjLIHJ/tVkr0KkVf7M+Afn9yxHxo2KD+Ue1RBxDDhGnTSsPSu+9zpAlPjEBDPSkk2SeznKA9PVpulegplNytvk5C6fqE9gif22tbK7YSXZLqP28779Jr0WbcdSKgDdeogHB0pt8W1RNSWTSQY/kbGj8Hdo0Ym1l6mfJGqKxg== 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=q71BDSLAKgQbysV2TLhvR33Qf+5f6rYWyAKlEyJ1L+M=; b=jT2lMxwytfoVMpelmnprkiXVIYfSM5mYnta1PGrnPGN5ZtGiOc1SfqpyHgM8XU/IZaQ70koDM8753QJk9GEspRTkePlhFkkNOO/rmuWRLnmI6rPalwnpO52U0/Zoo8IgneEyiHlbXgkb7P3tzZc5ZDdKrOP6azx70m1D1dPw3ccSCr9nW9GX5MhfRxd4cs64oYqASiZ+4QjV2D3jRujESdQemReIC3hHGEihmYxydSwGgiNHqAc9TP6F7BnPrLswZdloKQhYRCDrvOLZIPz6i9a+eYNfWWcJGJy35c7Pqr7SMkV3R8Ezj2/UkT4r10e2wQGQOgBFQSnphUg7oamj7Q== 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 MN2PR01MB5854.prod.exchangelabs.com (2603:10b6:208:195::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 06:22:43 +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:43 +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 1/6] ArmPkg/ProcessorSubClassDxe: Get processor version from OemMiscLib Date: Tue, 13 Sep 2022 13:19:42 +0700 Message-Id: <20220913061947.735951-2-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_|MN2PR01MB5854:EE_ X-MS-Office365-Filtering-Correlation-Id: c8cb99bd-c959-4779-0bd9-08da95505d40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 8RC67Tk0TWx8D6z5AbglE4XDNLF2IIs8+lyhIBRK+hp9VY3Wh0uxC1Tc2UmhTQzk+TqSi1md7TP0tfRfdVzyLGVhNFBbwoilNyctCVg76U+6UvGGJ/mbXW8J8W7g9O6+M2Tf61OGvMRnaGE1voYh67EjzAJVVipsSGQFSTFChrumFAuHizu4fB7zsDOl3cDqIq0mFRSuXwYad8Jm6fYc55YnJhiKZdchGE0KiBTaYZGwcLWoup94s+uRL4NFS1LOPIHnPStbtiJwDThDcJO8YysIwvvqDKrkF4OMvg4Uu54ZQY6s32rjISkOnBDPqCf2QIjH0ADiTFVL2mog2z6wtB/5+BLpsznuNnv620+lCngyRh/dJIaO5If3WZml4NqEWR9g9N0+vRshxhCe6fNvtIK8zeD8fNs6mkW3ACsp7oGUXHJw+9ouoptRQMKdfuABg1xhDz8cmO0OHsOo+T6jRpNbS08e4WQzBEjCVlINlx2d1ZW9IxNOHKX45K8TtpZjGn+8WYPJ+E1PwsNAzLAdJepnS6zJqWeFOJPdTLx4H/HK2CKYs1tP/07uDWq4ctSqoBkeLOwI6P6zuLAujJvgoy1IebOXR4G4VRGEOlVaYpR1NFwesMngbnvKdVq/9ovRdy2pIFAi4DYHTq+zk6tyD/U/kQJ/0UrFEY4IW9HyF8Wy/f3tP7X53KWHEcTcI+i2EtBigcuCN41B/YQDI0S4WliBw6kSr+WQvJNsKIIJYI1hsWzCILJywQWfczTyyjn7I0O8iBAfJt9ckjI1wzkCZQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aZUE2u+rB3wjILEsJW7oSrNdegLN18KKFUM67lneoShfEWzl0xUYIlo66sGq?= =?us-ascii?Q?/vfYRf6nCMUO8nO/sJIZtXuDl3VNnnitoY035qyqsMdl1/UgmWfNssNiq0i1?= =?us-ascii?Q?HbmU5dzCHsRoi7Yn8JaEKwLUvlRWatbKjD333b/gYfxZFzf9oLvPcW4DpDdi?= =?us-ascii?Q?ra6H+BIrjnnFXRuveQZMBqJ/qYZMsZtaQEXyFH+dTOH9bmF62RFggHLzBnX8?= =?us-ascii?Q?KB7SX412VvhCoPfPCVdAEf7YzqeagRNletD+OuWI3gm0sw3GE/ZwS0oSxp4O?= =?us-ascii?Q?PbSSLExxdlUdYhbw5xdADX4p7mIVVLrfvfByQG4qJ8QzHw7lwiy7CW49/kee?= =?us-ascii?Q?VKs8gjZwqXCrG0lbESmoIpxLkHTPdDDsZ3+pesYSuasXg+QTRSHIYXnDoWrA?= =?us-ascii?Q?e9Kd2wgOHEMfzbD51mHN/7Vg3raNuiemhjkz7yljPJ+uaqv8UXFEzGkV8j/3?= =?us-ascii?Q?CU7MIJvz+pTH/XD70DLsgCMmsOQVo71Cb3fNjhPRgm3LVVfgXFuIkx02PX7T?= =?us-ascii?Q?DzS6JMHFhJWa+my3oAqPNZ67XjEIlsI1zDDHZhyQWzFqwjlHYZECGqmCrnIk?= =?us-ascii?Q?ZX5XMQYaPapsbRMsN6csIQehuc7rkBsX8jO4DJIGJA7k2RAjPZ8WJcHryM/f?= =?us-ascii?Q?5IlqWYDxM1g3TyT5Ec5U+u/TO5ufNmQRQVJCXbP+5WsrpZTVtFceqwpUe+qu?= =?us-ascii?Q?+XQGMF2Uqjj+XUtPPw3ykGioZ+r1yv44BexhE7CoJwczh0YPQzrvDhIxmrOm?= =?us-ascii?Q?wNtIwmtzbRzJbhcG7Y808hkTpByU4RuDzNX3Y/zO56TAYfVEW5Z9WGemGXLT?= =?us-ascii?Q?jqegJZhGqgX7W8a50TZhhXTpz5PhlciN+tUw/RK0KBw9PdN6CBsE9Qw4R9wt?= =?us-ascii?Q?Mr8vir9d/vaWSJdSE0Oeb7iFmjHWFBFoBjWB+h1/lpk0sZdQsOCbRI0yZ74l?= =?us-ascii?Q?Kkpi2KkVQCUqktRDpOpBH/vpbnc7oXqiOjA9T5Jd+BnONhnU+rrVEGp+H+BO?= =?us-ascii?Q?BWEkEpdD5iEwtqYz8YepXSPMkw/2doKZZtIW3smdnsW5zOpqG8s8WhMXM1hw?= =?us-ascii?Q?4HzQpY3wXcahl1zCyjLie6C0hqJuYTiBJIzn1qRuYRi0tXkJHOaJmiHLmM8A?= =?us-ascii?Q?0l1NBHRtIxbbc3RDNPlYaWYPAVmRyxIxfhmgF7x/rE5dteaNKcRih/nuIxQ+?= =?us-ascii?Q?9ZPDEO8uUnp5txS8z81Jd9nTCVLRA+Ek2e0fM/kxfrY5p+6rtbkNGUxqphYK?= =?us-ascii?Q?lUBueLByImcaimWWc4udNYlo4Ozl3na2S3uVDehph7GpyOTDQ72U8EfyAucN?= =?us-ascii?Q?TQRF69fTdz5hsjQfjbKeFe1+5B3WOFpsBymq4CiQKd2b6a2KP7oRrzASv0c5?= =?us-ascii?Q?CUNdOr3O7ZyDYyJH3HoxwQbai3LQopYOl4cT7W5Cts0eda8nmXA5PhSAfP9g?= =?us-ascii?Q?MK3LUXUmRjAWGnv4/n4av0sRYfZw/DLJIA0mvFnUa80WFVOTst4kfP2S3roz?= =?us-ascii?Q?uadm4MBrt7B3urRXVT++KL4Go/L3SNDQC4Zn7nngvs0IFEgen90gcWtPf7Gu?= =?us-ascii?Q?RhK59413ahXIEXtCuupq55hehzU8FFfnRNzZe2nlTa1OUf0i9Y5QszWY1R/3?= =?us-ascii?Q?eclLswmPPRYPCdrhZk8eDYA=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8cb99bd-c959-4779-0bd9-08da95505d40 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:43.1370 (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: 9dp91L6nP1xsgiZaWrVTbe50a0Epaw4vdOraI88jWYXPNwSAATUlngUng+rs9gsqAL0tk359DdXEBzBuavsWMPa+Ov5TgpTq0I19xQ7QcAk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR01MB5854 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: 1RRkPsjRGEhi7Nc3FDe2QzfLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050167; bh=tlQhrzeynLfSBXhtkbEIQcJgQvTeFq53hBPIHCxfHrU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=NifqSrFMB+kD+n7oj2JgRXyvFKkgR/XIgcOF0dxjJCJSNLNWTVnJaee02V0WvLbo36q uHPLamSwoDFhLawgJIit6V4A+TKlMS2P7nUTL14RDvta7rj0QiHBeTw9MYra5tWwXAplY 1m4L2aIig1iw4R+yVCA0HVq0XX/3yt/6r/s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050168629100001 Content-Type: text/plain; charset="utf-8" From: Minh Nguyen In some scenarios, the processor version may be updated dynamically from pre-UEFI firmware during booting. But the processor version is fixed with PCD (PcdProcessorVersion), so it can not be updated it dynamically. This patch will support setting that value both statically and dynamically. Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Include/Library/OemMiscLib.h | 2 ++ ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c | 8 +++++= ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 47cb30d84a62..330bb4b014de 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -1,5 +1,6 @@ /** @file * +* Copyright (c) 2022, Ampere Computing LLC. All rights reserved. * Copyright (c) 2021, NUVIA Inc. All rights reserved. * Copyright (c) 2015, Hisilicon Limited. All rights reserved. * Copyright (c) 2015, Linaro Limited. All rights reserved. @@ -58,6 +59,7 @@ typedef enum { SkuNumberType03, ProcessorPartNumType04, ProcessorSerialNumType04, + ProcessorVersionType04, SmbiosHiiStringFieldMax } OEM_MISC_SMBIOS_HII_STRING_FIELD; =20 diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass= .c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c index 0b9af9bd7e1c..3b12e26abf6e 100644 --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c @@ -1,6 +1,7 @@ /** @file ProcessorSubClass.c =20 + Copyright (c) 2022, Ampere Computing LLC. All rights reserved. Copyright (c) 2021, NUVIA Inc. All rights reserved.
Copyright (c) 2015, Hisilicon Limited. All rights reserved. Copyright (c) 2015, Linaro Limited. All rights reserved. @@ -512,7 +513,6 @@ AllocateType4AndSetProcessorInformationStrings ( PartNumber =3D STRING_TOKEN (STR_PROCESSOR_PART_NUMBER); =20 SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorManufacturer, ProcessorManu= ); - SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorVersion, ProcessorVersion); SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorAssetTag, AssetTag); =20 if (StrLen ((CHAR16 *)FixedPcdGetPtr (PcdProcessorSerialNumber)) > 0) { @@ -527,6 +527,12 @@ AllocateType4AndSetProcessorInformationStrings ( OemUpdateSmbiosInfo (mHiiHandle, PartNumber, ProcessorPartNumType04); } =20 + if (StrLen ((CHAR16 *)FixedPcdGetPtr (PcdProcessorVersion)) > 0) { + HiiSetString (mHiiHandle, ProcessorVersion, (CHAR16 *)FixedPcdGetPtr (= PcdProcessorVersion), NULL); + } else { + OemUpdateSmbiosInfo (mHiiHandle, ProcessorVersion, ProcessorVersionTyp= e04); + } + // Processor Designation StringBufferSize =3D sizeof (CHAR16) * SMBIOS_STRING_MAX_LENGTH; ProcessorStr =3D AllocateZeroPool (StringBufferSize); --=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 (#93700): https://edk2.groups.io/g/devel/message/93700 Mute This Topic: https://groups.io/mt/93650284/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- From nobody Thu May 9 14:38:54 2024 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+93701+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+93701+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 1663050171731495.7431286315376; Mon, 12 Sep 2022 23:22:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qQgFYY1788612xPFblqly1lx; Mon, 12 Sep 2022 23:22:51 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.99]) by mx.groups.io with SMTP id smtpd.web11.1629.1663050170434474977 for ; Mon, 12 Sep 2022 23:22:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jZsAMcFPnKLvaA44jp/8Cokg3U+xeVxE8J3s11phBaPIOdbWfld6lq537UmQDSf3dnRzyXhgZg33qaxOVuOPDS4blU1cb4uycL0z7M5JDu7GEWogH3m74ib7x3tP6/k+xx1KxZqEnRETLhCgjURN3psAkXcpwZKJPMk0hJAz6UYXPidlHkKkQcdnNWUFcVwhUeKTkFWkM9I2e+r+5pqD39xMZnVVCygTirq5PMP3t6+DHoMv8ckNevnNndNFRKM+uKrRoiPck5QwhfcfOCVhK1TC4AD9W8FF27+NaNQVbgJAbcPjEHvNJBgVJprwsXIsrc25fmS5sCwAFusAnP4BbA== 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=nfeIubZi6tDFhHSj56K5YtYQ7cXbhTQ90dK6cJ1Xco4=; b=a+kxpwoy4VRfGabKQIIPKV8CEjhzQATMHp+hqNLUi4m2PaPvHdE+nMsNZTM7VyY4do35vsn2FyZIFUcBdR9yR0UG2hwAoK32VQXKlU3ZQ5Ti9AfHLJbhoR7EZ86QjJ+FyP3/31alBRcPRUlb/62Bxtun4Rji6hTUY1yshg8ogCVUtaJJaeVZhVdOiRHiK8m9xLZKySr7J/2S6cevxL9H+UTRAz8q6VfA6tS5HbRZphu/BCfoZD9uZcH25ZOXTto+PWyaQVm7jRHmBhDC1GBP1aZxTwRIX4suoR0InsYL/NvnkdeV0QrgdDKEaNqE4H2muM+gxgI0HDLFIztqZka5VA== 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:46 +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:46 +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 2/6] ArmPkg: Correct return value of "SMCCC_ARCH_SOC_ID" Function ID call Date: Tue, 13 Sep 2022 13:19:43 +0700 Message-Id: <20220913061947.735951-3-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: d4847abc-ec3c-4a65-ba1d-08da95505fa2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: rc7glPf+gVgme0H8+eH8bky/Pxi+tn38q+QAXyGrzlCNYF7OAGKB08i5a6apV2Kl+S6tQrqe4YeOHURpRCXpftT69F0uIjabaFoU75cOUl8R8ZchZv8Rtb6BByUqTo5TuvF0sEwbcAJkA126yCqn5Y4qd4Lz7GBZjHadKWdPAU7XAjsLt5iLBaZGPDBZ8IrWbnZFjX8j1FgY6sef3RlT8kgKctKGVcvPREFHM2vVF8fPlCdX84vNGsyug3NLV9MfIWNM19dPzWW0UjDVJuGuCXKswScTc1KfqAg3F1a/hhsqikv8c8XvH6dAkhC+WTRvYTPWgkSLHRbUH+5dhl5lgww5QtPPUl5uwl1R3/7t7NESc8MG78wDebHrQHS0QTmMtIQ0pE30ws0/Nq0PMcQgEOVuGFBeXFXbU0tsCWLRwZleE29EDDw/Iz9H2VH1eKUabTrlVy5kOIAWwKjSt3kpYq4/oKun7EJ7lHIR6JETiStQFKgN3D7VZuvgpU0ezDxCVFfzHi9xkGaju0Au3xNoecadLeXiN2JqotmhIJnDdXgmMiUP3WFKPb6CCQ+s0PEYslxVM+Mblix4Rd/281W/vmJMgfy9f8NPHkVnyxFl13nYNC0rUgccDbUv5JN2tTZQn12wUWEglykMz8AChnvw4t/qN8lOt9P+1Jo76RdLArXtCQ+86MBtbCGMQ97LqX5xfsFt2+LgsrTKzqNLKnAJlkYLMyw2CXZuLx+f6zDW7GZtg587eNFg1L6fpXOUGjSgIVrkKMeULy3IzeCXXA09RQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5+cvehoV7hQTu7YTd+Um2aCJDNZWsVbksY41lJk/2sPIHh5+OYIq7ez8C3ME?= =?us-ascii?Q?YT+lzFrcbrU+QyMWz/8t0jd8ENpo0OK9kODGhWEEgyYe+CLzsJU+4oi7Eg2P?= =?us-ascii?Q?juSkep1udiJPesUcft5Q3S3T5cjoKxpcdAqnr6i+DAgIYYpnPnqf4M9yUuhs?= =?us-ascii?Q?daV9qUV8ndCWHRrDFsV+vYUZ6HIIVVNZmgv+HMgjBbvrGbsxAGbpAU7FMwNO?= =?us-ascii?Q?356x3+RBq8poi6jQZu+ACb7TR7KikWhMnLBxwjr+REBWb4PIud+fPe6b2xOW?= =?us-ascii?Q?VqBK7cY2cxcE4HBwBLI+S5idHHGzzUdQPAXTjqiEANv3EMI37w9QWMmqAl8p?= =?us-ascii?Q?MrqMKIhWLAYGm52H3AQIcTxGdXAWyxTrKIS3AE4ldNjEazHWxio4BXgvJ5Ws?= =?us-ascii?Q?h9mc1QF+qR5H2MczKPe5x1L7fs46uxRrgr+5/kopgPpGOr0SIUN6neR9CFGa?= =?us-ascii?Q?4Xwzyb60xkEM9OSoMaRmsilRwHDx3Qpe8Xq+GnNxlyncnWCX1r2EooTsdUAK?= =?us-ascii?Q?byJt20UuKlbIaXP2msswTDZiTJO01jph+ZonAGqgZ+xnWDyLSQmXZQ6hqSOK?= =?us-ascii?Q?w6b8GbLwxo0YaZ3wLaNBjPWCbwg/ogCWxpfD/26Jf9x9KZrTcqVsQpOKmp+3?= =?us-ascii?Q?iw07bAONwceSgc0xAV9MfIKLalNs/rNe++JFDihyTIMurFIHcfEwU5icf9zD?= =?us-ascii?Q?RPXVObT1Ps2h+QgDi+5RQCbA525hic595z3lV6VVdUJbaFj8jNTxolB1U72Y?= =?us-ascii?Q?SvG6J8K1uMV8SCEcozzSr75CiKjYFas7f5PwidjzYimnJWiokik3zPD1kWWA?= =?us-ascii?Q?Xt/aHMbeRo7YaIXH358MlRSSd+FE/U/g5qIld0jnIS+fCwUMlOSGyDtAXf8R?= =?us-ascii?Q?CCXvlSAalT9vsAjyVhA7SieoB/mKHscGVa0aw0lDF1L/Xhq0c7uh33r3yvBH?= =?us-ascii?Q?bszE2/AE+3W6J49n8dq6AYSET1idSvjTCJaNhF0GUu/q6z4TtYsCaq7SkXRU?= =?us-ascii?Q?Hp47xmfX5j2f7lDx6F6BqwpthKL/y1ce4R7vWyMJ2dXxN5pmY0skgx9U5dUN?= =?us-ascii?Q?JLOcRoIxENjSUvf4FA6w4XJL7gSgqpQCpMShjxoNjrd6pzAE8spjVD2WiXbK?= =?us-ascii?Q?XP7Xq/U65Es8KVrNfCbfpodqIHJy6L8UvLudNOQBwy6UoXveIeERqpwXEJe/?= =?us-ascii?Q?wC6vw6arxP9vDjl22QM5N7Xo8IXo6Zkl9SP7gvz9h/D6wCrwPFGGqiwlFafX?= =?us-ascii?Q?bX26Z4lnF5oG5w+G+GHUzzOfJWY0cFdInqcwbJ6JR3d3BaJkx4ZSmZyknKzP?= =?us-ascii?Q?ZRwIvmSekH1HxsDaMeD7jAFeUauYIHKEKKUlUk3sAU3SoGRdWKePiS3XbuU8?= =?us-ascii?Q?fVa0zPMYdJtFTeZuv+kiaC4o1kRaUV7TzbG30tgLf0ut0/LXsM8Bch2ddUAq?= =?us-ascii?Q?sennjPjaT0IODIZsmaSRQnIg0SjUleqymdNam6MbDpiAVwCDWhz4onrcjTOH?= =?us-ascii?Q?rLp+eiBj4/ORSREzn1xrQDpXvsYOSSDXQQRA0JHS7Wvcaz0/zOyvClnkQ5FX?= =?us-ascii?Q?WGSZWpmPBQveH1gznu5KfYqHwzGyWT8PaYolHGmkQ5Txw8sV0kL/yDuok5qT?= =?us-ascii?Q?xahLyfRNi4S6WNMrZhyzw18=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4847abc-ec3c-4a65-ba1d-08da95505fa2 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:46.2800 (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: XXrOCkHrY32NGzATTyN5Km1kMFLWEtQRmBgLwkMLgEnBIQ0DUb7g0QoMnx+u3mY0upVDiJ5leBWoyfL+TFKFQHJauFmsJ4NNoZxx2FrcFQI= 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: fKsyBimhPcS2IAdUlFWUTZtFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050171; bh=sxHy+nIYAP8VOr0PFQhn7rFJ37qXcBWc2YMzVlJqvdg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=lojNiBQ2YmGdow44BTDd4oOgqXHY8hwkwzs/7bv31Gc7jxvnW0ps8YZGQufkTl7KjAH 9iBudNm3RDa9kuBHOXKQmlChvj18mLTFuLODzpax79Kh9ldQUQEzTVocboJ0gT/t1/iPc RhcExKuWXQ5iNYsPWOvpiwnBGJK+qSQbN0s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050172651100001 Content-Type: text/plain; charset="utf-8" From: Minh Nguyen According to "SMC Calling Convention" specification, section 7.4, return value of Arm Architecture Calls is stored at first argument of SMC aguments (ARM_SMC_ARGS). This value can be negative values indicating error or positive values (including zero) indicating success. Positive value would contain information of respective Function ID (Section 7.3.4 and 7.4.4). For that reason, "SMCCC_VERSION" and "SMCCC_ARCH_FEATURES" Function ID calls read return value from "SmcCallStatus" variable (Args.Arg0 - first argument of SMC call). But "SMCCC_ARCH_SOC_ID" Function ID call is reading return value from "SmcParam" variable (Args.Arg1 - second argument of SMC call) so it leads to unexpected results of "Jep106Code" and "SocRevision". This patch is to correct it. Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c | = 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorAr= mCommon.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm= Common.c index e0010a40e489..b961be213358 100644 --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon= .c +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon= .c @@ -2,7 +2,7 @@ Functions for processor information common to ARM and AARCH64. =20 Copyright (c) 2021, NUVIA Inc. All rights reserved.
- Copyright (c) 2021, Ampere Computing LLC. All rights reserved.
+ Copyright (c) 2021 - 2022, Ampere Computing LLC. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -131,7 +131,7 @@ SmbiosGetSmcArm64SocId ( SmcCallStatus =3D ArmCallSmc1 (SMCCC_ARCH_SOC_ID, &SmcParam, NULL, NULL); =20 if (SmcCallStatus >=3D 0) { - *Jep106Code =3D (INT32)SmcParam; + *Jep106Code =3D SmcCallStatus; } else { Status =3D EFI_UNSUPPORTED; } @@ -140,7 +140,7 @@ SmbiosGetSmcArm64SocId ( SmcCallStatus =3D ArmCallSmc1 (SMCCC_ARCH_SOC_ID, &SmcParam, NULL, NULL); =20 if (SmcCallStatus >=3D 0) { - *SocRevision =3D (INT32)SmcParam; + *SocRevision =3D SmcCallStatus; } else { Status =3D EFI_UNSUPPORTED; } --=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 (#93701): https://edk2.groups.io/g/devel/message/93701 Mute This Topic: https://groups.io/mt/93650286/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- From nobody Thu May 9 14:38:54 2024 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+93702+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+93702+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 1663050174702936.9026148517728; Mon, 12 Sep 2022 23:22:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id j4YMYY1788612xUMF8TA9t5a; Mon, 12 Sep 2022 23:22:54 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.123]) by mx.groups.io with SMTP id smtpd.web09.1732.1663050173479598860 for ; Mon, 12 Sep 2022 23:22:53 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QnJRvaYZifPAlxI672MMkq8QsA8cqWFKastGfkS+0Miqjuc7qfLS7DH1p1mX+/JBaf/P9R6uoTwVS8e3Sg/NefFyCIafChj+i+MWZjCBfFf9aPR0mzlNYkg/fw1/L2RzM9QLGB/OBYKcLwqInF/wWgRWm8g9hFjOFO7N9XoPIcFrq4EjqW16hZ0cYVV1LaFzgFxOz1PuG7kv0IUNuekAz3efl4jnI5z9/RzoLBQtopiuULhmHhxeaJMG1jHT+BjB0uOh7TJ7kTdEPQ3RNgv17md7YpmoLQ2fzrB/g4+9UwTeqYBEcJzIZGetEjng1uoVC3xYP5Htyqj+0TujzaMl9Q== 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=ioK0oXra4vWMVoZegarQ1za3YhHpw2DqNnq0gzFqcAY=; b=PoscVMxN+ZvZWyFmP7k0JhmeNd7wN/cG4RfyaUGLUw3OWvD9AGj+6PrG6Qwp+YvoFirmGRXkbn/0AftDG9bVHCgfRwrPnKqAetjyLuFjPb2bUFLu9yh8HMmP20Doe6yvg/X4k7F/5slPMFcopEz6xVVsvrwKHoYbwwP/ua3IxAuoMGQbyPGlDenXRZnpHBseeQ2KEolmO34OuFrHTdA3VacrAxYVMdyfCkBS1kAWPACeUPumdJDCcCXlqTdxjwMZr5xnftChIfdUxEmfa0OthZTuuKdUlCefEZajkv+tNCsF0Tu2ue8qbVRlgX0Cn07LQSzKIKNTFFmYNKH0xyVnKQ== 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:49 +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:49 +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, Nhi Pham , Rebecca Cran , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 3/6] ArmPkg/SmbiosMiscDxe: Support fetching System UUID Date: Tue, 13 Sep 2022 13:19:44 +0700 Message-Id: <20220913061947.735951-4-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: 94a7f65c-45cf-43cb-4d81-08da95506184 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: xmpIq24SjD6xEbJQdSuY8VdC3BPSDdY/gDGOihKSRrXZURBN0jTjBC98O/xdbIYkr2IQGEQCFmRRMEfuHGHaSyRcPFlonPZKWCHh2X/gIAS1iE94zB/kN/ngDiT8n2dhDmzN/cbo9oZmFUqtmDQPc5R9khVXt6thP1LLDr2hRP2vrwby+onwN07o6a2MJA7Y3b6zHiaLIzNx3eHWlB/fkpwDEWv2fxNfZWDfFYvulbG1kR2O4bQHeWXq6oaG3TYj0CzcNA2a7Lsbu1Yi9sbAkDZerydm/VVY5RSKQhPlNBVzNTwEAvwuDF/a9zCeSXsFGhKwR3ATCy16Gyyda/zR7fOlmgueq239teRj/CeQ2Ir5iAFqyPaa1oMPraEj6w3Aja6kSAad51Lpo+GyIaYCcIgcCXjwHuf6oV5MhnZsO/LNuLaE9iYl8zDn8UV6UDCFFywUOMQAbpIsWnOBNZVI7vm3C1p4n18/X8r4zSbSJ2Rl/Via9fICBtxB9TnJc/beT0ZiykZHfTAuOOEbIfEcTOMF4X+5gWPRwWIacerGG1B4gfvLw0YLweDgL8+hU7aK3OtJokdAi30sW2Ce9XJGbhAQgYtdNxIiNSlItVeRVuCtE34W8MhcpUrRomdyG7KVBfCZ9H8hEYfQYuSV1zGD70WAqBPqQSMXXP6ys/LAxHv5ixbbND9YPb44aiciKtRr8PAyoDKJolL30QVB5IoGrmO175OtYZqXNk8iZjkby2R+kKldKAZhjBOGESDygy+ZGBmlfDgfChOWvvo7wvzuUw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XCktkjUscSMdNtPxh4H7VvRxhGMRB4NKE9UOXeuA4O/aDg90vU3vFcD2t6ru?= =?us-ascii?Q?33SCpfClKhIj3whczaLtuL8Ip9k9IIwi7dHCfC6NTXs1W2oiFWXhvFoSrjy3?= =?us-ascii?Q?qlLaRHggvBGYnhKaCgSB/1fRFl8YZC5bdJUeh/yDLSJDArlWdRcvtQNez8/n?= =?us-ascii?Q?gGlpvrDWvj630ZgNN60U311sWVZawxakn9pQ3yaMiL0s/vRLhlt4qr+R1fvd?= =?us-ascii?Q?UFKShiZ8gBljAyVIBRvO2M4M6db+av/kRb2YzfVg09FRVNPhNN2zHvK7hj9a?= =?us-ascii?Q?zkk2pIYz0hHgGBnkH+aNll4slsin4kAoxoREGZy6Xush4EkHLZEp3A3pKcyr?= =?us-ascii?Q?gsID5J1dVl8rzuYm1+sD9nBoo4nPB9/YRCnnHkZtgciPiFr1lbwbTmowq5KL?= =?us-ascii?Q?DAf7+G9d+F3ydnIowc10sXz5YCO/xWUFFCnLA5d6zS1CApJBAC1lnGSSvixt?= =?us-ascii?Q?vDEE4DuVnm2/m4KBDyX681etzjFieBqQIfWMu5zZI8sDsDs4Ubm8L+ow0wsI?= =?us-ascii?Q?s0RUH3+/xdTJITgF7A3wq9GzFfAATqSfEeKvj5qWQolbmtvqXOZQilsnvtDp?= =?us-ascii?Q?q/22A9794GFmeEYtRVRW2luzjL91j/1z4JU5sSyAQlxIr3KcSlHDTb2l3kaS?= =?us-ascii?Q?aHFo/Aj3dkhW3NBYclVJnJbZZXFSDaLve5AtVffyf8o3ohrMUxAc9yjrPrdo?= =?us-ascii?Q?IcR0fKXFJBv9zHoejuySYHfOy3xOAyrGTOu8veyIL3rStbhAGT8Tdya85O97?= =?us-ascii?Q?W2CeXgTg8SXirVid8T43NgZdDSvNtTtQJAzfNT1vJoAuu+OkkQZWamXzWlHF?= =?us-ascii?Q?dBL2FG4keBOyaFZKszWursMas+vLPwFWDYf6fdsKGPuFBqh+HozkhG0tvLLs?= =?us-ascii?Q?0zzi5RuSHWd8OTcAex/pb2lIsrmXinSjLefW1pbDtQYhUICmT0lqKdlhQr9O?= =?us-ascii?Q?/kXwN173mAw2vkelVwXk0DB26J51qT5lMm/HrBxAxqX9baCR/5X89kem6tSZ?= =?us-ascii?Q?U1P8vUBTm6q1SbfVtgnc1X+oyVJtHbw6ANQ+24iRyI3JzPuyzKe3aaihzXe2?= =?us-ascii?Q?c3ZHeK/LgYKCj+CczNAbT4CiLohwO2RkPusnL2lPOru3tCTeogoRzMpUpSgJ?= =?us-ascii?Q?SJ5lX05JhggBOg1Ba2uqE48CDFczL4qAOCWdocKwP69WXTMKbmS1BYxSJ9rM?= =?us-ascii?Q?nO58mUEPjbVcFBfQ5YmivK1AmeEG0/LuvbSC7xpuqOf/6Rx9pfV2fKbaQxs0?= =?us-ascii?Q?N/J0PKBfxeApWUeHaalGA6m89xuuTk1Jhc14OStkumasGRDstq1agdlb39hj?= =?us-ascii?Q?DRUnMsHrJ7JbAGAzF9EhutLnR6wDTklM1es5kAjaBExW6/Bt9fJJrHiFVQlB?= =?us-ascii?Q?8ARpeiH9B1R/nxPj2/wflBGaeaCgg/SD5Kfw2KHLItNVMFIDgFnxb5/gt7Mj?= =?us-ascii?Q?/xL47bt43JXrba8kddOu/xxeOeuxoxTQNyoK0+0qpaW3AqKpR5v+BVaQPoIJ?= =?us-ascii?Q?AnC3Yyz6Ejb0NdGYMaXDZUyqEnVdvwFF5yiN3CF03GkUHs1wWfAkbP+oEZN9?= =?us-ascii?Q?WrTJ4Q0UCaIXXRpwh/g82cboEIRsyjzAVGeeTyaSlh4ACPrzk7Soh58LKocI?= =?us-ascii?Q?tofpztotPUGKB4QGYhD0Z1U=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94a7f65c-45cf-43cb-4d81-08da95506184 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:49.6234 (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: 2oDFKw/KQWvBrD6Qg+PBQwRBCbkLeaSgmt586Pmh4oOtuOCPR+cPQuJ3xEXthip6QYCS+IzQsSEgYa8Oa3yg59BRU+es4ZTlbXAjJKkN3L4= 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: eVjJ57ClgK56ancBj52mD7TTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050174; bh=hRXWcWtILpkKRWa/NWCbf4Tq/ICGDJB52uXFFU1AaE0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=nczKjCLEa4sKo6osJNxLA6BfQUPaT06h+VvnBvmwIsr8mBQO53MAn3Y25hCrrEdnamh P/Y880EOI6Ul/DJG1Qg7f2B/omhNY0BWQwSiaTmh67U/BL+h3oiKCNRgcEcabzKW48HFT eJLb2hQcSP2THIZPNQF14uL51CsJzbx3U4w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050176696100001 Content-Type: text/plain; charset="utf-8" This adds an API to OemMiscLib for fetching the system UUID according to the platform. Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf = | 4 ++++ ArmPkg/Include/Library/OemMiscLib.h = | 12 ++++++++++++ ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c = | 18 ++++++++++++++++++ ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunctio= n.c | 3 ++- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf b/Ar= mPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf index 5c4268f68b4a..8653f57720d1 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf @@ -1,6 +1,7 @@ #/** @file # OemMiscLib.inf # +# Copyright (c) 2022, Ampere Computing LLC. All rights reserved. # Copyright (c) 2021, NUVIA Inc. All rights reserved. # Copyright (c) 2018, Hisilicon Limited. All rights reserved. # Copyright (c) 2018, Linaro Limited. All rights reserved. @@ -29,3 +30,6 @@ [Packages] [LibraryClasses] BaseMemoryLib DebugLib + +[Guids] + gZeroGuid diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 330bb4b014de..d87737db9c2b 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -235,4 +235,16 @@ OemGetChassisNumPowerCords ( VOID ); =20 +/** + Fetches the system UUID. + + @param[out] SystemUuid The pointer to the buffer to store the System= UUID. + +**/ +VOID +EFIAPI +OemGetSystemUuid ( + OUT GUID *SystemUuid + ); + #endif // OEM_MISC_LIB_H_ diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/U= niversal/Smbios/OemMiscLibNull/OemMiscLib.c index 98970407a65e..32f6d55c1a9a 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c @@ -1,6 +1,7 @@ /** @file * OemMiscLib.c * +* Copyright (c) 2022, Ampere Computing LLC. All rights reserved. * Copyright (c) 2021, NUVIA Inc. All rights reserved. * Copyright (c) 2018, Hisilicon Limited. All rights reserved. * Copyright (c) 2018, Linaro Limited. All rights reserved. @@ -10,6 +11,7 @@ **/ =20 #include +#include #include #include #include @@ -236,3 +238,19 @@ OemGetChassisNumPowerCords ( ASSERT (FALSE); return 1; } + +/** + Fetches the system UUID. + + @param[out] SystemUuid The pointer to the buffer to store the System= UUID. + +**/ +VOID +EFIAPI +OemGetSystemUuid ( + OUT GUID *SystemUuid + ) +{ + ASSERT (FALSE); + CopyGuid (SystemUuid, &gZeroGuid); +} diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufac= turerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemMa= nufacturerFunction.c index 5cf72644d0b2..22fb5eccaa63 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c @@ -4,6 +4,7 @@ =20 Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ =20 + Copyright (c) 2022, Ampere Computing LLC. All rights reserved.
Copyright (c) 2021, NUVIA Inc. All rights reserved.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
Copyright (c) 2015, Hisilicon Limited. All rights reserved.
@@ -160,7 +161,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscSystemManufacturer) { =20 SmbiosRecord->Hdr.Length =3D sizeof (SMBIOS_TABLE_TYPE1); =20 - CopyGuid (&SmbiosRecord->Uuid, &InputData->Uuid); + OemGetSystemUuid (&SmbiosRecord->Uuid); =20 OptionalStrStart =3D (CHAR8 *)(SmbiosRecord + 1); UnicodeStrToAsciiStrS (Manufacturer, OptionalStrStart, ManuStrLen + 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 (#93702): https://edk2.groups.io/g/devel/message/93702 Mute This Topic: https://groups.io/mt/93650287/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- From nobody Thu May 9 14:38:54 2024 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+93703+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+93703+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 1663050177555590.552985607177; Mon, 12 Sep 2022 23:22:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 39T7YY1788612xx3XJYCG8br; Mon, 12 Sep 2022 23:22:57 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.103]) by mx.groups.io with SMTP id smtpd.web12.1672.1663050176421261608 for ; Mon, 12 Sep 2022 23:22:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H4ZMAg4JuQScJuXfSzHu9BiOCs5bBwbwqPW6enZ7O9LmvS10Fnlawe/WSBFRBOIz3DECWgz5pSrQuuznTY+5h5wsUFLonmErNu/0UjLb4Y07Te8s3vPDJcjKVsM0S69PPALMLdsFfnAd3egwxBL3nc7/DVKTyT1lC8zWNQJGCGWUTjTDFRA+hRhfTwP8CkOivNprRPuVQR5q0ioZXu+bqt4v+/mX8D/Fa2tU8MjN6M9e5DlQcFfyZwCr+gXMCwgF7SjD9Qe77H9D0RhGqI+1BVXg0RqstCwKOExmggDltH8F5uZRwx9dJXHZPGhttU0UKV+3kEXqmn6/J4YC4FyUBg== 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=jj6cEKFK1NWaHfsm9TsDterCLmxtOE2yZiTKG8tY8wM=; b=oBuo+Kbrl2G2q+YMMn5SzE0Ri7sVzBQJbt63XM16B3Tv8xtPmym1zIL4qYkMzDGf9zXIAOalAyo7BKXlLOsPyGG5qy2kP2Xbyzxw5w3HP34LDL1dUlgYW3+OrSVJ+eNfaACAU3vryRiWvZsUhURxWMKYhdZJZqZDRuftnAO1LwI7YLAmOAsdYsaOndMvUIdu+Edj/7aKAJCarvmMQJ1cw4qYtEjLUfT1mHoNaVxXczi1p/jab8HJv2oiTu8wmD+JogXP3wol8C0kI0yb1OKRrDI11fgpw91MbvRhecDToVTAvLlVEoa5XDMEycBZ3IobiSQJTqYbmUEZ3CDJw5/s+g== 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:53 +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:52 +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 4/6] ArmPkg/SmbiosMiscDxe: Fix typo of "AssetTagType02" Date: Tue, 13 Sep 2022 13:19:45 +0700 Message-Id: <20220913061947.735951-5-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: 7d7d3702-8d0a-4a33-aab8-08da95506382 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: p+B4w27EblYDKsDca4btMg3ofjo26zFP21cbudYlSR5YO8R/6ZDHcbhZzae2nF2DFSPIqM1jOXBBYePoaKN/aeuXY7JAu4EBLJsDhTDcZqXtdy+D4A9+fM04eclXLY91J3ZQV5B6I4dFh8H0+zjjveJBfF4yw/DSBVynu3qSH0G3jLzB3XvmHgS9zvx6T6UmqPPUf7gSEw5n21mo+OPy0Svp/9PZGtPwj46+WRyqh7MBYnwqI8HZl7NbEaCpFjESxp9gq7GNXJWgahtO4guk6IQ8KUvaKSiLuYAlxxT0iXaCY203pvPqQJgioHXxc35wxx92Zvgxl0mieJX9JB44AspISkG7X//3FSER85TyOjrlyk7yA0IZvR4tWf9c8jzV/g6DSMo8VzmYB+XiMLnhqEW9UKUJGj5UhGFh954erPD1EbrN3ZHs7G5gmYOAeRgn0Y5//DrsZT3FmxZG7LM7Pb7oahfPzhz9V7uu/9zhfbSc6+kpp6oh7QlHsc38XQxQVF7ygYkpPGXJYA/C5MfmFNxM09BNT5UJdw5WriTicsXh0doZ6lI2yQ1dIsPlhFY9YgOt31lY5++/ZQKvS7dm2HWmD5KfVRIRvp4qwVLWUv26ctCkPfc6DLfyNRtkuNdTbRrfct3jax+MjyOaj/L+fxnik+Y0QFxKg8W+a7JjuP66ZNP9TLiVMMxrWKwzEzqxFO+x+/Tw6L1HnsZu/KjM2ywuAFX79vK/3Cy8OPcIxzkWMrxZjI9AlRat+96CUlFWTKpQW9bA/ntNGPt12NVI1w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6mYDDgCNl7SkA4N2jSUq96orPex9Mvd4zfzbZVY+FoyS17NI/uw1K1HZdr37?= =?us-ascii?Q?dAMM6Se3+YKnpExIxdlU6wu4LxhsnDMNkzgJwhmfGe4oFiUhYEptugkgrsk+?= =?us-ascii?Q?hIKwLouFvd4ADGWbml4AAYSB83x+bQNNkkr15W0BoyoN8dtp69/DELNZPzYQ?= =?us-ascii?Q?VrZVhKjrPi7WRJVjaeo6phoxfDZMAIYJKCJ+2oVD9YD93uhpUCl5YW0FdkYq?= =?us-ascii?Q?5fXyI9PMJL/1kGMGPbGNMzmlBw3fJml60SQF7BXTB22Dg2eTxnyj9d1Hot6z?= =?us-ascii?Q?25akxExt58FYoTc++diaCdIKjyE0k8nBb4qagyDiQ89w4xbSlKh4flpLFwyk?= =?us-ascii?Q?NtWIIXtIqUMgZFCBVmxTmIXnprRYDjpVex29GOaFyZsGhggnNFSzpUcahf15?= =?us-ascii?Q?cqpc1dSFqIEC0uwLXonU79z1X7rY7CguhT7zxL1rKv9IG49b4HmsM/NvXf1j?= =?us-ascii?Q?aKllSvcasaSMGFmU1kY0bGFXCgAjoyWwxjGCJuKuSnHViGdZ/clyE77UItmO?= =?us-ascii?Q?aJkBDZqmK/ft//vIdJS9+1tMOEy6RtHAUIaiWnr4QOMyg79QwuxxsETAAv/M?= =?us-ascii?Q?YqzBEGEyb2431MXwaPITgYeeeMs16LThRvoix/005WApP4pR2AhR5r06QQX1?= =?us-ascii?Q?NAgVhoahlFBV9Hx0nem9zoMo1VWmP2JEjOWJqR8lKUk7QBV2tS5Uq1fq/ngH?= =?us-ascii?Q?iDlaJ08habe8Ij7niFFSSp64VEczL6QdTI7tyWkagx/NnHW40iAZQ43ELWNQ?= =?us-ascii?Q?VGCVr4BOZhbY/HjGRMP7U3xCVAow0Bp2VgLKg5510dmSEkn6KBzJaVq8HkzZ?= =?us-ascii?Q?l2leaiWJWYD8LtgipiflWb8ufzK5QiKEg5gXwyEqzXfdUgktHMbQ9Dvd1doD?= =?us-ascii?Q?iqBbvYxKyo/V8OVvdihxSnfdtOThXS1X04oCpfTUB+DziIZZmYEJCX0+5C2G?= =?us-ascii?Q?Q5WeZ2FABmzPao2R3rG2ykjy2h5GU/WK91RpM1Wi8htUTPH09fEmLDWp44G/?= =?us-ascii?Q?3Xn1jnKa3ys81hZ6VO90mkOJM2TyGbI/mUqRLlVVd6qABWcWa56LcXAnSycc?= =?us-ascii?Q?QAS2lAJeozfO4DtZhyUAEBlzK/4PC51Oov7i9ondwtu+Jm2JGSAv+e7WHJSq?= =?us-ascii?Q?b/kY7jJmhy47C8PbPB+cJK5acNmEmxg3RzMUlGXGq1Kr4h8O4P2LN+g2wKsH?= =?us-ascii?Q?swyJoQtY2Fbi3PBwkC4pjXApQlAlNQYBS6RX9ep0nJpsSwk/x+3jYqH/SaG8?= =?us-ascii?Q?+vb3/IaPTWT9SsFU2JVzzp2AhyatqsMvAeyj+zaLHIiyjVt4nYNxVkwgOx3y?= =?us-ascii?Q?ujLy1Ae5V8YtWT2xg19UgdRt+Dcl+ceXKu9EJEOcKpm1Kt4NbhzxJVbcJZqb?= =?us-ascii?Q?ObOPx8SnosLUbuzZApsEMeW99nHXrxcsEqDJHzeyosp/T4OcjF9LzumKpCiy?= =?us-ascii?Q?IdfmovpQG6MA/2OAZmenUymm+sCMr7To3z5ndjE0AllZbbJ3QARTWPZe4fED?= =?us-ascii?Q?rg4RkBvBIvgqg2HRNDSIAMn5TNmA18dubB8K2FtXVPw7EL6qW+ZluZt0ze3M?= =?us-ascii?Q?VB6rqZBOSdxTkuKeQDnhV+eXEc0qOiqrwRwlklC1oPLOzc+mt5lwnmcfIuXM?= =?us-ascii?Q?VOCdFOmeV0xRPy2S/mXgS6k=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d7d3702-8d0a-4a33-aab8-08da95506382 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:52.8744 (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: uLzZUyu5tarqODmF6SucaO3VFDbuJG+gopMSkMBm2b7MOKko2JU7/iETiri8U/8TmV/bHQbf8tfCpRXO7MtgNbKzNqRkkgjONza8brYXRvw= 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: tJyLlfn4ONYOwody49M0iVgZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050177; bh=+2ZI/EMfsZ47+eZW0mm2/6PmUv4RqEjP24hF/bAbQ8A=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=dTMprRoe5VJHu7TkOtVn8aEETcHWVZEw8mgUhCAYnH+Q7K4XAqxt6sxW2rBF9j2nJiz sgw1J23E0TtkQn5hLkrHRmSGaGOEz1BzY79kjqn/ynYepQJnuQeG7h3E4VRuK1zx6HfQo ymP/SVMWWChhAo2k3KQguxGvl6O4wKsw3ow= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050178697100005 Content-Type: text/plain; charset="utf-8" From: Minh Nguyen This patch fixes typo from "AssertTagType02" to "AssetTagType02". Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Include/Library/OemMiscLib.h = | 2 +- ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunc= tion.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index d87737db9c2b..1936619d9b5b 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -44,7 +44,7 @@ typedef enum { VersionType01, SkuNumberType01, FamilyType01, - AssertTagType02, + AssetTagType02, SerialNumberType02, BoardManufacturerType02, ProductNameType02, diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManu= facturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseB= oardManufacturerFunction.c index 870610b17243..f61546955f12 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c @@ -4,6 +4,7 @@ =20 Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ =20 + Copyright (c) 2022, Ampere Computing LLC. All rights reserved.
Copyright (c) 2021, NUVIA Inc. All rights reserved.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
Copyright (c) 2015, Hisilicon Limited. All rights reserved.
@@ -112,7 +113,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBaseBoardManufacturer) { OemUpdateSmbiosInfo ( mSmbiosMiscHiiHandle, STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG), - AssertTagType02 + AssetTagType02 ); OemUpdateSmbiosInfo ( mSmbiosMiscHiiHandle, --=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 (#93703): https://edk2.groups.io/g/devel/message/93703 Mute This Topic: https://groups.io/mt/93650288/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- From nobody Thu May 9 14:38:54 2024 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+93704+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+93704+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 1663050180479926.1705303339158; Mon, 12 Sep 2022 23:23:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id s14OYY1788612x89s24qAIvS; Mon, 12 Sep 2022 23:23:00 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.109]) by mx.groups.io with SMTP id smtpd.web11.1630.1663050179347644712 for ; Mon, 12 Sep 2022 23:22:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X4wZKeYFp6XXpJYZKxJe3mppPIg7AfVXDU/BmN/Y+PfjnfbeMMCTEUlao2RVyZA1BQw1pAq/cVlL/FaRHF04BOvWHzsa1ac4PCBTRMW84UsRFoqn24/vWZFtJaIB/FwFgWQo7otYpwsm05tO4FXPhoTpf0SnXBfU7T1mwvuuL/E3R+/qzLZ/G7sVser2i6B7c2hUxYE/djPFDOH7qXH2+oSyzg+QGUwbIzB7ejiTJ1nU+D5Btq4fxjsLa3v+d2SGLbARcyVZwQ3akFVdYjTB6bm3hB9Jbs7WljPWq9AEDqIiOktRK4FMVh2dVm2XNliPtwGrhnPknyj8ciM/aqXazQ== 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=OQu7gfal5joMfx7qqLSO50gMjHRIKl1Q66BGCZz4iP0=; b=Dv0RaXJEipWWyk8D9pIxKbeHPbdMe6eiYvTemnaXOtwnQCPTI8BxVWMefznM0B5q4DdmvtPaXKyAkjF1VVJJpKvO6Wzsdh/+oKGURcNdN8DMcNtu5yxiWhdSdzUs5iC54IeNyRL0eKmLegvT+iSM0/YvCtdq8YY81NRFvnKCjrxdwnNBxrDoYhpPbV9ZpAK6TBmLhiY6aohFM1uoMDI38+j+a9wTUqeFS3L3d3lp2KgIhWr6Kfoc/HpTWiKVK1HlhUvr3wFzqCXuKNFqYpivN65RXhxArTAvrMkYQMG/RULpjFoe9AzStEiByQUCl1tLO0CHXZghps6k+9isdN8SCg== 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:56 +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:56 +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 5/6] ArmPkg/SmbiosMiscDxe: Remove redundant updates in SMBIOS Type 2 Date: Tue, 13 Sep 2022 13:19:46 +0700 Message-Id: <20220913061947.735951-6-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: 7243d615-f601-4ebd-e1ad-08da95506572 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: UDtPaFulQTlWrmHSczc/EnGJiS6aqNgbyadd3wz9CmvEl8cCNGW2A/PjAZylWiPt0f4ggOpQaOyrz6Lr7KE9lIXDc2QTd2XXudM1mqtHDLCp6LyCwwQgRuxeVrRzaCSSoHjxsAdZtWoj/ZQqe4svNitbjOl4Vez2ojXQpzs+Pnci1d837I+I4juqXkN4EWrvdR3VH4bdn8/luznb6u4IB9mhkEMJsO90K3zc8UaDvhNw8+B87p9R3znQCl3bUQJDK0yshJfQLVZZxrrofKcCqRsIbpJFTb6vM2D6z9xmp0luECna+/0iYNZv3TnVzqd0LCo3ncY+SeVJZU+JywfmV9OvAmMJMvjF27Hxkh7nLAlEvmK3QQBkeG3ob8l9qnNO5Uhb0p9zAmkcM81obhtG+eJKLxKfSi5+7wLPx3/8alAcoh/rRhJOHCL9C74KSZMAE/Up5coJgCo6i1sVILLKlmTAaAyTWwV9NzGeCjDS1oMt3CK5rvNSnXFNp/ATRv4NGdo5ZYIHegLmMKoWbYWF2RXWevgxjtFz0w0FsBGGq+POUJZqfKHoEMA4Jdp5FxEG3OoRm75TkhcmTNpj+C2H0pEXF3+1DlA8pijnX6URG6f+tKEsJHDTWA6BqkXW2kIXCXFj4YQ0pMgRX459IJjtwuLS34+EkJcV2eOyo3jgjr/6lyXPJZ4mCymSDIpZ793CO3tCqeezIIdspouydzaF4qpu2JmRWt4QPv5/fliKLa/RdU1kygFhiMnQSVwHexJ+jsflJMaqJbyWzyZbycQHvw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BbWzou8zd9G3OR3vHmNlu0w++jHD44P8HWi1LCmnXHA73ciwtYieIjYOKRIr?= =?us-ascii?Q?5RUAlJbBUHCX4fJ1+jb1UZw6Z0BGYgj2CS+8bMeoHMTrjLYcZdTZrDBVPg2u?= =?us-ascii?Q?0u6lpIeuh317R/GpxS5/+g34x8hVjGCXwNRcI725uIOKR32c52BbcQLagz/n?= =?us-ascii?Q?NEymiiEvZlhb9fMUJe8boc5bXBN3fFEIvjDtbHsulLDL9iUriGbu9el/NOru?= =?us-ascii?Q?vRa28fvEEYeY+oFbMsijJRXqW9ln6uL9RfMjZkBuNaqSzVDi5AZkr2NtQOlo?= =?us-ascii?Q?IvjBRCpFSFAi51HO/gEgo6AbYSWNpDIiRpdDbXYnf42E9SLe71D+ogngWhC7?= =?us-ascii?Q?gNk3s7HWy6tAtYdwiamtU4Lovdf5mTWQpk7rNpVWUAfGR2dPwQi/d7bwk6oE?= =?us-ascii?Q?loxsf5S1QYJTaD4SiS9PWHxGZiDiIK300VgriMFTkqVAAGkAqA5MS2cSm02W?= =?us-ascii?Q?tnd2gAGr0te7Z4BA85XhZsTQZs6TMU6JPtaWLaPOwo1Se9JX/YEx//1ggmdQ?= =?us-ascii?Q?qi8xdkn8jKTtPEFyDTVqmbbTuErXYHzyYUWqAIPdYTWf2wJCvrppXhFmfNVK?= =?us-ascii?Q?meE04T/3Ombu4wMApAt4dVRcS+1vefbEsoleFQ1YMrwf6dpZnQae3EwDpJQz?= =?us-ascii?Q?HLNZ1HsrwCKzPDSKuAU4rJc6m7j0JckK9ClR00ShqQf16MZhLpMaORx1/4io?= =?us-ascii?Q?TCcOtcwIY7E+z+E9D8ec4y90/UZbXk8M9ed3Xz8w4vkh/e+TIRYZd/Ojnyhe?= =?us-ascii?Q?OIuShSlkYrTVJF5tvfu18/5n4Jr5MZ1cQjvr4MQL2/mK8btXa21yDIp+5LxX?= =?us-ascii?Q?dHVIo9Kjz6ltqUGRlqYPe9w0L4dq2oezKRn+Phts4GFF8jwy9+uQn2JFsg0o?= =?us-ascii?Q?nsCnmlro6bkrT2JVpUPSsZNz2IDM6a25bj/mOECGBJcqLwvjDNcXwfokGIe3?= =?us-ascii?Q?Bd1dD40dq0OfmH9EMlSHA5l+IWqPbJ3OxXD9YP7rN6/CCJwen8ENh1M/a5oZ?= =?us-ascii?Q?5PIyxl3hYAkUNHfTuRvFyb+Ecn1hc3Fl2qMlgp3BCB37tjHyTYMWLTuXSmvf?= =?us-ascii?Q?xGfN+pRMEt1Q1fyk01B9j8JTtSNj/gp9R0pl829/lXeqz7EFl3L4DM9Oa++E?= =?us-ascii?Q?XLM35qwJ+TQo3NfPf76vrHca+wBZ59tSStJnO7+22mosvWLUhvwg0J3zwkUu?= =?us-ascii?Q?RBHt+rKLS1xV+ZU4/UgbyCuguXKC11WTGal/87HHuTHRvBdoVpBWwERy95vr?= =?us-ascii?Q?NZTFDK6spl+BjtnAg7fVba8p1RCcIhGT3BANSmhiYAJjGzofE7E+1We+UPSp?= =?us-ascii?Q?3gewgpGYm8AFUg7i8QbVENeD4JFlzsHgYCseC3VvI12CYIuD83N+zlm/h3HV?= =?us-ascii?Q?y1T/Eqt6Y6rgw5W4kpvtma41fec7otnS0DuHQkRpuA3ESQ38vxcjg+8famAy?= =?us-ascii?Q?p+9w8Qphq8fHUfZifNbU94FSU9ipKMez2uqakLzpaOLtTbje7j7fPSICf0la?= =?us-ascii?Q?JVBOrsizg/u2Q8w/dHlc6+d8MKiha/2/lXhAckdkwlQV9JJ/rNo+SdLvNKg+?= =?us-ascii?Q?7l6eU/pSiWrzhPNB7LoUaHth/jL6XsPoAlSE9uHNcKkf3HArwL5xrlPcRG8X?= =?us-ascii?Q?Xc0fAZV0gvktZl4JLgb03mk=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7243d615-f601-4ebd-e1ad-08da95506572 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:56.0171 (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: 8yhds+ZDYEXY+toZrQl8RiiI0jMHqJtQevHhmU4qM2+V0D832rtJ0JRYF+XflKhRr/sV7EhU3fAMHEgDf3aRDD3mBn1nJQJHhRXMoJGl3gs= 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: ri1hhsCHa5tHufJyCjSJ0HDJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663050180; bh=aHwd/fYbYjuOaDtcI38kZD0KriRd/5C5Ga70jgGjXrA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Ldhn5bRf3PrQlgI0H6bBUykDbrhkcrTkgMShlu9a5PKj7BW53HlzOHdLclcoFyqFvhh Q266oid1bp9xUjEpGxiKyuTY2wXCtcL29rHMu6dvS+MiE1Z0X4BLWDnHHSXKhgUdm8aDn 8imtOqDBtCvdYYtTYSIUB8+R9uW7+m8XdR4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663050180746100009 Content-Type: text/plain; charset="utf-8" From: Minh Nguyen This patch removes redundant updates of "BoardManufacturerType02" and "SerialNumberType02". Signed-off-by: Nhi Pham Reviewed-by: Rebecca Cran Reviewed-by: Sami Mujawar Acked-by: Ard Biesheuvel --- ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunc= tion.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManu= facturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseB= oardManufacturerFunction.c index f61546955f12..3441e7798860 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c @@ -120,16 +120,6 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBaseBoardManufacturer)= { STRING_TOKEN (STR_MISC_BASE_BOARD_SERIAL_NUMBER), SerialNumberType02 ); - OemUpdateSmbiosInfo ( - mSmbiosMiscHiiHandle, - STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER), - BoardManufacturerType02 - ); - OemUpdateSmbiosInfo ( - mSmbiosMiscHiiHandle, - STRING_TOKEN (STR_MISC_BASE_BOARD_SERIAL_NUMBER), - SerialNumberType02 - ); OemUpdateSmbiosInfo ( mSmbiosMiscHiiHandle, STRING_TOKEN (STR_MISC_BASE_BOARD_SKU_NUMBER), --=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 (#93704): https://edk2.groups.io/g/devel/message/93704 Mute This Topic: https://groups.io/mt/93650290/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- From nobody Thu May 9 14:38:54 2024 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-