From nobody Sun May 5 22:42:58 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+95840+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+95840+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 1667363432724529.8353148745797; Tue, 1 Nov 2022 21:30:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pPlIYY1788612x22nExiEHcP; Tue, 01 Nov 2022 21:30:32 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.40]) by mx.groups.io with SMTP id smtpd.web08.2729.1667363430892673683 for ; Tue, 01 Nov 2022 21:30:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JMseqJJZIBSIUfuzsDSPHznD+DSzWBX27FgkXoagREZSzzk7ogibcbwFcwCkN8QSNcPhjj4vxGLkETkY10rj/rku6TzCS7+KbsHjv9va8Brsx7ZFmqSrjuywpwzh6YSVzHk1yA/FRDR5pULgi7QofqH4kFIkATiH9+kE2BrF+u6JxgbqPyuZ7S2F2UCJ+/dqz6kcwUtR08bWBKGswgLO5dj6VFGpAMPlN3rRMWEtL+JvUgpauAmugNh6R/FEWV7ehd0HCqx34j0YnHDUBheEiczwykFUhv11t09NinAZsfLC2ShWIXIdN2JjjqLkd9RsKxAiVcghKxQdarDgDpPhbA== 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=Ok334GIjqer3UhgRb8JUh9cBDT9K88cU1sCmXXv+6ro=; b=ULuylZeU7DYbH5q48KtTLBWkHzpzfRaACfTBJ6l7LMK68K5zoyVMFJjO9oEUvOmjJf7Ds7D7dh79qafspx3NDqObIbxCsJlzpTrdfT9TRgXlQZlvocFFhkU//LOKqSXYQzvISu+PHTn7tRQcktdzjXgkX1oauYTK/a1HKpog69o3CwGET1lDf+zHx+/QqvtGk8TJIJ6nk08Chox+BPKWMbdPh7nqlVLY2daAPzx8VHtD4Oer6mfKXlV6z/6EKu6qD9u2blL16JVQNPLKu21Htdy5xybRSK1F/z4V5ah+yOjpuqR5QtmOCyjrgTUQdY/JImbwNbJ+tqcVind5xPqfzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ami.com; dmarc=pass action=none header.from=ami.com; dkim=pass header.d=ami.com; arc=none X-Received: from CO1PR10MB4804.namprd10.prod.outlook.com (2603:10b6:303:90::5) by MW4PR10MB6322.namprd10.prod.outlook.com (2603:10b6:303:1e3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Wed, 2 Nov 2022 04:30:25 +0000 X-Received: from CO1PR10MB4804.namprd10.prod.outlook.com ([fe80::5baa:9bd7:da7f:3111]) by CO1PR10MB4804.namprd10.prod.outlook.com ([fe80::5baa:9bd7:da7f:3111%7]) with mapi id 15.20.5769.019; Wed, 2 Nov 2022 04:30:25 +0000 From: "Sainadh Nagolu via groups.io" To: "devel@edk2.groups.io" , Sainadh Nagolu CC: Vasudevan S , Sundaresan S Subject: [edk2-devel] [PATCH] ShellPkg:Improved Smbios Type 9 data under smbiosview Thread-Topic: [PATCH] ShellPkg:Improved Smbios Type 9 data under smbiosview Thread-Index: AQHY7nPUmo2yx1CZoUm+jSJPQGapSw== Date: Wed, 2 Nov 2022 04:30:25 +0000 Message-ID: <20221102043009.1630-1-sainadhn@ami.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR10MB4804:EE_|MW4PR10MB6322:EE_ x-ms-office365-filtering-correlation-id: 5e0ebcaa-406d-4f11-c005-08dabc8af6c2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: JP4utGY/rw/yA44xIaOJxvLgNtvb+vYHETVs78OllibMxfTbT0mXhUT4Q73p1heaeVYn08FXFp7yHCXAZsfgvYbxl9dGpnJv3PfzczQSCktvYUg6Jh1kuCCFZVpSWni62edyRHGmJqzOuK+Sg8hoGEo+TuHglmNr1N0RAYHXZyRy0uBMnJqp6YrcChljG1mkJJkPwvQHoXPTpflCeV1dxOIXh9Cja0AXZoRU3hSSljNsz0dW+HQR4HD1TNyqAFQZBO8pibG3Yu7eKiTfK4JmFbSdxmnoJ2F3QRtM9Tx0dIUREIiA2Ovb0kHpbdSo/1DGD6JvRK8pXmL+qpJZ7Icm4U9lfvKtorAkTDmd903VrdUyoOiqcayUgd0DCo0rTPcshywMVDvc/0g1ntkapBD7rGaroDc8CNnr+Rs8kDyOg0093mtoQ6aETR5wOwGMtWtcPhqYHQNmR/FTEhur92cPBTNwF23U9PMwLGHrd4QWRLl3Op0xueBk5amZXHYYI7Aao6yiKo5meCO3OrBF7aQH6IxY4Y51w58pkH6T+LIbPqMsgEQIoTwLO9s3z6sTQfLmFHTby7EKomcPS+VSo87CLq8yOmwMxEE6VXEGspfLwod9jjk4MkVnr94sqmSO8ogi7NloNQbA6HQVqKAQJZhj9lMZPzv6fmU1mG2kSJZfdDUFHHc+OjXreV+kSYIetZE2h3NArQ6R+7NTzqbi3v/mh5K3GnjAIzVULLt3d/rHaIToo/4KNC7HkZBoFM1TfupTKceXqhB/lB2se5wRWoLr5A== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?CZYpxDEvwGP+PJCpox4nau6WG16iJmlGW/RYMpBc2e1+mFbQgb1l8lvDd0?= =?iso-8859-1?Q?mE7zLfE5C4iX3Hi1imTXQRxUZQJoP91VHXamM1ZwtJXGIR6ycqJHA7IClF?= =?iso-8859-1?Q?2o6Al0YFtfesX+ZQOWeJtyZN4aOJiHze5cZrPoaLMrT3RdRBUoKHY//DuW?= =?iso-8859-1?Q?O15dbjVNJw512Xe1N7DQy6CBLiIA5JYLUw2C5kPm4r2klp8rq8hKhRCJUT?= =?iso-8859-1?Q?uXRJaAIOJqifzSpRAkpHngootd1ExieIUXdZfqHqcFkNtrKzqpuA+fGO8W?= =?iso-8859-1?Q?MdHQK3GsMWFuxrACPLQlI7VYqF3TXf3rsT0HcWVNtGPXssbn28JEY/VUL3?= =?iso-8859-1?Q?LYfWsXeua5SoMzFOMZWaPMafw3aVQghbA7h9kMKiUdRpzZMnASrMCB6WMw?= =?iso-8859-1?Q?jmgviSABiuHVXCLz2JY+E8xAV6gQhawE7ZREVJp1ynuaZd+zl6x4m82kGX?= =?iso-8859-1?Q?9KqGMv/uUvqXNbGyfH/XpwLhrj2sUjEBZtrCrQ4KkIRw25cB/zdG92798/?= =?iso-8859-1?Q?fE1i55Tzu7KBL0j0FcLNhYky2MwjdiVUcU+Rtt72QeD8G29NTXUiaR1C5N?= =?iso-8859-1?Q?ZDF/SUuxjJJ/CVlie0t0zCK15FV4ddCvz1BuibyqJu4BK1oiT1maj68dMg?= =?iso-8859-1?Q?rCdi68yN0ENxnDXnyp5ykIwORjoSpBg55QHRv1KhnghCB+a7DbmeBZdDi1?= =?iso-8859-1?Q?4YDCE+AldTyA1M5V4006tl32n9A1YfV2hM8+755piGHCeU13iAtBM9DJOo?= =?iso-8859-1?Q?gvrs1vzZ9B6jAW+ZEX13RKGuUfsrlLZA2AXIvMriZckrAOaZsNKhSaMuSS?= =?iso-8859-1?Q?jsozyZx/+iB01ZBqhnWgvX6K9mSoGW3cZrYycqWn0n1WV6hYNfs/S52rsP?= =?iso-8859-1?Q?VA6uAeeCmx6CaSOrdJe2AFMCkSqtoxGqh6eWayBFdwitTpnjck9F9TozAs?= =?iso-8859-1?Q?lnjlAj9CmOpJB6TQv4iRP5OV1AUKpV1GKNRe/8LoRNiFoIgooo58ogp2oA?= =?iso-8859-1?Q?8h54uZZxqsI23au1MiUyz+C8pR97Bkd0HCvfaVFxE6sruRVX5ccjq6VuPj?= =?iso-8859-1?Q?nfrR87Z+Jhnkwnf94OnAnT2yHcxQ8yEEFgh1hGGAitSHwKVM0yP/xPfF6r?= =?iso-8859-1?Q?Ovbe6ro2b5/CPlvCI/cw2B+UInXUe+lylTXsHw5bhslWmJgm53s3px6oJX?= =?iso-8859-1?Q?hDcMMWD3lsFcoZLywWgPbbbD2SxkfFPIQKEGNh6SK7bLW5kH1PjTMJuWnA?= =?iso-8859-1?Q?oqRJL+6u+jDF1yP3p767K+ey2/2zGSx63Z7HOghd9jQUX+Czq0x7VuxgCA?= =?iso-8859-1?Q?GaDo4q4U32mrMbg/ObT/OqyKuGE517IRqUnstUWkVGSqC1Nk4fb4OCbegH?= =?iso-8859-1?Q?dkPnnr2VQTYrIGBaDhIp53VED54GesO50yTS2FHsxaY7A1xyGcEtyKPb59?= =?iso-8859-1?Q?c1XtuYRmHRmCcoqYriuOpO0BxNRVgHl8QWuIIS7U/IyiQVFoK/b9ryBpqP?= =?iso-8859-1?Q?RRH+2RShVmrsprbF7yYg+O6+/fAt4KzMuV6CFnreRybdBiOfDtfbv9YSnh?= =?iso-8859-1?Q?GvMfMGbBhuyCkAxgGtfiIuW9IbpKs3U3h4Lr3KYMr7OZKTcgV8/SnBr60a?= =?iso-8859-1?Q?rmWaMcwVSe193ufBe808Mk99eIa/mdyMOP?= MIME-Version: 1.0 X-OriginatorOrg: ami.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4804.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e0ebcaa-406d-4f11-c005-08dabc8af6c2 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2022 04:30:25.7657 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 27e97857-e15f-486c-b58e-86c2b3040f93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: +KbVCnvMdlrJlL/TJOPh9KDhJJQkkOoyAjbFSlyu6Vj9GqF7Tf3KjNa8Do+3SDHMsEALetwQok9zc6HNdJuAJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6322 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,sainadhn@ami.com X-Gm-Message-State: m7VRxTRTDqZiCFzNOEt27kBtx1787277AA= Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667363432; bh=jqtWbKehooDR78BENiqHsyazkDJMqLAqcu1uhjRHtpA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=UCQJbd+t4KhQe++qkZEQPEXHrIWNRarJ+qCeue43+wucEgVYtLRrTAgl8A5MSdZIA/m Ef/nTixwgDH/Z62w6gjBC+xCjLqd4CcOIvAcUZbRPiR3ARiaFhxz+MFk1uu5X5lp425Ej TTebgy3uqK8i+ioIHgQJyS8NY+EGPjXIMgo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667363434239100002 Content-Type: text/plain; charset="utf-8" Added spec version check while publishing new fields, added Slot Pitch fiel= d which was missing and corrected the publishing order as per Smbios spec. Signed-off-by: Sainadh Nagolu --- .../SmbiosView/PrintInfo.c | 18 ++++++++++++------ .../SmbiosView/SmbiosViewStrings.uni | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn= fo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index bf5306205b..595de36b40 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -638,12 +638,18 @@ SmbiosPrintStructure ( ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PR= INTINFO_DATA_BUS_WIDTH), gShellDebug1HiiHandle, PeerGroupPtr[Index].DataBus= Width); } - // Since PeerGroups has a variable number of entries, new fields= added after PeerGroups are defined in - // a extended structure. Those fields can be referenced using SM= BIOS_TABLE_TYPE9_EXTENDED structure. - Type9ExtendedStruct =3D (SMBIOS_TABLE_TYPE9_EXTENDED *)((UINT8 *= )PeerGroupPtr + (PeerGroupCount * sizeof (MISC_SLOT_PEER_GROUP))); - DisplaySystemSlotHeight (Type9ExtendedStruct->SlotHeight, Option= ); - DisplaySystemSlotPhysicalWidth (Type9ExtendedStruct->SlotPhysica= lWidth, Option); - DisplaySystemSlotInformation (Type9ExtendedStruct->SlotInformati= on, Option); + + if (AE_SMBIOS_VERSION (0x3, 0x4)) { + // Since PeerGroups has a variable number of entries, new fi= elds added after PeerGroups are defined in + // a extended structure. Those fields can be referenced usin= g SMBIOS_TABLE_TYPE9_EXTENDED structure. + Type9ExtendedStruct =3D (SMBIOS_TABLE_TYPE9_EXTENDED *)((UIN= T8 *)PeerGroupPtr + (PeerGroupCount * sizeof (MISC_SLOT_PEER_GROUP))); + DisplaySystemSlotInformation (Type9ExtendedStruct->SlotInfor= mation, Option); + DisplaySystemSlotPhysicalWidth (Type9ExtendedStruct->SlotPhy= sicalWidth, Option); + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_= QUERYTABLE_SYSTEM_SLOT_PITCH), gShellDebug1HiiHandle, Type9ExtendedStruct->= SlotPitch); + if (AE_SMBIOS_VERSION (0x3, 0x5)) { + DisplaySystemSlotHeight (Type9ExtendedStruct->SlotHeight= , Option); + } + } } } diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni index 68211ce7ab..c24f7d5716 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni @@ -1,6 +1,7 @@ // /** // // Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
+// Copyright (c) 1985 - 2022, American Megatrends International LLC.
// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.
// (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP
// SPDX-License-Identifier: BSD-2-Clause-Patent @@ -417,6 +418,7 @@ #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_INFORMATION #language = en-US "System Slot Information: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT #language = en-US "System Slot Height: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH #language = en-US "System Slot Physical Width: " +#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PITCH #language = en-US "Slot Pitch: %d\r\n" #string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE #language = en-US "Onboard Device Type: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE #language = en-US "System Event Log Type: " #string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT #language = en-US "Event Log Variable Data Format Types: " -- 2.36.0.windows.1 -The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephone= at 770-246-8600, and then delete or destroy all copies of the transmission. -=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 (#95840): https://edk2.groups.io/g/devel/message/95840 Mute This Topic: https://groups.io/mt/94728114/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-