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 ED74D2255D6D4 for ; Fri, 2 Mar 2018 03:48:32 -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:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,412,1515484800"; d="scan'208";a="24581960" 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:41 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Star Zeng Date: Fri, 2 Mar 2018 19:54:36 +0800 Message-Id: <20180302115437.140240-5-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 4/5] MdeModulePkg/UsbMass: remove unnecessary RestoreTPL() call 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:33 -0000 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Star Zeng --- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c index d212960bbc..dd4b3a5f0a 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c @@ -691,7 +691,6 @@ UsbBootDetectMedia ( EFI_BLOCK_IO_MEDIA OldMedia; EFI_BLOCK_IO_MEDIA *Media; UINT8 CmdSet; - EFI_TPL OldTpl; EFI_STATUS Status; Media = &UsbMass->BlockIoMedia; @@ -740,11 +739,10 @@ ON_ERROR: (Media->LastBlock != OldMedia.LastBlock)) { // - // This function is called by Block I/O Protocol APIs, which run at TPL_NOTIFY. - // Here we temporarily restore TPL to TPL_CALLBACK to invoke ReinstallProtocolInterface(). - // - OldTpl = EfiGetCurrentTpl (); - gBS->RestoreTPL (TPL_CALLBACK); + // This function is called from: + // Block I/O Protocol APIs, which run at TPL_CALLBACK. + // DriverBindingStart(), which raises to TPL_CALLBACK. + ASSERT (EfiGetCurrentTpl () == TPL_CALLBACK); gBS->ReinstallProtocolInterface ( UsbMass->Controller, @@ -753,9 +751,6 @@ ON_ERROR: &UsbMass->BlockIo ); - ASSERT (EfiGetCurrentTpl () == TPL_CALLBACK); - gBS->RaiseTPL (OldTpl); - // // Update MediaId after reinstalling Block I/O Protocol. // -- 2.16.1.windows.1