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: 10443499 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 481F5601D3 for ; Fri, 1 Jun 2018 13:46:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3919228A78 for ; Fri, 1 Jun 2018 13:46:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C9C628CE2; Fri, 1 Jun 2018 13:46:19 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA0EB28A78 for ; Fri, 1 Jun 2018 13:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501AbeFANqR (ORCPT ); Fri, 1 Jun 2018 09:46:17 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45412 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293AbeFANqP (ORCPT ); Fri, 1 Jun 2018 09:46:15 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D63F360261; 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , stable@vger.kernel.org, Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" , esc.storagedev@microsemi.com (open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)), linux-scsi@vger.kernel.org (open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)), linux-kernel@vger.kernel.org (open list) 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 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.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 --- 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 */