From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 9EFA62035A7AC for ; Mon, 13 Nov 2017 11:49:39 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 11:53:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,389,1505804400"; d="scan'208";a="1837507" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga003.jf.intel.com with ESMTP; 13 Nov 2017 11:53:45 -0800 Received: from orsmsx114.amr.corp.intel.com (10.22.240.10) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 13 Nov 2017 11:53:45 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.80]) by ORSMSX114.amr.corp.intel.com ([169.254.8.48]) with mapi id 14.03.0319.002; Mon, 13 Nov 2017 11:53:45 -0800 From: "Kinney, Michael D" To: "Zeng, Star" , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: "Dong, Eric" Thread-Topic: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix USB Mass Storage detection Thread-Index: AQHTXGDoRwZ+c9dLMkaIfW+lxz91XKMSiW4QgAAt5NA= Date: Mon, 13 Nov 2017 19:53:44 +0000 Message-ID: References: <20171108220249.15404-1-michael.d.kinney@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B9B4922@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDQzZjFhNmItMDM0OC00M2Q5LWEwMmYtY2MyYmI2ODA3YjZjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJCcE1UTnUxY1hUTE5zWjVhek82Q0NvbCtwZFNjK1JtU3VNQ3B6b2dhcVd0K3R1aWJUejBlbDhTbVlkOG9FNTRTIn0= dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.138] 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: Mon, 13 Nov 2017 19:49:40 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star, The specific USB mass storage device that demonstrated this issue has a Protocol 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 recovery path. >>From code review, the PEI request sense API collects sense data until no more is available. If there is none on the=20 first attempt, EFI_SUCCESS is returned with a count of 0. This case appears to be processed correctly by the code that calls PeiUsbRequestSense(). 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; Kinney, Michael D > > Cc: Dong, Eric > Subject: RE: [Patch] MdeModulePkg/UsbMassStorageDxe: Fix > USB Mass 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 > > > > 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