From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 33366203555E2 for ; Mon, 13 Nov 2017 16:59:21 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 17:03:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,392,1505804400"; d="scan'208";a="175432045" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga005.fm.intel.com with ESMTP; 13 Nov 2017 17:03:23 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 13 Nov 2017 17:03:22 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 13 Nov 2017 17:03:22 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0319.002; Tue, 14 Nov 2017 09:03:20 +0800 From: "Zeng, Star" To: "Kinney, Michael D" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Zeng, Star" Thread-Topic: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix USB Mass Storage detection Thread-Index: AQHTWN1WDk7pFYSHTka1PiiZrEzVKKMSBWUQgAAFUACAAC+sAIAA3G3g Date: Tue, 14 Nov 2017 01:03:19 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B4CA9@shsmsx102.ccr.corp.intel.com> References: <20171108220249.15404-1-michael.d.kinney@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B4922@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix USB Mass Storage detection X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 00:59:22 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ok, Reviewed-by: Star Zeng to this patch. Thanks, Star -----Original Message----- From: Kinney, Michael D=20 Sent: Tuesday, November 14, 2017 3:54 AM To: Zeng, Star ; edk2-devel@lists.01.org; Kinney, Mich= ael D Cc: Dong, Eric Subject: RE: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix USB Mass Storage d= etection Star, The specific USB mass storage device that demonstrated this issue has a Pro= tocol of 0x00 (CBI), and the PEI phase USB recovery seems to only support a= Protocol of 0x50 (BOT). So I am not able to reproduce the issue in PEI re= covery path. >>From code review, the PEI request sense API collects sense data until no mo= re is available. If there is none on the first attempt, EFI_SUCCESS is ret= urned with a count of 0. This case appears to be processed correctly by the code that calls PeiUsbRe= questSense(). I do not think any additional code changes are required. Thanks, Mike > -----Original Message----- > From: Kinney, Michael D > Sent: Monday, November 13, 2017 9:03 AM > To: Zeng, Star ; edk2- devel@lists.01.org;=20 > Kinney, Michael D > Cc: Dong, Eric > Subject: RE: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix USB Mass=20 > Storage detection >=20 > Star, >=20 > No. I have not evaluated the PEI use case. >=20 > I will test that and provide an updated patch if needed. >=20 > Thanks, >=20 > Mike >=20 > > -----Original Message----- > > From: Zeng, Star > > Sent: Monday, November 13, 2017 1:22 AM > > To: Kinney, Michael D ; > edk2- > > devel@lists.01.org > > Cc: Dong, Eric ; Zeng, Star=20 > > > > Subject: RE: [Patch] MdeModulePkg/UsbMassStorageDxe: > Fix > > USB Mass Storage detection > > > > Mike, > > > > Have you evaluated whether the code in > > PeiUsbRequestSense() of PeiAtapi.c also needs to be updated? > > > > > > Thanks, > > Star > > -----Original Message----- > > From: Kinney, Michael D > > Sent: Thursday, November 9, 2017 6:03 AM > > To: edk2-devel@lists.01.org > > Cc: Zeng, Star ; Dong, Eric > > > > Subject: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix > USB > > Mass Storage detection > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D766 > > > > Update logic to not return an error from > > UsbBootRequestSense() if a Request Sense command > responds > > with no sense information. > > It is legal for a USB mass storage device to respond to > a > > Request Sense command with a SenseKey of > > USB_BOOT_SENSE_NO_SENSE and an Additional Sense Code of > > USB_BOOT_ASC_NO_ADDITIONAL_SENSE_INFORMATION. > > > > This is described in Section 3.3 of the Universal > Serial > > Bus Mass Storage Specification For Bootability: > > > > > http://www.usb.org/developers/docs/devclass_docs/usb_msc_ > > boot_1.0.pdf > > > > The previous logic returned an error of EFI_NO_RESPONSE > > and this caused USB mass storage devices such as a USB > > floppy drive to not be detected. > > > > Cc: Star Zeng > > Cc: Eric Dong > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Michael D Kinney > > > > --- > > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | > > 11 +++++++++-- > > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h | > 9 > > +++++---- > > 2 files changed, 14 insertions(+), 6 deletions(-) > > > > diff --git > > a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c > > b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c > > index 0c46f888eb..2eb30f0c5f 100644 > > --- > > a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c > > +++ > > b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c > > @@ -2,7 +2,7 @@ > > Implementation of the command set of USB Mass > Storage > > Specification > > for Bootability, Revision 1.0. > > > > -Copyright (c) 2007 - 2016, Intel Corporation. All > rights > > reserved.
> > +Copyright (c) 2007 - 2017, Intel Corporation. All > rights > > reserved.
> > This program and the accompanying materials are > > licensed and made available under the terms and > > conditions of the BSD License which accompanies this > > distribution. The full text of the license may be > found > > at @@ -80,7 +80,14 @@ UsbBootRequestSense ( > > switch (USB_BOOT_SENSE_KEY (SenseData.SenseKey)) { > > > > case USB_BOOT_SENSE_NO_SENSE: > > - Status =3D EFI_NO_RESPONSE; > > + if (SenseData.Asc =3D=3D > > USB_BOOT_ASC_NO_ADDITIONAL_SENSE_INFORMATION) { > > + // > > + // It is not an error if a device does not have > > additional sense information > > + // > > + Status =3D EFI_SUCCESS; > > + } else { > > + Status =3D EFI_NO_RESPONSE; > > + } > > break; > > > > case USB_BOOT_SENSE_RECOVERED: > > diff --git > > a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h > > b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h > > index c4082558fa..13a926035c 100644 > > --- > > a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h > > +++ > > b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h > > @@ -2,7 +2,7 @@ > > Definition of the command set of USB Mass Storage > > Specification > > for Bootability, Revision 1.0. > > > > -Copyright (c) 2007 - 2012, Intel Corporation. All > rights > > reserved.
> > +Copyright (c) 2007 - 2017, Intel Corporation. All > rights > > reserved.
> > This program and the accompanying materials are > > licensed and made available under the terms and > > conditions of the BSD License which accompanies this > > distribution. The full text of the license may be > found > > at @@ -51,9 +51,10 @@ WITHOUT WARRANTIES OR > > REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > > #define USB_BOOT_SENSE_VOLUME_OVERFLOW 0x0D ///< > > Partition overflow > > #define USB_BOOT_SENSE_MISCOMPARE 0x0E ///< > Source > > data mis-match while verfying. > > > > -#define USB_BOOT_ASC_NOT_READY 0x04 > > -#define USB_BOOT_ASC_NO_MEDIA 0x3A > > -#define USB_BOOT_ASC_MEDIA_CHANGE 0x28 > > +#define USB_BOOT_ASC_NO_ADDITIONAL_SENSE_INFORMATION > > 0x00 > > +#define USB_BOOT_ASC_NOT_READY > > 0x04 > > +#define USB_BOOT_ASC_NO_MEDIA > > 0x3A > > +#define USB_BOOT_ASC_MEDIA_CHANGE > > 0x28 > > > > // > > // Supported PDT codes, or Peripheral Device Type > > -- > > 2.14.2.windows.3