From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.5323.1667184770235742067 for ; Sun, 30 Oct 2022 19:52:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=GWP6928X; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: hao.a.wu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667184770; x=1698720770; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YDkf2EDCCSX0RlNcn7uLMVjKoKYqxpVUJ89v4TqKqEo=; b=GWP6928XxZSqnpWSNom56QYZy5NaFN/pvxx1qOsl8lANdSSrN6NEElQy PVIX9cwIeYLWLWJ56kj48YkAgDDXGnXxcpt+DKeYAXaV3h0EtPptITQj3 YoFi9xyGKW+baVVYXIITL9NNhyHGok4z7kqaquKGbp5we0Oar1jb2Q+R2 b2Df441wWJkRxWb+QD9iNmDZMdQ+sxNF3eY6TNFq4Romo5+WR8XO2ceD8 2QiyJPYvjWh6GvQkJQxqFwpks0w34bF/w//PbVtqKHrR7CKIJv6sFaLU5 P0nfjqLAC/KTNg0xoBisMUl+IEwzqBXLh0ae0Dqxm+rec2ZuQkf3DVRtH w==; X-IronPort-AV: E=McAfee;i="6500,9779,10516"; a="309891609" X-IronPort-AV: E=Sophos;i="5.95,227,1661842800"; d="scan'208";a="309891609" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2022 19:52:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10516"; a="738790727" X-IronPort-AV: E=Sophos;i="5.95,227,1661842800"; d="scan'208";a="738790727" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga002.fm.intel.com with ESMTP; 30 Oct 2022 19:52:49 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sun, 30 Oct 2022 19:52:49 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.2375.31; Sun, 30 Oct 2022 19:52:48 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Sun, 30 Oct 2022 19:52:48 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Sun, 30 Oct 2022 19:52:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jhhjpeMnH12gZThPvM0XzVwF3cNohn7bfTluqIw+LYmP3FVNlqWoUOWE4MxTi6x3eF33XUnfXmnTFYRT5qdyBRm+E0K49lH+bLdx2/kVQC6vTmLM9zdxNAzTnYAsaUaR+DPCgLm+L1AI7J2ioNAIdT32KZuR+M5bC7QiS6MqBsCBnZo66FMrTqg5lm6TJWLiahYp7MnU14RQ6ATumrlGx0Dk82RBS4XgAsaaDX9my1+rY8anBIObVQ2IMeNC6VztTZAgDQHZaQZPTYACr/AvjyFvGfrmPyQh6CARhl3wYASDXDmr8P0KwcTde0wmRfLGwX6FMB5c7y/pJRYO9x9hsw== 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=yWXAuxDfPE1VDyhEGx/ePVLy0Ncm+SWEMIEsPhftlzA=; b=lkznZyfsQmsexwGRWLpjw+W+s5r724YHetuLAQVye4UOi7xJU77w+c+NCxok8p9/kaotHlhd4KioBnizUnSbgXmidPeqXttMs03j1d3znRvCtqVdAkMAovfgE+57S1iEHDdh5h5M3UCzW7NZYb0+dr4ibfYxJpFglbZwFxbMPo1ox+WK7VDB/vD5tf6Q+9UUuerF+CelFY3/J4W4ePbaI/P9MCnMHcobts9RfDCf7As4NZk9KBfkIP7JnLIy4IQ300ULm4jvsjjI2BjlLCKC/pxAG1rEdNcG7fRMSdRuNdrH2SQgyLpw/ju3W7W9/+yMtizHCQo3pScffyy7vRPzsA== 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 DM6PR11MB4025.namprd11.prod.outlook.com (2603:10b6:5:197::31) by CO1PR11MB5186.namprd11.prod.outlook.com (2603:10b6:303:9b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Mon, 31 Oct 2022 02:52:45 +0000 Received: from DM6PR11MB4025.namprd11.prod.outlook.com ([fe80::82ad:97fd:4cd6:b7ae]) by DM6PR11MB4025.namprd11.prod.outlook.com ([fe80::82ad:97fd:4cd6:b7ae%3]) with mapi id 15.20.5769.016; Mon, 31 Oct 2022 02:52:45 +0000 From: "Wu, Hao A" To: "devel@edk2.groups.io" , "Wu, Hao A" , "gopic@ami.com" CC: "Selvaraj, Sundaresan" , "Sambandan, Vasudevan" Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg/ScsiDiskDxe: Update proper device name for ScsiDisk drive Thread-Topic: [edk2-devel] [PATCH v2] MdeModulePkg/ScsiDiskDxe: Update proper device name for ScsiDisk drive Thread-Index: AQHY6dKt1c9zfKSYBUOqrMMgdLVtQK4jDfzggATF8FA= Date: Mon, 31 Oct 2022 02:52:44 +0000 Message-ID: References: <57ad249a7bf55fc175b6206ec91c597a969a06d5.1666851664.git.gopic@ami.com> In-Reply-To: Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB4025:EE_|CO1PR11MB5186:EE_ x-ms-office365-filtering-correlation-id: 0bae9ada-b5b0-4821-52e7-08dabaeafca0 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +uxxDJCx7WSN/Q2BiS2a7YY37z+ubMyySg0bRyGzPanzP/3Q+yDeRR5DEmCjRzhqi0Cund1kQvSq2HbdJaapG8Lh4NUKEZHvtBRmEBnR09g1SZhSFNNWwPiD0eablT8xGigGSIbReB3oPRrQ40d3dVXTh4b7A+np+Tn15jZx/rSElUlHRN1kx48w7z5XW8Qekn9T37Qi6iN8SRUPbcfzejsFBdwqt28o9fznSV9T/+IRDwHBSyM/MBSzIfl+Qri5iEiAAGiOXEN/Y+zwS9Bq506vDlecAFXYqPhhuQsVm2sLO2hjCU89g9cNsy6sa0IYuc51QG2HKhs1D6deR6pLpEk5NMpJ/ZYjHTzUNYfiEDrfLXR4HvQxNFaQOg2+nNPwMpPBfT0A/EqqbxoYHFv0ZvdBtFwQKNGB5JrHDMwHjihGbim4Z9BHAx4sRDrBZ5B67RWjdLKlFoDkXQYcoNacqbHFDmueDPMejHGrVh5UME9pShP3VnVf7akCAHJqOiVcYAsvgUaPaN4lLRLUckYZLtAo1crwZFP1x3tZMabZyRM2Q2Jcr21QRnHK6uZwGQi01aGrpRAofJbvjRQsRN4+Pjm4M/sNwHTihMcQPostJXcPleG7MJB9kIxnUE6UBltjTQx9Xe0tISnVzfRlkM4mwETr42rONuSvc1BqmvGa5D6hptXbzqH3sm+QBJf9gbyaw9LOkbAFQsm9I3DThaOy037n7hA4sJVscTtj+j8m0YG4OBov1Sse3j3D++/n0yVoyYVbolrhSYMxx3e2PGvlzpWZYq0bbK8mbIkjl5f/wT+Ag8c1FJ7CrHiA0RsS7ffC0MmYk+AF3faDNep6vxHE6Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4025.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(136003)(396003)(376002)(346002)(39860400002)(451199015)(66899015)(83380400001)(55016003)(86362001)(15650500001)(966005)(2906002)(71200400001)(82960400001)(38070700005)(122000001)(38100700002)(33656002)(40140700001)(186003)(9686003)(53546011)(26005)(8676002)(66476007)(76116006)(316002)(66556008)(66946007)(66446008)(64756008)(4326008)(478600001)(6506007)(52536014)(7696005)(41300700001)(8936002)(110136005)(5660300002)(54906003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?oEOJ4SD+YHks/dPmoNhLvrZ8j+ZpDBElgL3f2ary/mWINMGkyMEGzGFebq+F?= =?us-ascii?Q?40iJ/mt0BpDlhl4XzJGNApzTkWQ1fUEx/rNJmniyEe8FRroSO9Omla4898Hb?= =?us-ascii?Q?EW5i5BZaHlzUTlVbd/Sj1nOd0hoSRvgK1D5MTKccFonwgaGUOGu/xBDz3o8L?= =?us-ascii?Q?FfZLIPvweqkimmeauhtsvuUFAd8zGMNlzizZrUZRJRfmuqg+WJtvz6E+ODZy?= =?us-ascii?Q?i6zmeFYjAUOeP3d8a7Pl9h7XkY4Y4Wbplw7deEcZssGDWIzz0LagjNMZDbL1?= =?us-ascii?Q?e183D3xf0i2lsGtNFvb8kMjNL2xCesgT3oih9WmljlxYpRwb72RmPPfjf0+M?= =?us-ascii?Q?+4wtJNCditGMxjJFYu4lP2RsdmOBR5duqNuE4A4PeULO+W8drZ0Y1wGEPUGn?= =?us-ascii?Q?Qf5XRNHwP8XE4cAMJBODsfijZ9tNxuD/Clsi6IcysqZlc1kalOJzInw4w+Za?= =?us-ascii?Q?A4OJKgrXFWbgPQ6LyfNLmCiD9cams2HGtLxO3/+iZrA3QWDy+qSkpz5XpKE2?= =?us-ascii?Q?DAWzexzSBJXKtVgwzdpaDmC3moBs0nH+gX9M583v1TNCSfuPedHePV/drTPf?= =?us-ascii?Q?Lwz95iiw6ULy3LYQueeHzpkBeaxQwl30tE9fE8u5NbkNPrnuioNODfRZyP9O?= =?us-ascii?Q?jea0+99TZYPtCdHo93szWfcbdRsLnpg8mFIdWLpIo1THHZFJirOWkv+dUr9X?= =?us-ascii?Q?j8DGE1CfvgnmA/jO8QOo6XJ4XPv8FnvTyNE1tvtk7hA+BGeTY1jLyHcOf4L9?= =?us-ascii?Q?nSsYFw5oa6iHO5ZfTNimgydDa5fjVTMHxEXV4vfec56XtZb4TOJ+8lBAh4ES?= =?us-ascii?Q?LQJ6lrUbaWSONA96x7Zs1WVLkq3dC6rO5Rhu37hPwMZhYauhGUnn2lIm7y69?= =?us-ascii?Q?fd8zfkieSoI87OC6dhDwO2ISYy6z0k7O0iFiVwpXcx7tmcOGeLbg7Wil6XCS?= =?us-ascii?Q?pwFEev9oKIzuxvNM9PnSboOWaD3uZjCG5xtG84alXtzpXGd9dgSXaGEq9ilw?= =?us-ascii?Q?Ksb/w/TrHBWxhntgfV2ed4QpbhHUBC8+ic9Cz0tg9T0Rp+5VExw+cC+VmUiI?= =?us-ascii?Q?/zSM4It6hPrLiYhgwGUWBVDRDXZ9/MQlThhJTWNGZdUVgG/zp/G7T5eVfZTe?= =?us-ascii?Q?/+rI6kfS7Z3ycct9wYjZGRBZHviJPpzllq0hhCocq071OjH7z/3eXgdeuTSY?= =?us-ascii?Q?D0/oa7BNOLIrcVoXi0jBcXnXW9AnuhuLArMeVju9pbi2B0Uj1BTHOv0BAodf?= =?us-ascii?Q?cickv1n28X5F7EhXQ8WTO1gF1W2LGzb38bOsMw0KBHz7yOgGNMxJSnxoL0EO?= =?us-ascii?Q?c22VhnfiDPcuVHjybdhfyUyWqNWjHGAjt8UuUB5+v8+E8tTr0Msg9heFzIQt?= =?us-ascii?Q?mV2SBiiThJsoJfgag0x0B0CBe6sNwvCnVwWgl/N2jMPZ0RkAuMZF+SGNJRof?= =?us-ascii?Q?le5d3zQ16+oqu889nMDHlDq740q26O/rLJkNi5MyYu8otSl3nHbHcx5aC9KW?= =?us-ascii?Q?Mb7Wfhf/6JIqaBnfGv0KV+1A7yK3gLZXvjoDkQrhUH0fclB2Qaz+x4BCm5qS?= =?us-ascii?Q?FUZl+GpYZ+N8OK/xVRrmE+TN7v7QJYz/dVna0gh0?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4025.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0bae9ada-b5b0-4821-52e7-08dabaeafca0 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2022 02:52:44.9669 (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: BbmopLjRxAsOrj3UKJpnWh0siMLyCXh6o66XcJ8u1lT5A8g8GxaE3vgv+4dGZ8rtmdAb8mP7hbq6lC9gqFeaSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5186 Return-Path: hao.a.wu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Merged via: PR - https://github.com/tianocore/edk2/pull/3559 Commit - https://github.com/tianocore/edk2/commit/52199bf5326a8355d28b2d395= db483f7c77d5a4d Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Wu, Hao A > Sent: Friday, October 28, 2022 10:26 AM > To: devel@edk2.groups.io; gopic@ami.com > Cc: Selvaraj, Sundaresan ; Sambandan, Vasudevan > > Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg/ScsiDiskDxe: Update > proper device name for ScsiDisk drive >=20 > Thanks. > Reviewed-by: Hao A Wu >=20 > Will wait a couple of days before merging to see if comments from other > reviewers. >=20 > Best Regards, > Hao Wu >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of > > Cheripally Gopi via groups.io > > Sent: Thursday, October 27, 2022 3:07 PM > > To: devel@edk2.groups.io > > Cc: Selvaraj, Sundaresan ; Sambandan, Vasudevan > > ; Cheripally Gopi > > Subject: [edk2-devel] [PATCH v2] MdeModulePkg/ScsiDiskDxe: Update > > proper device name for ScsiDisk drive > > > > ScsiDiskDxe driver updates ControllerNameTable with common string > > "SCSI Disk Device" for all SCSI disks. Due to this, when multiple SCSI > > disk devices connected, facing difficulty in identifying correct SCSI > > disk device. As per SCSI spec, standard Inquiry Data is having the > > fields to know Vendor and Product information. Updated > > "ControllerNameTable" with Vendor and Product information. So that, > > device specific name can be retrieved using ComponentName protocol. > > > > Cc: Vasudevan Sambandan > > Cc: Sundaresan Selvaraj > > Signed-off-by: Cheripally Gopi > > --- > > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 53 > > ++++++++++++++++++- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h | 9 > ++++ > > .../Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf | 2 + > > 3 files changed, 62 insertions(+), 2 deletions(-) > > > > diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > index 98e84b4ea8..0928605dc4 100644 > > --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > @@ -2,6 +2,7 @@ > > SCSI disk driver that layers on every SCSI IO protocol in the system= . > > > > > > > > Copyright (c) 2006 - 2019, Intel Corporation. All rights > > reserved.
> > > > +Copyright (c) 1985 - 2022, American Megatrends International LLC.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > > **/ > > > > @@ -67,6 +68,33 @@ FreeAlignedBuffer ( > > } > > > > } > > > > > > > > +/** > > > > + Remove trailing spaces from the string. > > > > + > > > > + @param String The ASCII string to remove the trailing spaces. > > > > + > > > > + @retval the new length of the string. > > > > +**/ > > > > +UINTN > > > > +RemoveTrailingSpaces ( > > > > + IN OUT CHAR8 *String > > > > + ) > > > > +{ > > > > + UINTN Length; > > > > + > > > > + Length =3D AsciiStrLen (String); > > > > + if (Length =3D=3D 0) { > > > > + return 0; > > > > + } > > > > + > > > > + while ((Length > 0) && (String[Length-1] =3D=3D ' ')) { > > > > + Length--; > > > > + } > > > > + > > > > + String[Length] =3D '\0'; > > > > + return Length; > > > > +} > > > > + > > > > /** > > > > The user Entry Point for module ScsiDisk. > > > > > > > > @@ -203,6 +231,9 @@ ScsiDiskDriverBindingStart ( > > UINT8 MaxRetry; > > > > BOOLEAN NeedRetry; > > > > BOOLEAN MustReadCapacity; > > > > + CHAR8 VendorStr[VENDOR_IDENTIFICATION_LENGTH + 1]; > > > > + CHAR8 ProductStr[PRODUCT_IDENTIFICATION_LENGTH + 1]; > > > > + CHAR16 DeviceStr[VENDOR_IDENTIFICATION_LENGTH + > > PRODUCT_IDENTIFICATION_LENGTH + 2]; > > > > > > > > MustReadCapacity =3D TRUE; > > > > > > > > @@ -354,19 +385,37 @@ ScsiDiskDriverBindingStart ( > > } > > > > } > > > > > > > > + CopyMem ( > > > > + VendorStr, > > > > + &ScsiDiskDevice- > > >InquiryData.Reserved_5_95[VENDOR_IDENTIFICATION_OFFSET], > > > > + VENDOR_IDENTIFICATION_LENGTH > > > > + ); > > > > + VendorStr[VENDOR_IDENTIFICATION_LENGTH] =3D 0; > > > > + RemoveTrailingSpaces (VendorStr); > > > > + > > > > + CopyMem ( > > > > + ProductStr, > > > > + &ScsiDiskDevice- > > >InquiryData.Reserved_5_95[PRODUCT_IDENTIFICATION_OFFSET], > > > > + PRODUCT_IDENTIFICATION_LENGTH > > > > + ); > > > > + ProductStr[PRODUCT_IDENTIFICATION_LENGTH] =3D 0; > > > > + RemoveTrailingSpaces (ProductStr); > > > > + > > > > + UnicodeSPrint (DeviceStr, sizeof (DeviceStr), L"%a %a", > > + VendorStr, > > ProductStr); > > > > + > > > > ScsiDiskDevice->ControllerNameTable =3D NULL; > > > > AddUnicodeString2 ( > > > > "eng", > > > > gScsiDiskComponentName.SupportedLanguages, > > > > &ScsiDiskDevice->ControllerNameTable, > > > > - L"SCSI Disk Device", > > > > + DeviceStr, > > > > TRUE > > > > ); > > > > AddUnicodeString2 ( > > > > "en", > > > > gScsiDiskComponentName2.SupportedLanguages, > > > > &ScsiDiskDevice->ControllerNameTable, > > > > - L"SCSI Disk Device", > > > > + DeviceStr, > > > > FALSE > > > > ); > > > > return EFI_SUCCESS; > > > > diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h > > b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h > > index d54282df5f..5b4047e1db 100644 > > --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h > > +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h > > @@ -2,6 +2,7 @@ > > Header file for SCSI Disk Driver. > > > > > > > > Copyright (c) 2004 - 2019, Intel Corporation. All rights > > reserved.
> > > > +Copyright (c) 1985 - 2022, American Megatrends International LLC.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > > **/ > > > > @@ -30,6 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > #include > > > > #include > > > > #include > > > > +#include > > > > > > > > #include > > > > #include > > > > @@ -179,6 +181,13 @@ extern EFI_COMPONENT_NAME2_PROTOCOL > > gScsiDiskComponentName2; #define SCSI_COMMAND_VERSION_2 0x02 > > > > #define SCSI_COMMAND_VERSION_3 0x03 > > > > > > > > +// Per SCSI spec, EFI_SCSI_INQUIRY_DATA.Reserved_5_95[3 - 10] has the > > Vendor identification > > > > +// EFI_SCSI_INQUIRY_DATA.Reserved_5_95[11 - 26] has the product > > identification > > > > +#define VENDOR_IDENTIFICATION_OFFSET 3 > > > > +#define VENDOR_IDENTIFICATION_LENGTH 8 > > > > +#define PRODUCT_IDENTIFICATION_OFFSET 11 > > > > +#define PRODUCT_IDENTIFICATION_LENGTH 16 > > > > + > > > > // > > > > // SCSI Disk Timeout Experience Value > > > > // > > > > diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > index 40818e669b..26227132e8 100644 > > --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > > @@ -4,6 +4,7 @@ > > # the device handle. > > > > # > > > > # Copyright (c) 2006 - 2019, Intel Corporation. All rights > > reserved.
> > > > +# Copyright (c) 1985 - 2022, American Megatrends International > > +LLC.
> > > > # SPDX-License-Identifier: BSD-2-Clause-Patent > > > > # > > > > ## > > > > @@ -46,6 +47,7 @@ > > UefiDriverEntryPoint > > > > DebugLib > > > > DevicePathLib > > > > + PrintLib > > > > > > > > [Protocols] > > > > gEfiDiskInfoProtocolGuid ## BY_START > > > > -- > > 2.33.0.windows.2 > > -The information contained in this message may be confidential and > > proprietary 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 designee. If the reader of this message is not > > the intended recipient, you are on notice that any distribution of this= message, > in any form, is strictly prohibited. > > 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 transmissio= n. > > > > > > > > >=20 >=20 >=20 >=20 >=20