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.25532.1649648757583781689 for ; Sun, 10 Apr 2022 20:45:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Anu4Sx5U; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: star.zeng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649648757; x=1681184757; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Np2PC6k0IFvv6SYPQU1Ny9h+0XvpZ8XJYK1n54PVERg=; b=Anu4Sx5UL57AVEZYqkjBXRQRTTvA+kTsOUyFKYlfjfjw4wn4Vd8iVpFD OJi4jSIy/iVT6Ik+2gx/7jgvPGfjpLYSGTr/GOcGrONXwhcOoW4FzehC/ +1VJPHM5JXlH7Tjl1lUNtBaq8orWlJHJxkc6Z2OoCROHykqfZ0GZ07R6o frmcKdOrD/mWTI7n5zyQoCZyLEpUre3dcUs03pCCeF7VYZfg5DDfUoFQB jK2rehTtQPRwh4ss841CtLrlJJjxPL8S2fvxQpVD5rkcPQPitz+nHgvqt ab1yGtFkSqfYotlOxmi3DTYLvzGxLAl6VfSRhW4367RWnBxNCeHqErfxL A==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="262205193" X-IronPort-AV: E=Sophos;i="5.90,250,1643702400"; d="scan'208";a="262205193" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2022 20:45:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,250,1643702400"; d="scan'208";a="506945335" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga003.jf.intel.com with ESMTP; 10 Apr 2022 20:45:55 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx604.amr.corp.intel.com (10.18.126.84) 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 20:45:55 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx611.amr.corp.intel.com (10.18.126.91) 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 20:45:55 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.108) by edgegateway.intel.com (192.55.55.68) 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 20:45:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E5rFz2SXyXmdHPqpmsJNZNOzPNhAyWy1CUZYbttvsjdysjivHE/QhuQWhlwBGddUrImnden4tm+iTXqhryOuajAMzxl41ghGai5nWojAOZHR16dwvIy8UE7ArRIslSz2EaS/N9bXgKTkjyVt1e6muWz/KvP5RTu9RX4oW2AkdK93++hYAjjJhbSk+cLATBhdNdEZqlWIu6DOZ+g4QYXGREJ16ZwTHbC7wISpURe6e74RuGV72mzr6sXRkj9BfLV304iZjozGhBGORryh1veWDRMI6A4+D1QLLrpehzY+P1rdFgwXJ7rG7qgT5TUi1z7XMazYBcM+Ny6QcyfDyfPagA== 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=D3cpeGDa1zs5VC/4ywm4Do/0CA4zynDM3MWhh1PnszE=; b=ULnGbXISkRIkry/qzM2ltp95Ag4bmWguaGQb/oVQ5Eu0WJsRKL+xszm6IdYD8plpRXWBult6PL24ZZD4lG9kOj7M/kRE9hEl7/2EPV3KG4M3w0oVfhW0clounBO0kdtvIHhbEgpzTncWLX3K875mYlgoAnkB+x7JsOazFJFXbS1WcogsLKAu9u9dKFGjlIKcL8Wb3rvSkL52qDZD8RHRKdCmM4Nex6FtISDgANSN1WJWKjRCbwiA/hrIkjqVlxxTdfRdDM5w7h6DGioem9JmoCegAb2vnpMdWIQ3HcCfCocEf+t+u14lhJjXQK1K87mXJFgq3BV7jMyNDIQoF26Pqw== 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 DM5PR11MB1244.namprd11.prod.outlook.com (2603:10b6:3:13::7) by SA2PR11MB5052.namprd11.prod.outlook.com (2603:10b6:806:fa::15) 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 03:45:51 +0000 Received: from DM5PR11MB1244.namprd11.prod.outlook.com ([fe80::6db3:abf2:446e:b18]) by DM5PR11MB1244.namprd11.prod.outlook.com ([fe80::6db3:abf2:446e:b18%6]) with mapi id 15.20.5144.029; Mon, 11 Apr 2022 03:45:51 +0000 From: "Zeng, Star" 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 fields Thread-Topic: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS 3.5 fields Thread-Index: AQHYSw05zM/QrE4Nj02PiXU0AR8nU6zqFoHg Date: Mon, 11 Apr 2022 03:45:51 +0000 Message-ID: References: In-Reply-To: Accept-Language: zh-CN, 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: b1cba34e-be66-4c3b-a2e3-08da1b6dc63a x-ms-traffictypediagnostic: SA2PR11MB5052: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: Sno3zNISr+c7ZOhb+utz5D8HBXMHZMDtCbkbuJcZO4/vy5ZR8iTRLxMTbZinTbGoQJlnDs+Iv9kuo3WrVDnU4fu/adHW7/QKabKRLwuaJTQDA4uCQjEitfx/kQakaOEac5MlH9BSjyYfbxrVGTaQyM0NJJ09rvgoWftsMyvKDrQ8uKRBNUvUeEW8K7TmU03jkERxCl5Hty8oJnsYlqba6JEeEb+0tF/3oxmU4Ei9O2CDRZ0fG9ZJXedpLEARk45G8TtDueBtYUC6YtpgrUvRAtp4UDZymIGltrgtqCpk4gWsUayVwazcz6uOPEDyCnJpdKCT5zRPUsSS0imWhyZtzo0I4oseuvVHmYAdHUACQeBnv2St06XvFWs9JNS17LIwNH4CqDRInlNeYwnDlWTMOosBbiVpMJkh1ip23AVfeWM3ZkHUUjqRRxOyV2w3rmLT/mQmzKiUxwyidGCcn/6I+wwieaqcBwtDamlqf5/XOLN05xiHenyO8Cs4pNl6T4lRx0830vNHAW5eyVm56/VyfacfUdYq17fvzyb9/1DAjT0Lo1MaVBTeIXIQ0BbtSIW4GaKepDJi9TAdJqpel6Z5z4m1/cV69hxTxQEJK5y8Lt1Qtci/OfWsXPA08Hcb6NMyLTiJ7Fl7wFdUEf2mv+nsYu+EYIwVEr9nLDPppVpGuxtryDIRiD16VQ7WYGQHtX4UKzJUsouhdGK68ZUzZcJyFVFSXn2Ew5m8CFszyO4kHN1ln4PVQRjY6jrXcJB9M53n7bc1aICh0xEPVqzHnUVeZyvs5cROT3Pkc/Tj21QNtyM= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1244.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(107886003)(8676002)(4326008)(66946007)(86362001)(64756008)(54906003)(66476007)(110136005)(66556008)(66446008)(52536014)(19627235002)(316002)(186003)(76116006)(38100700002)(122000001)(7696005)(6506007)(9686003)(53546011)(82960400001)(71200400001)(508600001)(8936002)(38070700005)(33656002)(83380400001)(15650500001)(2906002)(55016003)(26005)(5660300002)(30864003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dRvH67f4sCWPmCWV9LSESCJ85Qrv2YpXfF5P2rxmPhmMiVdC/AU5oRcIbV8P?= =?us-ascii?Q?WTqAU/+zVOiOdn91Q5A+rsI+BdcjIVAfZ8HGt69jIih2K9G7EUz+SzdSYriH?= =?us-ascii?Q?hVrq1zB9Rnm1EvusJCAoGuUE6zM4D394cI02oHfNi8bLvcQDme2d/V5cwQcL?= =?us-ascii?Q?5AKVLaaCZFULQhHlSldRy5EtO11Q7UjB0j+r0vceAXJKZhMLI1SDxJbGVGVV?= =?us-ascii?Q?FpgNSo3AUE2ypMk50lL9pxbZV9F9cAQ0H7IlbB0p+QI5DAisV8SN+CsQf3bM?= =?us-ascii?Q?0AseW0pd+FPRpuXLljTYNHArOhAp/Ko4vvf0195sXJ/8qUehpXU2rVxY/mmE?= =?us-ascii?Q?2LVV5FN0hZEpw4QsFBk+gE/OH1j/BskECx8XnX0Y28S14rlkS3Z2nF60D1C8?= =?us-ascii?Q?Ff+Y/ekSPVirf1IfAEfj2CD50oUeK1MOYOLr/seOB/i7vYbtH2P51Xjpp4Ku?= =?us-ascii?Q?fEbFFqkRKK7LUy2Mc9FHne9lCwYwGSj4loGCvvEHPYK/6natLAV2TsmoHpZ7?= =?us-ascii?Q?U/D7bRBIymTChPj0yjRNht2gr0cHHC8n3fA2Mi2TqU16YNTfR6WXwEY/Sged?= =?us-ascii?Q?iSRNW3SiMvribC5nAMb2ak6y0ZaME/IwCb790LgpKK9ijg6fXblN/QJ6Q1uL?= =?us-ascii?Q?ecAzGo5KA0rbYiruItfsJKmhPPfyP8zLA8Q9+2BnI9MuTifMaGq8DMWi+Kfe?= =?us-ascii?Q?oGML09Aw/EnA3NQXJ9VmnWH3RT6hpqD53iDiuMFuyJQZDN/Abauet1xjhB/B?= =?us-ascii?Q?gvtAyaPmdQl3FVZdgU8X1Xm4X22dqAvWhAKRZNskewiFyQMFj07On2kV+poq?= =?us-ascii?Q?FutNBZ6FIcQ+78l8aLrybEAENObvmxF1rKji3cVQaZiZUb3EoRwyOpyux7i9?= =?us-ascii?Q?AvOgcw7RlA0S9Hln4uTydaPaIlNkemUqV6dFqI6PAKPIpNulHAEiRORDZXLD?= =?us-ascii?Q?YruvZV+bXTdHGrCZsuJKZq6g2Sv6/6ujpaNZOy+4Gc1O7dbra2bBZcHxkQOQ?= =?us-ascii?Q?K2vwAt+rPyMeKxYLwIMmptIPJ4bcPH8L6imadred+CbI8NEak5RYk4rYXt+j?= =?us-ascii?Q?VVfqLsQ2qw4OZ3U5yiwwW49i4YT/JSi8658RVpsfmThlM6YT4XCBy/ZV7JJ2?= =?us-ascii?Q?YnPQq1WVhLy0X/ywa9Sn+6ExalkJGNHZR0MYr2dllSvGdTt5eBuZyVKcbxhg?= =?us-ascii?Q?tW6mqO4FzVks4ksuloRrepOF/1AFu/0g+d2JtLqqlDY+cBthF5T0QBS5G4nI?= =?us-ascii?Q?MKVEWe166udhoCsk2fzEew+eV8ArBSwDbWwvPyekNT7O0goiRhoSX0EZnSx2?= =?us-ascii?Q?9LDe8hSGwawFm/gkOeK1q3bwt07BAmuxjAR6WMd48920E78/WztsfLY47QmE?= =?us-ascii?Q?c0GYyEBozGxFaHlAovThvdmfjrFPJs3n2EA1Covyp02wIn1//DXphfghPjyP?= =?us-ascii?Q?Q5eaJFehPwM0tI8lkwzggT6SBhpTBqT8ynQ2Bl7HZmbnIL4flrvTU9ooCwh3?= =?us-ascii?Q?hqbQJywlqM9iKZdy3CRPGYORgEOGn3f9S2UYXXpR1QxEILHpMV/3L2qE3Y1z?= =?us-ascii?Q?j9wtJnwDtHKEelPNp4SUydYoO0RGMCQXa3DG85tXegwRaCLK7k9pzM1DiHMG?= =?us-ascii?Q?Vwzrb3RLG81rUB2z+f3D5ouPOz/Rfq81rFcaku5yrMJHV2RINjewdPw5J2eo?= =?us-ascii?Q?A9vJLWsSWQJrKq/27nQaUhu0ThY0C8T68vk3cEya6lcSqlhU3KFqBEOLINIr?= =?us-ascii?Q?Z5eIYTYx+Q=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1cba34e-be66-4c3b-a2e3-08da1b6dc63a X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2022 03:45:51.5588 (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: hetORkEvmM5UljQZ78fR8wzr/41Y3jr3HVsMaKqhqw/hSAA4BE8jo/gSwPtfdEysClN3jpzKoWz1nUmwx4xitw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5052 Return-Path: star.zeng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Personally, you'd better to split this one patch to two, one is for MdePkg = and another is for ShellPkg. Also cc MdePkg and ShellPkg maintainers. Thanks, Star -----Original Message----- From: Ke, Bo-ChangX =20 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 fields REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3896 update smbiosview type 9 related fileds. 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(-) diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/Indu= stryStandard/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 Min= i 52-pin (CEM spec. 2.0) with bottom-side keep-outs. SlotTypePciExpressMini52pinWithoutBSKO =3D 0x22, ///< PCI Express Min= i 52-pin (CEM spec. 2.0) without bottom-side keep-outs. SlotTypePciExpressMini76pin =3D 0x23, ///< PCI Express Min= i 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, =20 + 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/PrintIn= fo.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->SlotPhysicalWidth,= Option); + DisplaySystemSlotInformation(Struct->Type9->SlotInformation, Opt= ion); + } + } =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_SL= OT_ID), gShellDebug1HiiHandle); // diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTa= ble.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-Mini = 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=20 +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_INFORMATION),=20 +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=20 +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH),=20 +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=20 +(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/QueryTa= ble.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/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni index 9433e8a25f..a8728d6abc 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewS +++ trings.uni @@ -294,7 +294,7 @@ #string STR_SMBIOSVIEW_PRINTINFO_MEM_SIZE #language = en-US " Memory Size: %d MB\r\n" #string STR_SMBIOSVIEW_PRINTINFO_MEM_MODULE_DOUBLE_BANK #language = en-US "The memory module has a Double-bank connection\r\n" #string STR_SMBIOSVIEW_PRINTINFO_MEM_MODULE_SINGLE_BANK #language = en-US "The memory module has a Single-bank connection\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_SLOT_ID #language = en-US " Slot Id:" +#string STR_SMBIOSVIEW_PRINTINFO_SLOT_ID #language = en-US "Slot Id:" #string STR_SMBIOSVIEW_PRINTINFO_LOGICAL_MICRO_CHAN #language = en-US " the logical Micro Channel slot number is:" #string STR_SMBIOSVIEW_PRINTINFO_ONE_VAR_D #language = en-US " %d\r\n" #string STR_SMBIOSVIEW_PRINTINFO_ERROR_NOT_1_15 #language = en-US " error, not 1-15.\r\n" @@ -412,6 +412,9 @@ #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_LENGTH #language = en-US "System Slot Length: " #string STR_SMBIOSVIEW_QUERYTABLE_SLOT_CHARACTERISTICS #language = en-US "Slot characteristics 1: " #string STR_SMBIOSVIEW_QUERYTABLE_SLOT_CHARACTERISTICS_2 #language = en-US "Slot characteristics 2: " +#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_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.32.0.windows.1