From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.26220.1649656506157854392 for ; Sun, 10 Apr 2022 22:55:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=QSeVFK9G; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649656506; x=1681192506; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YLOyIO1VBtbUe1oCrZSFSGGhQ7tQivVnUEZpj1viJjA=; b=QSeVFK9G+Ka1EmZWhsidPgvBiJ6JWmkwKZjpXJlbN/MBjw0ZpZ+8i8tX trYp/YDwhDvHWsMHRbKRX48+/p4TD9veVS3gACeSGAoDwFCQhFf7hpY9d ubraqErg1Y80itnwc//LwiQPiYgh+Crincig0MsbDncJ6QjZDXvmYLd0U M29tBq2uBeNyzX++dybOevkHdtsOi9dB/NaXV3yG7qHwPlQ9XP2aawoQb ikdWEWcsTf4KzkUGzaEOydYMZPNmaergOSID4yrh1hv5pUcz3qKdm9Ga7 aTJt/TxXQ1x+mwzc9n1A9IaHRXmS8jSHT5F0Ek5p3vyUAYD84qbciPnO0 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="262218981" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="262218981" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2022 22:54:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="643958762" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2022 22:54:54 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 10 Apr 2022 22:54:54 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Sun, 10 Apr 2022 22:54:54 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Sun, 10 Apr 2022 22:54:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NerVXYzspdA4wYVuHme2uYRe13GMPs9o01+zsxWarQsIqDiSV3R7N/9ypOxqEQEduu++BXJEV2qN3TA0PdkoGGSa9Sy9FKx5RCNwcwp1+jIDEhCeeyzARVET36owgixsOd6d0x83r0634md8LHzBk7/SPYuGhgw7RMXDxCssMs1ZzR7r/hDFZD8uOxJk5IbfaLWj3PuPOorGkea8bf7EDxGjyUn0wJQKlRxsRgK4TXTaoNDAaLcYJ8J9fcBwIaVhMMkcQodhQauzg928vwYbTJugAwG7lmXrj2lbLhiFa74MjT+X5EvK9nDUvtNgS4G6QUwzNxRxPMR3wgusuzsSzQ== 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=CrHhWxJSbkumRbHcqGXJ1BkVLpTTaH40BZoA4gvI7cM=; b=WZ4c4B/Aipw3ybo05Makt8CRynYGCpoPEDGk+5/g1exWsIyEj302bhesJz4ZSxE9H5LCneZ9B7g/DJA0Ch2p/ZcVDWmpUL4yhi4H5lXPdMkQMVZm4WXkbdri9gmdy+il9/dyyjY5tC8G13LqxM4qI/B3ag67NKkvkUNkRt+AHibn1M+mMYt7o/INvYFrQtwUDIaV0IViiARMmFob6wxslVfVAz4Bp/p92CoXTiieg5d+X0uqRg9EK1i6x+8AMkqlY67PDhOXYf/EpEIUiE6tifbeZh0iSIjYwZk3BDd37NhO0Ato3Cpui5ifEmxaAVv/af0a9+LTCy9GPP+9MNofzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MWHPR11MB1631.namprd11.prod.outlook.com (2603:10b6:301:10::10) by BN6PR11MB1476.namprd11.prod.outlook.com (2603:10b6:405:b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Mon, 11 Apr 2022 05:54:47 +0000 Received: from MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::a88a:3f13:4d9:3127]) by MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::a88a:3f13:4d9:3127%11]) with mapi id 15.20.5144.029; Mon, 11 Apr 2022 05:54:47 +0000 From: "Ni, Ray" To: "Zeng, Star" , "Ke, Bo-ChangX" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Gao, Liming" , "Kinney, Michael D" , "Liu, Zhiguang" , "Gao, Zhichao" Subject: Re: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS 3.5 fields Thread-Topic: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS 3.5 fields Thread-Index: AQHYTVakFuszMyNLSE+TTLCh6WsfzKzqNn9g Date: Mon, 11 Apr 2022 05:54:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 82f227a6-3c4b-47dd-7b85-08da1b7fc8dc x-ms-traffictypediagnostic: BN6PR11MB1476:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5gnkzimlLkmIYUEUOLAt+AfD+g8T3wUrE5udVfgGa5wqpWjvvoQWwLQb/QyS3CI8mw5ZeYN/OVZnX94s+FB2mjLvDK+Ho3FuDqi+VGJM0TPcIKLN5VgqW6c27m9f+L/ICNKFmQsVt8Mx6Zq88k+uB0yF0Z6wWh3BBOy88Kcq4wmSiyiNkdzKcD7vz42J58Y211eKbq41pW5i/upDXGz7wmZudEQAJH7YEU98yqrRu/7K+Xw5HM1eJy9CGJ/GuEvQfqcvw74OFdP4Ji/HSazCc2FizVsh4gTdSlU/dqd4jMt9EhbY5FIHJEyS7+1YOqq6BZtjGNPgb2bnkoHeZYji1q7Xulr2O6mwdOCDPWhd+kBGqcVEqiPps3aK9nkYHm7LB5HQ3J1FHlkNzjaosZbtIhrPhBIx/CXuV/vnKEEEEA7UXq10dfIgeZlkXe7Fw9WKMPPutE3/PmNaanUv/OjP58mordCKlGlaHGUyvkRarzc6ckWw0sAuMWp9EFwAS55uRHNjETCNrunhfOF6gS72OWAPYPQM4KaLfhGUnthUxU6rd0TsRe3lFhnt5o0fJ/md12SRgxhWrQAjTeJ4i+O4jp4tMWZhm/0ccm2mcB2sFfXRkycf1affCwIXd4anMxyga/uMt59J7fvdvpileK4/9vRSJHnOoWHZhoKommyYH+ZZion8C3oDGhna3O8IKUuxksRtbBbf71g6mNqF/ieM7UwRSOfyC4VUPk0s21xK6zP+RY13r8+f5OeG7rnbovWl7GFbUdvnqkhmfm6sS3esXMaIEHiZaicOVOWqKUppzPM= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1631.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(76116006)(66946007)(71200400001)(5660300002)(8936002)(66556008)(38100700002)(38070700005)(30864003)(55016003)(107886003)(66476007)(9686003)(6506007)(53546011)(26005)(33656002)(7696005)(186003)(19627235002)(15650500001)(508600001)(86362001)(2906002)(54906003)(110136005)(83380400001)(66446008)(64756008)(8676002)(82960400001)(122000001)(4326008)(52536014)(316002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?6HGMqce1ZTprbay+HiChKAoz+Pl0Rh+gp6LeQNC3zaBXzgJcAtjajNBiEODV?= =?us-ascii?Q?YmkUavDc6Lu8wxyJVa2dXK94a6IrbwfifCbCAHMHtSJDoargYVPzN0OUI/u1?= =?us-ascii?Q?hF64rsJZhnNPzYCZ/5mNC9GvJ9v7WQLLawMHbemceH6oCWgIA7IpiI99cHSR?= =?us-ascii?Q?pg8oMA8LyvVGfNXn9KzeMtaHSsLEyzyQxh+SpfvA+9sf6O/zy3rTk4bKBqus?= =?us-ascii?Q?Qs30KVcUpZSRIL3iT710k5z4wQ2fq02boDgcIf2y6Mh5FVGQIcpA7+lNjf16?= =?us-ascii?Q?5HApr/1/qkluO93VDQ3tkvKJIIwTGi6wOD2+RnpmKXkDOtvq1SwQ8AR1Zs5E?= =?us-ascii?Q?m4KkNw96I2yi06Vi1nto28PzP0UIrhym9qbQ7yBQ468u1MOZHsqc9j9ibx+Q?= =?us-ascii?Q?b/0BxQDVSSxORG5/+LdxLf5UG0ccO83bEP0AbFo9kh+o+146cpTrT6hxmD5E?= =?us-ascii?Q?muwBPgq0ciG7THHU52e6BG4Qfwe/83g1jnaqtsiOcTp8DfqTWIlU7saDe1Ql?= =?us-ascii?Q?B5z3Y98AvgS7UUKRwgvwkMua4vsCA2Dr34uJUwVwgPe5yMUqfGfDME72ZOc6?= =?us-ascii?Q?fY1Z2QsuHgsscBys/95ixA8XRdLKNcdRvuX1nX2qqxwnjHtiC2pl3XLAzAdT?= =?us-ascii?Q?1LbqJEQeTnX/pP6w5mj/tnZVMeIFtfu1xmYO/s0GZDwir4I+HyPGPWt+Fo/W?= =?us-ascii?Q?gx4J0J34obzehZ95BpROPjjUh/rwOxIy2KYxo8KBBuIrwqxcogQw3ADckz8V?= =?us-ascii?Q?2K/mcqGMMD6ITjZyWFIvQRUAWaHtUbCMgmBOqZfL+eI4CaxsO3AiwmBM51Om?= =?us-ascii?Q?qSVXIpHvbLadsBm6b9TA4SmJ2xaD2ndiUsN7khNy+XQ/NFAvrCrGXVwL/a2z?= =?us-ascii?Q?tZGgLDCW09HZey1d/fXbXAYWtxjzEP2GHxJDCjK9qWQSsZ+crk7i7Sqx8BXN?= =?us-ascii?Q?PCQoOMOLbCp4kS6vbZV9IP3jW/28NB8zCj46zfAmN0twkMGYWkeVoLGGdtbF?= =?us-ascii?Q?iJUOyo+rFgyuB28qfQ3kP+D1A516qZodEJXVMkxts6KgXt9ErRVQXiVBVA7X?= =?us-ascii?Q?vKlRVmIqfwtSbEa4IXWeG3hdX9iFKEkEhWRN0P7WYClN0n53yRUb697EHX1Z?= =?us-ascii?Q?krpB+YUiWnc+bmIcdXVJCMyizzI2HOBZne5QPtn9dXFkJ2ZY12IQlWSo43km?= =?us-ascii?Q?EzL56wRU+xvn7BqqNAjcJPNsB/LxzK1cibnmNv+LFo+4NBIc/tnQ49zVjBuY?= =?us-ascii?Q?L1QUH7+JgHgdrhf9Xj93RFLneY5w41ssbumORK7g3ucHNwpS9jouCu6ZCLKN?= =?us-ascii?Q?65rEEcVp6SxBliCUxGDjfx13A1QehwQ7zWrfQE8T4Lv9+csSe2ARK//3R5eS?= =?us-ascii?Q?gYYgtUb40JFLYF23Cb6f2Qsz2CjBVL6h/lYJJB0GBLNvEVQmKm3X0RwpDlgx?= =?us-ascii?Q?NZq2WeNm/t0Yfq56CNEHxsZLr8+W9lHSMwH43yA+GLsQisKEWYfgUZJZs8bM?= =?us-ascii?Q?LhTLT4hkOpMK9syJvQl4e+jnltWpezTskt0atZXUXWPBv1c54df33OK/QVWX?= =?us-ascii?Q?LC9nB6sZcVQ0kGljHg0cafOoiJ8g3YttnFC2O5fhsMZDEWksBSIkpcbBht8Q?= =?us-ascii?Q?NNObAmToxkZxv4RG8Q6hZ14AJhPefAeC4iW4ky816CsEjxBe8KZBD7aAyBuW?= =?us-ascii?Q?+3WFK4Pjch0JwxEWI0Mv8ikMw0K20JUujqU+1UnA6HLDWLOfNnqLJJb0jTc+?= =?us-ascii?Q?KhSS0rW/eg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1631.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82f227a6-3c4b-47dd-7b85-08da1b7fc8dc X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2022 05:54:46.6973 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lwniMlxM8S71fbN4/x0lPPUWChOMTzJrUfgerOUD0q9T55ufqrkPFxVXBhOmbM+71why1i0fijYLhvi4TuoK+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1476 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes. I also prefer to have two patches. > -----Original Message----- > From: Zeng, Star > Sent: Monday, April 11, 2022 11:46 AM > To: Ke, Bo-ChangX ; devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; Kinney, Michael D > ; Liu, Zhiguang ; Ni,= Ray ; Gao, Zhichao > ; Zeng, Star > Subject: RE: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS 3.5 f= ields >=20 > Personally, you'd better to split this one patch to two, one is for MdePk= g and another is for ShellPkg. > Also cc MdePkg and ShellPkg maintainers. >=20 >=20 > Thanks, > Star > -----Original Message----- > From: Ke, Bo-ChangX > Sent: Friday, April 8, 2022 1:55 PM > To: devel@edk2.groups.io > Cc: Bi, Dandan ; Zeng, Star > Subject: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS 3.5 field= s >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3896 >=20 > update smbiosview type 9 related fileds. >=20 > Signed-off-by: Bo Chang Ke > Cc: Dandan Bi > Cc: Star Zeng > --- > MdePkg/Include/IndustryStandard/SmBios.h | 50 +++- > .../SmbiosView/PrintInfo.c | 11 +- > .../SmbiosView/QueryTable.c | 238 ++++++++++++++++++ > .../SmbiosView/QueryTable.h | 36 +++ > .../SmbiosView/SmbiosViewStrings.uni | 5 +- > 5 files changed, 334 insertions(+), 6 deletions(-) >=20 > diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/In= dustryStandard/SmBios.h > index 2b1567b052..cb39470c92 100644 > --- a/MdePkg/Include/IndustryStandard/SmBios.h > +++ b/MdePkg/Include/IndustryStandard/SmBios.h > @@ -1306,6 +1306,11 @@ typedef enum { > SlotTypePciExpressMini52pinWithBSKO =3D 0x21, ///< PCI Express M= ini 52-pin (CEM spec. 2.0) with bottom-side keep- > outs. > SlotTypePciExpressMini52pinWithoutBSKO =3D 0x22, ///< PCI Express M= ini 52-pin (CEM spec. 2.0) without bottom-side > keep-outs. > SlotTypePciExpressMini76pin =3D 0x23, ///< PCI Express M= ini 76-pin (CEM spec. 2.0) Corresponds to Display-Mini > card. > + SlotTypePCIExpressGen4SFF_8639 =3D 0x24, ///< U.2 > + SlotTypePCIExpressGen5SFF_8639 =3D 0x25, ///< U.2 > + SlotTypeOCPNIC30SmallFormFactor =3D 0x26, ///< SFF > + SlotTypeOCPNIC30LargeFormFactor =3D 0x27, ///< LFF > + SlotTypeOCPNICPriorto30 =3D 0x28, > SlotTypeCXLFlexbus10 =3D 0x30, > SlotTypePC98C20 =3D 0xA0, > SlotTypePC98C24 =3D 0xA1, > @@ -1335,7 +1340,17 @@ typedef enum { > SlotTypePciExpressGen4X2 =3D 0xBA, > SlotTypePciExpressGen4X4 =3D 0xBB, > SlotTypePciExpressGen4X8 =3D 0xBC, > - SlotTypePciExpressGen4X16 =3D 0xBD > + SlotTypePciExpressGen4X16 =3D 0xBD, > + SlotTypePCIExpressGen5 =3D 0xBE, > + SlotTypePCIExpressGen5X1 =3D 0xBF, > + SlotTypePCIExpressGen5X2 =3D 0xC0, > + SlotTypePCIExpressGen5X4 =3D 0xC1, > + SlotTypePCIExpressGen5X8 =3D 0xC2, > + SlotTypePCIExpressGen5X16 =3D 0xC3, > + SlotTypePCIExpressGen6andBeyond =3D 0xC4, > + SlotTypeEnterpriseandDatacenter1UE1FormFactorSlot =3D 0xC5, > + SlotTypeEnterpriseandDatacenter3E3FormFactorSlot =3D 0xC6 > + > } MISC_SLOT_TYPE; >=20 > /// > @@ -1358,6 +1373,39 @@ typedef enum { > SlotDataBusWidth32X =3D 0x0E ///< Or X32 > } MISC_SLOT_DATA_BUS_WIDTH; >=20 > +/// > +/// System Slots - Slot Physical Width. > +/// > +typedef enum { > + SlotPhysicalWidthOther =3D 0x01, > + SlotPhysicalWidthUnknown =3D 0x02, > + SlotPhysicalWidth8Bit =3D 0x03, > + SlotPhysicalWidth16Bit =3D 0x04, > + SlotPhysicalWidth32Bit =3D 0x05, > + SlotPhysicalWidth64Bit =3D 0x06, > + SlotPhysicalWidth128Bit =3D 0x07, > + SlotPhysicalWidth1X =3D 0x08, ///< Or X1 > + SlotPhysicalWidth2X =3D 0x09, ///< Or X2 > + SlotPhysicalWidth4X =3D 0x0A, ///< Or X4 > + SlotPhysicalWidth8X =3D 0x0B, ///< Or X8 > + SlotPhysicalWidth12X =3D 0x0C, ///< Or X12 > + SlotPhysicalWidth16X =3D 0x0D, ///< Or X16 > + SlotPhysicalWidth32X =3D 0x0E ///< Or X32 > +} MISC_SLOT_PHYSICAL_WIDTH; > + > +/// > +/// System Slots - Slot Information. > +/// > +typedef enum{ > + others =3D 0x00, > + Gen1 =3D 0x01, > + Gen2 =3D 0x01, > + Gen3 =3D 0x03, > + Gen4 =3D 0x04, > + Gen5 =3D 0x05, > + Gen6 =3D 0x06 > +}MISC_SLOT_INFORMATION; > + > /// > /// System Slots - Current Usage. > /// > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Print= Info.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index b144600a25..0fa40dbe0c 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > @@ -637,6 +637,13 @@ SmbiosPrintStructure ( > } > } > } > + if (AE_SMBIOS_VERSION (0x3, 0x2)) { > + if (Struct->Hdr->Length > 0x12) { > + DisplaySystemSlotHeight(Struct->Type9->SlotHeight, Option); > + DisplaySystemSlotPhysicalWidth(Struct->Type9->SlotPhysicalWidt= h, Option); > + DisplaySystemSlotInformation(Struct->Type9->SlotInformation, O= ption); > + } > + } >=20 > break; > } > @@ -2898,10 +2905,6 @@ DisplaySystemSlotId ( > IN UINT8 Option > ) > { > - // > - // Display slot type first > - // > - DisplaySystemSlotType (SlotType, Option); >=20 > ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_= SLOT_ID), gShellDebug1HiiHandle); > // > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Query= Table.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c > index c4a6acb167..96e0e4036a 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > +++ c > @@ -1447,6 +1447,27 @@ TABLE_ITEM SystemSlotTypeTable[] =3D { > 0x23, > L"PCI Express Mini 76-pin (CEM spec. 2.0) Corresponds to Display-Min= i card" > }, > + { > + 0x24, > + L"PCI Express Gen 4 SFF-8639 (U.2)" > + }, > + { > + 0x25, > + L"PCI Express Gen 5 SFF-8639 (U.2)" > + }, > + { > + 0x26, > + L"OCP NIC 3.0 Small Form Factor (SFF)" > + }, > + { > + 0x27, > + L"OCP NIC 3.0 Large Form Factor (LFF)" > + }, > + { > + 0x28, > + L"OCP NIC Prior to 3.0" > + }, > + > { > SlotTypeCXLFlexbus10, > L"CXL Flexbus 1.0" > @@ -1566,6 +1587,42 @@ TABLE_ITEM SystemSlotTypeTable[] =3D { > { > SlotTypePciExpressGen4X16, > L"PCI Express Gen 4 X16" > + }, > + { > + SlotTypePCIExpressGen5, > + L"PCI Express Gen 5" > + }, > + { > + SlotTypePCIExpressGen5X1, > + L"PCI Express Gen 5 x1" > + }, > + { > + SlotTypePCIExpressGen5X2, > + L"PCI Express Gen 5 x2" > + }, > + { > + SlotTypePCIExpressGen5X4, > + L"PCI Express Gen 5 x4" > + }, > + { > + SlotTypePCIExpressGen5X8, > + L"PCI Express Gen 5 x8" > + }, > + { > + SlotTypePCIExpressGen5X16, > + L"PCI Express Gen 5 x16" > + }, > + { > + SlotTypePCIExpressGen6andBeyond, > + L"PCI Express Gen 6 and Beyond" > + }, > + { > + SlotTypeEnterpriseandDatacenter1UE1FormFactorSlot, > + L"Enterprise and Datacenter 1U E1 Form Factor Slot" > + }, > + { > + SlotTypeEnterpriseandDatacenter3E3FormFactorSlot, > + L"Enterprise and Datacenter 3'E3 Form Factor Slot" > } > }; >=20 > @@ -1628,6 +1685,96 @@ TABLE_ITEM SystemSlotDataBusWidthTable[] =3D { > } > }; >=20 > +TABLE_ITEM SystemSlotPhysicalWidthTable[] =3D { > + { > + 0x01, > + L" Other" > + }, > + { > + 0x02, > + L" Unknown" > + }, > + { > + 0x03, > + L" 8 bit" > + }, > + { > + 0x04, > + L" 16 bit" > + }, > + { > + 0x05, > + L" 32 bit" > + }, > + { > + 0x06, > + L" 64 bit" > + }, > + { > + 0x07, > + L" 128 bit" > + }, > + { > + 0x08, > + L" 1x or x1" > + }, > + { > + 0x09, > + L" 2x or x2" > + }, > + { > + 0x0A, > + L" 4x or x4" > + }, > + { > + 0x0B, > + L" 8x or x8" > + }, > + { > + 0x0C, > + L" 12x or x12" > + }, > + { > + 0x0D, > + L" 16x or x16" > + }, > + { > + 0x0E, > + L" 32x or x32" > + } > +}; > + > +TABLE_ITEM SystemSlotInformationTable[] =3D { > + { > + 0x00, > + L" Others" > + }, > + { > + 0x01, > + L" Gen 1" > + }, > + { > + 0x02, > + L" Gen 2" > + }, > + { > + 0x03, > + L" Gen 3" > + }, > + { > + 0x04, > + L" Gen 4" > + }, > + { > + 0x05, > + L" Gen 5" > + }, > + { > + 0x06, > + L" Gen 6" > + } > +}; > + > TABLE_ITEM SystemSlotCurrentUsageTable[] =3D { > { > 0x01, > @@ -1670,6 +1817,30 @@ TABLE_ITEM SystemSlotLengthTable[] =3D { > }, > }; >=20 > +TABLE_ITEM SystemSlotHeightTable[] =3D { > + { > + 0x00, > + L" Not applicable" > + }, > + { > + 0x01, > + L" Other" > + }, > + { > + 0x02, > + L" Unkown" > + }, > + { > + 0x03, > + L" Full height" > + }, > + { > + 0x04, > + L" Low-Profile" > + }, > + > +}; > + > TABLE_ITEM SlotCharacteristics1Table[] =3D { > { > 0, > @@ -1722,6 +1893,22 @@ TABLE_ITEM SlotCharacteristics2Table[] =3D { > { > 3, > L" PCIe slot supports bifurcation" > + }, > + { > + 4, > + L" Slot supports async/surprise removal" > + }, > + { > + 5, > + L" Flexbus slot, CXL 1.0 capable" > + }, > + { > + 6, > + L" Flexbus slot, CXL 2.0 capable" > + }, > + { > + 7, > + L" Reserved" > } > }; >=20 > @@ -4208,6 +4395,57 @@ DisplaySlotCharacteristics2 ( > PRINT_BITS_INFO (SlotCharacteristics2Table, Chara2); } >=20 > +/** > + Display System Slots (Type 9) Information. > + > + @param[in] Width The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotInformation ( > + IN UINT8 Width, > + IN UINT8 Option > + ) > +{ > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_INFORMATION), > +gShellDebug1HiiHandle); > + PRINT_INFO_OPTION (Width, Option); > + PRINT_TABLE_ITEM (SystemSlotInformationTable, Width); } > + > +/** > + Display System Slots (Type 9) Physical Width. > + > + @param[in] Width The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotPhysicalWidth ( > + IN UINT8 Width, > + IN UINT8 Option > + ) > +{ > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH), > +gShellDebug1HiiHandle); > + PRINT_INFO_OPTION (Width, Option); > + PRINT_TABLE_ITEM (SystemSlotPhysicalWidthTable, Width); } > + > +/** > + Display System Slots (Type 9) slot height. > + > + @param[in] Length The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotHeight ( > + IN UINT8 Length, > + IN UINT8 Option > + ) > +{ > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT), gShellDebug1HiiHandle); > + PRINT_INFO_OPTION (Length, Option); > + PRINT_TABLE_ITEM (SystemSlotHeightTable, Length); } > + > /** > Display On Board Devices Information (Type 10) types. >=20 > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Query= Table.h > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h > index 5111d35f63..5f062762b3 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > +++ h > @@ -415,6 +415,42 @@ DisplaySlotCharacteristics2 ( > IN UINT8 Option > ); >=20 > +/** > + Display System Slots (Type 9) Information. > + > + @param[in] Width The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotInformation ( > + IN UINT8 Width, > + IN UINT8 Option > + ); > + > +/** > + Display System Slots (Type 9) Physical Width. > + > + @param[in] Width The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotPhysicalWidth ( > + IN UINT8 Width, > + IN UINT8 Option > + ); > + > +/** > + Display System Slots (Type 9) slot height. > + > + @param[in] Length The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplaySystemSlotHeight ( > + IN UINT8 Length, > + IN UINT8 Option > + ); > + > /** > Display On Board Devices Information (Type 10) types. >=20 > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smbio= sViewStrings.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewString= s.uni > index 9433e8a25f..a8728d6abc 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewSt= rings.uni > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewS > +++ trings.uni > @@ -294,7 +294,7 @@ > #string STR_SMBIOSVIEW_PRINTINFO_MEM_SIZE #languag= e en-US " Memory Size: %d MB\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_MEM_MODULE_DOUBLE_BANK #languag= e en-US "The memory module has a > Double-bank connection\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_MEM_MODULE_SINGLE_BANK #languag= e en-US "The memory module has a > Single-bank connection\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_SLOT_ID #languag= e en-US " Slot Id:" > +#string STR_SMBIOSVIEW_PRINTINFO_SLOT_ID #languag= e en-US "Slot Id:" > #string STR_SMBIOSVIEW_PRINTINFO_LOGICAL_MICRO_CHAN #languag= e en-US " the logical Micro Channel slot > number is:" > #string STR_SMBIOSVIEW_PRINTINFO_ONE_VAR_D #languag= e en-US " %d\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_ERROR_NOT_1_15 #languag= e en-US " error, not 1-15.\r\n" > @@ -412,6 +412,9 @@ > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_LENGTH #languag= e en-US "System Slot Length: " > #string STR_SMBIOSVIEW_QUERYTABLE_SLOT_CHARACTERISTICS #languag= e en-US "Slot characteristics 1: " > #string STR_SMBIOSVIEW_QUERYTABLE_SLOT_CHARACTERISTICS_2 #languag= e en-US "Slot characteristics 2: " > +#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_INFORMATION #languag= e en-US "System Slot Information: " > +#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT #languag= e en-US "System Slot Height: " > +#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH #languag= e en-US "System Slot Physical Width: > " > #string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE #languag= e en-US "Onboard Device Type: " > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE #languag= e en-US "System Event Log Type: " > #string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT #languag= e en-US "Event Log Variable Data > Format Types: " > -- > 2.32.0.windows.1