From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Star Zeng <star.zeng@intel.com>
Subject: [PATCH 2/5] MdeModulePkg/UsbMass: Revert "map -r" media change detection fix
Date: Fri, 2 Mar 2018 19:54:34 +0800 [thread overview]
Message-ID: <20180302115437.140240-3-ruiyu.ni@intel.com> (raw)
In-Reply-To: <20180302115437.140240-1-ruiyu.ni@intel.com>
This reverts commit a662afb5b023a187ef638d3cb0e0c313ad39a7fc.
* MdeModulePkg/UsbStorage: Fix "map -r" cannot detect media change
The above commit fixed the following issue:
When system boots to Shell without CDROM inside USB CDROM drive,
and then user inserts the CDROM with Eltorito file system,
"map -r" cannot show the new ELtorito file system.
The commit caused EFI_MEDIA_CHANGED status returned from
UsbBootDetectMedia().
But that fix exposes another issue:
When issuing ReadCapacity command to certain USB key
(Kingston DataTraveler G3 8GB) after it's hot-plugged, USB device
returns STALL error and RequestSense command returns media changed
sense data. (Most of the USB keys return SUCCESS for ReadCapacity
command after hot-plug.)
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
---
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 613008bde7..a8b6a1c5f1 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 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
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,10 +630,8 @@ UsbBootGetParams (
{
EFI_BLOCK_IO_MEDIA *Media;
EFI_STATUS Status;
- UINT8 CmdSet;
Media = &(UsbMass->BlockIoMedia);
- CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;
Status = UsbBootInquiry (UsbMass);
if (EFI_ERROR (Status)) {
@@ -668,18 +666,9 @@ UsbBootGetParams (
Media->BlockSize = 0x0800;
}
- if ((UsbMass->Pdt != USB_PDT_CDROM) && (CmdSet == USB_MASS_STORE_SCSI)) {
- //
- // 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);
- }
+ Status = UsbBootDetectMedia (UsbMass);
- return UsbBootReadCapacity (UsbMass);
+ return Status;
}
@@ -710,7 +699,7 @@ UsbBootDetectMedia (
CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;
Status = UsbBootIsUnitReady (UsbMass);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) && (Status != EFI_MEDIA_CHANGED)) {
goto ON_ERROR;
}
--
2.16.1.windows.1
next prev parent reply other threads:[~2018-03-02 11:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 11:54 [PATCH 0/5] Fix UsbMassStorage driver for device compatibility Ruiyu Ni
2018-03-02 11:54 ` [PATCH 1/5] MdeModulePkg/UsbMass: Revert POWER_ON(29h) ASC handling logic Ruiyu Ni
2018-03-02 11:54 ` Ruiyu Ni [this message]
2018-03-02 11:54 ` [PATCH 3/5] MdeModulePkg/UsbMass: Add more debug message Ruiyu Ni
2018-03-02 11:54 ` [PATCH 4/5] MdeModulePkg/UsbMass: remove unnecessary RestoreTPL() call Ruiyu Ni
2018-03-02 11:54 ` [PATCH 5/5] MdeModulePkg/UsbMass: Retry CMD for MediaChanged sense key Ruiyu Ni
2018-03-03 7:22 ` [PATCH 0/5] Fix UsbMassStorage driver for device compatibility Zeng, Star
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302115437.140240-3-ruiyu.ni@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox