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.115; helo=mga14.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 9E4C522546BBF for ; Fri, 2 Mar 2018 03:48:30 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2018 03:54:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="24581947" Received: from unknown (HELO ray-dev.ccr.corp.intel.com) ([10.239.9.44]) by fmsmga002.fm.intel.com with ESMTP; 02 Mar 2018 03:54:39 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Star Zeng Date: Fri, 2 Mar 2018 19:54:33 +0800 Message-Id: <20180302115437.140240-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180302115437.140240-1-ruiyu.ni@intel.com> References: <20180302115437.140240-1-ruiyu.ni@intel.com> Subject: [PATCH 1/5] MdeModulePkg/UsbMass: Revert POWER_ON(29h) ASC handling logic 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, 02 Mar 2018 11:48:31 -0000 This reverts commit 6461344c318cd43a5494c0302e142a0cbe386d52. * MdeModulePkg/UsbMass: Fix hot-plug USB CDROM can't be recognized UsbBootExecCmd() only calls UsbBootRequestSense() to get sense key when CMD fails. When POWER ON (29h) ASC returns from REQUEST SENSE, implementation should retry the CMD, instead of treating this as a SUCCESS. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Star Zeng --- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | 2 -- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c index 12e68d2149..613008bde7 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c @@ -124,8 +124,6 @@ UsbBootRequestSense ( Status = EFI_NOT_READY; } else if (SenseData.Asc == USB_BOOT_ASC_NO_MEDIA) { Status = EFI_NOT_READY; - } else if (SenseData.Asc == USB_BOOT_ASC_POWER_ON) { - Status = EFI_SUCCESS; } break; diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h index 5ee50ac52a..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 - 2018, 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 @@ -55,7 +55,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #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_POWER_ON 0x29 // // Supported PDT codes, or Peripheral Device Type -- 2.16.1.windows.1