From patchwork Fri Jun 1 13:46:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10443509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54664601D3 for ; Fri, 1 Jun 2018 13:46:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44FA328A78 for ; Fri, 1 Jun 2018 13:46:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 378C628CF3; Fri, 1 Jun 2018 13:46:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AFF1C28A78 for ; Fri, 1 Jun 2018 13:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=4CsGfMOleIdnenBElGQ2BxZldNCIsLWHMX77AR6h4Mg=; b=hUqzM5Y63aUjkP KxQKxGskiTjwRr8fxjKRKskPMiaAWBUKafTW20/msnPTO+LmA+eNOzPxyVh8OqqeXBMYI/kqdEYuu zazUzkqCvaqVipG5X/04P43ttLWR4/HghUXgxyENPI+KCu38iFUlKLTtiYgkDRfBgKrnx/pC3wHRz P8HDqJv8iY6si+79b5mI0HVURbEk3BC0KoFWPwaSRPtAcUNcCMDrvtyYhuzrFcGWHfEywvyQ7jYpD 0ioqRjGRtIUDmPqnpYrav6n9II0IxiXuVRMnTiwGWCyCDEJ73q5T0V1T6QzY9sl+wpu2Ocfp7PjW5 EyyYn7Ei3Hxz9FpRrIaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOkO4-0008Do-IH; Fri, 01 Jun 2018 13:46:36 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOkNt-00084k-Vt for linux-arm-kernel@lists.infradead.org; Fri, 01 Jun 2018 13:46:30 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B0B66605A4; Fri, 1 Jun 2018 13:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527860774; bh=D2UDx0ejZafnJEfSZWymOSJG7KBrh4lPyDcWZn+Xbes=; h=From:To:Cc:Subject:Date:From; b=CxRT5jsWoyW8scSzXIRsM3xf7N8PjTRB7nFwjAVZq+CgjLRxZ1IGyX+YnNcTv+0Ho OopMNRu7INY7a9Lx4iQoZDzAKUz+yec5quqiAmLK84ZtUhrmMguMDEVOmxmCpU7sJ0 QT0T97OyTSu0+galZ00yXokNqSkn06YPP5faNv5g= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E6B4160249; Fri, 1 Jun 2018 13:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527860774; bh=D2UDx0ejZafnJEfSZWymOSJG7KBrh4lPyDcWZn+Xbes=; h=From:To:Cc:Subject:Date:From; b=CxRT5jsWoyW8scSzXIRsM3xf7N8PjTRB7nFwjAVZq+CgjLRxZ1IGyX+YnNcTv+0Ho OopMNRu7INY7a9Lx4iQoZDzAKUz+yec5quqiAmLK84ZtUhrmMguMDEVOmxmCpU7sJ0 QT0T97OyTSu0+galZ00yXokNqSkn06YPP5faNv5g= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E6B4160249 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, ryan@finnie.org, timur@codeaurora.org Subject: [PATCH V4] scsi: hpsa: drop shutdown callback Date: Fri, 1 Jun 2018 09:46:08 -0400 Message-Id: <1527860768-11367-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180601_064626_086743_33703AAE X-CRM114-Status: GOOD ( 11.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Don Brace , "James E.J. Bottomley" , "open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER hpsa" , "Martin K. Petersen" , linux-arm-msm@vger.kernel.org, "open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER hpsa" , open list , stable@vger.kernel.org, Sinan Kaya , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 'Commit cc27b735ad3a ("PCI/portdrv: Turn off PCIe services during shutdown")' has been added to kernel to shutdown pending PCIe port service interrupts during reboot so that a newly started kexec kernel wouldn't observe pending interrupts. pcie_port_device_remove() is disabling the root port and switches by calling pci_disable_device() after all PCIe service drivers are shutdown. This has been found to cause crashes on HP DL360 Gen9 machines during reboot due to hpsa driver not clearing the bus master bit during the shutdown procedure by calling pci_disable_device(). Disable device as part of the shutdown sequence. Signed-off-by: Sinan Kaya Link: https://bugzilla.kernel.org/show_bug.cgi?id=199779 Fixes: cc27b735ad3a ("PCI/portdrv: Turn off PCIe services during shutdown") Cc: stable@vger.kernel.org Reported-by: Ryan Finnie Tested-by: Don Brace Acked-by: Don Brace --- drivers/scsi/hpsa.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 3a9eca1..b92f86a 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -8869,7 +8869,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) kfree(options); } -static void hpsa_shutdown(struct pci_dev *pdev) +static void __hpsa_shutdown(struct pci_dev *pdev) { struct ctlr_info *h; @@ -8884,6 +8884,12 @@ static void hpsa_shutdown(struct pci_dev *pdev) hpsa_disable_interrupt_mode(h); /* pci_init 2 */ } +static void hpsa_shutdown(struct pci_dev *pdev) +{ + __hpsa_shutdown(pdev); + pci_disable_device(pdev); +} + static void hpsa_free_device_info(struct ctlr_info *h) { int i; @@ -8927,7 +8933,7 @@ static void hpsa_remove_one(struct pci_dev *pdev) scsi_remove_host(h->scsi_host); /* init_one 8 */ /* includes hpsa_free_irqs - init_one 4 */ /* includes hpsa_disable_interrupt_mode - pci_init 2 */ - hpsa_shutdown(pdev); + __hpsa_shutdown(pdev); hpsa_free_device_info(h); /* scan */