From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.25706.1649656664119556162 for ; Sun, 10 Apr 2022 22:57:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=W7MK4XtT; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bo-changx.ke@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649656664; x=1681192664; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=FSTA4wBqJmWmD0GpAfCFCloXh01HXM7lN6N32oN19H4=; b=W7MK4XtTOFSjC5d6DgBr+vk3e3S4JxSnzIh5OvRVNYiasizCIw2n3z6v WMaSxCbW9pnhIq281xnBvKQXyM/Z8eQO7BCXnRhQW6LDxdBpHir/uC8B2 f6941Aw2Vp1JiRfHUnKMQ2TTQfsJI4VEzKkyQNEu5jLL7gLpn5mSxYaSx +3pEiXm9YVbuhmUfLNhkQVWFwY01wK5uSLenzH8f9IK38IqCP47WzLoip Jz2lFp8oyaKbDWWDV+YpoyoYXix8ybp9mEYsuuZEmOMQoOGhwKmXhFud9 R7FjYht2gOG6pHcttmqj8IKCXvBUaaoDNQy3gYP6OKvO5FHD6njygFO11 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="259634317" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="259634317" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2022 22:57:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="571974949" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga008.jf.intel.com with ESMTP; 10 Apr 2022 22:57:42 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx606.amr.corp.intel.com (10.18.126.86) 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:57:42 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx609.amr.corp.intel.com (10.18.126.89) 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:57:42 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (192.55.55.70) 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:57:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lBV8Zffb/sDjCnDs8y0EfPBjdfPC+qysGlWNe/JLPe1c8sDOuPR6dZ3f66TD9yu8yT2aGs2Q6xG4PNlTUgsG7MmwjrO0OopmWiY0plclUK0KoDe4nXArb/rMGaQOVattp8yjcp6wgYaYCzD17mOoPGIxeMJsck0QRJ/SJIg0sTbWuqnqN19tlerpLHazpDahjSRIiv8ufS0xmefNgD2XifdCDUSIssaPSRWKOdtXNo44ilCsqLKs1DocBkaPuZXOZXh9HEeECr+eic5La+KF14btubYdDHkCsQQP0lI0ZSxAi6Qo4i7ZTDrdJlVmT+46lwtFnRFZ866CpL2RvG3GQQ== 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=vIhxGF/M9LuY/pdJP75DHjvBc25AtZ95SPJc9vYg2eA=; b=D2Mzb0ylvVyljcy0p4BJhtSg4HsQR21emXLneXnfaZJoccyN4BzP5MApgwyphyRuLYpkCbC6PPB6WWBTlTKmzWek8LtQNEcX1WQQppQesptvx9TbnPsbl8EQhSTXOiJzDkSQsDawqQs2OlDomoo96jZGA2AhQovKPZsWVvhLWwtU1gqxFbMBaJ9Wrd0Z+Jq4g8349zkBTm4hMTHDPJ9nllaF5zCblUrn3APCuOIb9JmEz3OOEn5L9Nbb2T/B/8/4pc6HiOla2hexM23kvy+HEGLLbX0v9Mh50L/okZFypBBQaHSFrKsS1W7yy2lTvd7mo69gKklvMz4tcp6p4g2k7A== 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 DM5PR11MB1580.namprd11.prod.outlook.com (2603:10b6:4:10::19) by BYAPR11MB2741.namprd11.prod.outlook.com (2603:10b6:a02:bf::21) 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:57:34 +0000 Received: from DM5PR11MB1580.namprd11.prod.outlook.com ([fe80::911:9c9f:1230:b005]) by DM5PR11MB1580.namprd11.prod.outlook.com ([fe80::911:9c9f:1230:b005%6]) with mapi id 15.20.5144.029; Mon, 11 Apr 2022 05:57:34 +0000 From: "Bo Chang Ke" To: "Ni, Ray" , "Zeng, Star" , "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: AQHYSw05zM/QrE4Nj02PiXU0AR8nU6zqFoHggAAksACAAABB4A== Date: Mon, 11 Apr 2022 05:57:33 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.401.20 dlp-reaction: no-action 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: ed9818ba-11e8-4deb-c9a3-08da1b802c67 x-ms-traffictypediagnostic: BYAPR11MB2741: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: DltS3qPCifet+dsFYr6gUJwAt4BSUAz62D4eiNofFl8BlZqoV81nipiw3Sez94V/MenLOSR0PuV5hAG2ouBHU02KTQVMJ6vaIsAFyjhKAIj86Xrlj0Syyui/qnWsWFNgZAVL//qfIR+jaa/kCNnEqDNMsensVzVcvil/A9ph+3IhcOLS/EZo4FAFocbX6WyyAxn7Gg/g3sL8GiO/XpK4ckCaX4oB8K5qSVfdNYAD7x/77xbNuxb9qyhr5j5O0AjX6J6Mr+ugqFhCAyjgCDAQpp0ifkGHphBb8YJBN1XTAL7HzERCvAJYD7/ifknzS6fzGtiCp9LGa636xq0og5hvSpdsrb1H0hhiWV3Hh5sgLFj23ZG0hib/8vbtP9/xcmgcyWTvwuEWDl770FcXNowwLLUVmJ+nQuyFYzHBoYoSGJ5fCmX3qEF8r/l05Swc1iDIrtcU3Vc7aknYQVocOsNSE6RxmWJzQy/8npVfZt9LUwwieKPXhyrEkZ6rPNeOWVxyjFmvGywECgqLenHU21uI4unjJdlvpq84BBcZD78u7wGoVWCXgvaXqrCUTam6isHJG/G1WN0YPxJFDnKvm9UFDSD1TBQ7OPpPPJGMZ1gBt6hWAOnzHMSgvLeNTgj8MS0L7gYHvWXM85z6z2VyXe147EXAqPn/9A3v1TrRnblhftO+bl8OPzt5NTSd+MYUVj/bOd6cvdmjNEmvZAdOOZ4CnJzr94xDSeteUB6B9WEnbjicm+HF+dmetJAVYMnAxaIqsZI9+C/rH2YnP/Yp1rIPlergBVfbhXwtE14I+49B4qI= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1580.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(33656002)(15650500001)(508600001)(8936002)(38100700002)(38070700005)(186003)(26005)(5660300002)(30864003)(2906002)(55016003)(8676002)(316002)(76116006)(19627235002)(66946007)(86362001)(64756008)(4326008)(107886003)(66446008)(66476007)(54906003)(110136005)(66556008)(52536014)(6506007)(82960400001)(7696005)(53546011)(9686003)(71200400001)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?PcDLwcNStE+KPVvwFByUrpgBUY7vu2Cb9hR6u0qNrv/D+pqbjxiN5+5mTznq?= =?us-ascii?Q?WONVTsrt2jxgzd/4f3xQgMgGxU4U70HQ8MfYROL6JVhlcDCuOgquqMgJMceg?= =?us-ascii?Q?/NmYjykbJvXv7z9NXgwHtb9sUE7tRMaOTV2FLsfi3GoG43Z37pWsdiZX5wlQ?= =?us-ascii?Q?MDxSIAJr9hMuMAC0IVAuK4VIieQ+CRYLJYxlRlRC9XiwNJvHR1/BZs6kDycL?= =?us-ascii?Q?u1MpMAubw8elI6qGhrUtCfZJNZdrplAK0s4lfdXSGIfLJRkv1zsrPnSUNZGQ?= =?us-ascii?Q?a+m7UjnYYCWk9R99DTt9YR9LimeurAlw0oi5lExHZyC3jLJ+C6CZTI1oW7/z?= =?us-ascii?Q?Ou0CUSkG1ic8ypYK6iZDc6zGZRqL1JIqxPd9Wk3H+7bqymtP0KZ0krdtg/bQ?= =?us-ascii?Q?8IiUpuup+2V3EnAd6wbhK4GargvZqHMcAjDkrForvsMBCJ+PkfJrpLju23PJ?= =?us-ascii?Q?kOYDHz0Zx88djtgjt50vML1EooR08iyhILSj4IIH1riTS5l2QUPDtq0tmEZL?= =?us-ascii?Q?y+Z0XdiMYOAUfwwloRza5EhhHx44UQhahTozGeTN7/E4JIzReNNFZwDW78My?= =?us-ascii?Q?MvAiESvgxcW7KwWqIWE8DQC7Fm1ekzN85kBv1carHvagfgW2zwM1/bMMaKhE?= =?us-ascii?Q?cHE3NBal30eTqe99P9grtC+x0rdTW3n+QJQ5NKCpx1XdPT9ywNFjVjvB7xvd?= =?us-ascii?Q?F8r0NMCNKieg8NxE8+V+OC2BhegUmCMrkJZs2BVeHRqt409QitV75Ui5E1dn?= =?us-ascii?Q?bsrFMZaI+cptRg4HqhHzD5uuADTPOLFLjruZoViB2+EcGsU2d2uE7X7W74Sa?= =?us-ascii?Q?s8At/QI9TGsXrpiBGmErGwYq7/akELeO8QakFaqAVg5MCARrNlfmtkl78rMX?= =?us-ascii?Q?tXJCGStEgPDQSs4VMBLPNR0HitoNUGqLurMT8+IhISbcIFmUdXe+2z28Jb3h?= =?us-ascii?Q?7KszDlU5wfUM4vMkx+almpznCFwYp25npM2jXUn/UdnAp/2Qf35Fan2z4mIl?= =?us-ascii?Q?rwPqsLBUB13jcsd3M+thw1ldqTE+J2RD1gzs2ifCf/LWA889l4rOM/K/kILk?= =?us-ascii?Q?ex6MdbL86qXFplaRXjRk7q/ao3cIdu6C1YjXEap6psABoXhkNS88JSD2oH7e?= =?us-ascii?Q?9qqMXThLVsoOrAiJ81667b6UrXfLgq2Ls6UYvFAf8dDgL1o9vZm7HwzQ5BYB?= =?us-ascii?Q?bzEFGxY+X0oWRjl+pqUwxcxXnRtvHGTtu1sL6iBmnaYOa2E9jh8zpwRi9ZSA?= =?us-ascii?Q?mQhV9l2EJJWDkf3AWZbvuIiU2ZeX3c2+mfUjrmGL/HrUFLhSql8dWDMxUzA5?= =?us-ascii?Q?BAxiOiq60tFH8YZgZ1hOAkcut65zofpzF5EqLMeuJHLr94ys9LbjcGOk/NXQ?= =?us-ascii?Q?Hsi4HqnS4fTb7msKlmONZPb++HcmRfi9IJXnbOFPciqgj3zXpTtz13VDe1/+?= =?us-ascii?Q?g9pSTS65RtEPhVxcXJq/y2Yqv3SF6B4fxKp4/6f6d2Wbk9xsVbE2Sxmuo+4u?= =?us-ascii?Q?Fsubt0MCOGz3024C4qsmNEqlCeQ2io6sABNJbYPSGFsPnJaFV0YnF8FnnmWx?= =?us-ascii?Q?VzNtPsHEfECR1HYh4n+eZ8UzrPor3yoZaFw5k2O7ZxuaJX7BatIuANFQGUG0?= =?us-ascii?Q?rERcNwFJBUK9GXW7wN06/V4p7l/vFtbfZ5Mxr5COZ1oU30NxQ7VYwxTWy45p?= =?us-ascii?Q?1hQpo2xreYCqaj+yUkKOfmM0k9ydgtWe7wtdBG/UC6f6HoRSLuwmp3I3uCSh?= =?us-ascii?Q?i6c42hPSZA=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1580.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed9818ba-11e8-4deb-c9a3-08da1b802c67 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2022 05:57:33.8922 (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: LWy8eNRtwe7x5zYYOSUKFT2pxRIiJ11SMbGyDrIjWrjyEq9SXideQDDHRoQg6/SsKG9RNjeI+O/C91d0gaxFQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2741 Return-Path: bo-changx.ke@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Got it, I'll split it, thank you Best Regards. -----Original Message----- From: Ni, Ray =20 Sent: Monday, April 11, 2022 1:55 PM 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 fie= lds 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=20 > ; Kinney, Michael D=20 > ; Liu, Zhiguang ;=20 > Ni, Ray ; Gao, Zhichao ;=20 > Zeng, Star > Subject: RE: [PATCH] ShellPkg: Update smbiosview type 9 with SMBIOS=20 > 3.5 fields >=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=20 > fields >=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=20 > b/MdePkg/Include/IndustryStandard/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,=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=20 > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index b144600a25..0fa40dbe0c 100644 > ---=20 > 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=20 > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c > index c4a6acb167..96e0e4036a 100644 > ---=20 > 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=20 > +(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=20 > +(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=20 > +(STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT),=20 > +gShellDebug1HiiHandle); > + PRINT_INFO_OPTION (Length, Option); > + PRINT_TABLE_ITEM (SystemSlotHeightTable, Length); } > + > /** > Display On Board Devices Information (Type 10) types. >=20 > diff --git=20 > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h > index 5111d35f63..5f062762b3 100644 > ---=20 > 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=20 > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStr > ings.uni=20 > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStr > ings.uni > index 9433e8a25f..a8728d6abc 100644 > ---=20 > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStr > ings.uni > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosVie > +++ wS > +++ 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