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.65; helo=mga03.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 4B23322344336 for ; Thu, 18 Jan 2018 23:39:49 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2018 23:45:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,380,1511856000"; d="scan'208";a="27740548" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 18 Jan 2018 23:45:11 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 18 Jan 2018 23:45:11 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.189]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Fri, 19 Jan 2018 15:45:09 +0800 From: "Zeng, Star" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Tian, Feng" , "Zeng, Star" Thread-Topic: [PATCH] MdeModulePkg/UsbStorage: Fix "map -r" cannot detect media change Thread-Index: AQHTkPPYZpOnWfirsUOxVbN6qBWcTaN60NzA Date: Fri, 19 Jan 2018 07:45:08 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9FED82@shsmsx102.ccr.corp.intel.com> References: <20180119070445.428464-1-ruiyu.ni@intel.com> In-Reply-To: <20180119070445.428464-1-ruiyu.ni@intel.com> 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/UsbStorage: Fix "map -r" cannot detect media change X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 07:39:50 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng Thanks, Star -----Original Message----- From: Ni, Ruiyu=20 Sent: Friday, January 19, 2018 3:05 PM To: edk2-devel@lists.01.org Cc: Tian, Feng ; Zeng, Star Subject: [PATCH] MdeModulePkg/UsbStorage: Fix "map -r" cannot detect media = change When system boots to Shell without CDROM in the USB CDROM drive, and then user inserts one CDROM with Eltorito file system, "map -r" cannot show the the new Eltorito file system. The root cause is when "map" command probes the media change by calling dummy ReadBlockIo(), UsbMassStorage ReadBlockIo() contains a bug that ignores the media change status: UsbBootDetectMedia() ignores the EFI_MEDIA_CHANGED status returned from UsbBootIsUnitReady(), in consequence, the BlockIo protocol re-installation logic doesn't run. By checking the code change history, below commit SHA-1: 19bc85276559ae01996fa0918ec3f6495e7aaa69 * remove unnecessary retry logic from usb mass storage driver. adds the code to skip EFI_MEDIA_CHANGED status. Talking with the original committer Tian Feng, he said the change was just a code cleanup, not for a special bug fix. So I revert part of the patch, only keep the change that removes unnecessary retry logic. It can fix this bug. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Feng Tian Cc: Star Zeng --- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | 19 +++++++++++++++-= --- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModu= lePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c index a8b6a1c5f1..613008bde7 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. =20 -Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2018, 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 @@ -630,8 +630,10 @@ UsbBootGetParams ( { EFI_BLOCK_IO_MEDIA *Media; EFI_STATUS Status; + UINT8 CmdSet; =20 Media =3D &(UsbMass->BlockIoMedia); + CmdSet =3D ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->Interf= aceSubClass; =20 Status =3D UsbBootInquiry (UsbMass); if (EFI_ERROR (Status)) { @@ -666,9 +668,18 @@ UsbBootGetParams ( Media->BlockSize =3D 0x0800; } =20 - Status =3D UsbBootDetectMedia (UsbMass); + if ((UsbMass->Pdt !=3D USB_PDT_CDROM) && (CmdSet =3D=3D USB_MASS_STORE_S= CSI)) { + // + // ModeSense is required for the device with PDT of 0x00/0x07/0x0E, + // which is from [MassStorageBootabilitySpec-Page7]. + // ModeSense(10) is useless here, while ModeSense(6) defined in SCSI + // could get the information of WriteProtected. + // Since not all device support this command, so skip if fail. + // + UsbScsiModeSense (UsbMass); + } =20 - return Status; + return UsbBootReadCapacity (UsbMass); } =20 =20 @@ -699,7 +710,7 @@ UsbBootDetectMedia ( CmdSet =3D ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->Interf= aceSubClass; =20 Status =3D UsbBootIsUnitReady (UsbMass); - if (EFI_ERROR (Status) && (Status !=3D EFI_MEDIA_CHANGED)) { + if (EFI_ERROR (Status)) { goto ON_ERROR; } =20 --=20 2.15.1.windows.2