From nobody Mon Dec 23 14:18:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1516345496399431.628626812985; Thu, 18 Jan 2018 23:04:56 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 29B712234433E; Thu, 18 Jan 2018 22:59:32 -0800 (PST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 959AE2234433B for ; Thu, 18 Jan 2018 22:59:30 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2018 23:04:49 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.19]) by orsmga004.jf.intel.com with ESMTP; 18 Jan 2018 23:04:48 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,380,1511856000"; d="scan'208";a="167400430" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Fri, 19 Jan 2018 15:04:45 +0800 Message-Id: <20180119070445.428464-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.1.windows.2 Subject: [edk2] [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: , Cc: Feng Tian , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: 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 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel