From patchwork Mon May 28 21:21:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 921704 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="IB1VencN"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="AviuFW8/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40vqYD3ptzz9s1p for ; Tue, 29 May 2018 07:21:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934159AbeE1VVV (ORCPT ); Mon, 28 May 2018 17:21:21 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:32806 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934151AbeE1VVS (ORCPT ); Mon, 28 May 2018 17:21:18 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6784A60591; Mon, 28 May 2018 21:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527542478; bh=J3YUQblI7jH9b8qOQWBFxZTFZcLj0oMkcDxzgwfABwI=; h=From:To:Cc:Subject:Date:From; b=IB1VencNJlLlFhfCY5g6kRTa60PakHAnf0IOJZTcOO61tVZV6Xk/e9WFbuum5IB8v 5Z2It8591wVglbSugM+xS5YPI/lbXYlPtsnTh8ha72LPJWhiU5YKGLjNpnEeTj75Rx Vbj3drxN/YDH3eKS57R12HD0d9kC4350vUaMiDjc= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 C36C16044B; Mon, 28 May 2018 21:21:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527542477; bh=J3YUQblI7jH9b8qOQWBFxZTFZcLj0oMkcDxzgwfABwI=; h=From:To:Cc:Subject:Date:From; b=AviuFW8/2DZoveCFg+UDwwyzEcI7IkP77a5XligPAyu3kn9QPUBuOnRjp3ZAXbEOU bGb67b7u8X/JqmVq5Eg4uxq4l1NosHFhTPPmt+SwinlJGgxgqAj9MYMQTT7xTPdI2q JerxTKBZxkg0+qcbRphXwOlgJunOiCnDbo+M2Hjg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C36C16044B 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, Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 1/2] PCI: Try to clean up resources via remove if shutdown doesn't exist Date: Mon, 28 May 2018 17:21:10 -0400 Message-Id: <1527542471-10316-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org It is up to a driver to implement shutdown() callback. If shutdown() callback is not implemented, PCI device can have pending interrupt and even do DMA transactions while the system is going down. If kexec is in use, this can damage the newly booting kexec kernel or even prevent it from booting altogether. Fallback to calling the remove() callback if shutdown() isn't implemented for a given driver. 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: Ryan Finnie --- drivers/pci/pci-driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index cbda0e6..75a00fe 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -477,8 +477,17 @@ static void pci_device_shutdown(struct device *dev) pm_runtime_resume(dev); + /* + * Try shutdown callback if it exists, otherwise fallback to remove + * callback. PCI drivers can do DMA and have pending interrupts. + * Leaving the DMA and interrupts pending could damage the newly + * booting kexec kernel as well as prevent it from booting altogether + * if the pending interrupt is level. + */ if (drv && drv->shutdown) drv->shutdown(pci_dev); + else if (drv && drv->remove) + drv->remove(pci_dev); /* * If this is a kexec reboot, turn off Bus Master bit on the From patchwork Mon May 28 21:21:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 921706 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="bX3DaKKs"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="lk8JalKB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40vqdw3vVzz9s16 for ; Tue, 29 May 2018 07:25:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934153AbeE1VZi (ORCPT ); Mon, 28 May 2018 17:25:38 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:32922 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934139AbeE1VVV (ORCPT ); Mon, 28 May 2018 17:21:21 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B6AAC60711; Mon, 28 May 2018 21:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527542480; bh=AHMrd6ZywvJGIrz1vwluQH/8SHmyN4Ki+UbaYl9UiG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bX3DaKKswbn92IqzNQts/4y7aETI7/IcStJBbA6sX05JdGsIP2fdN7CZQyjfbBa6X L2vtv3XKt4DOU4VAu0bPCsGyYiLhiXjkqc9N6klkWE4iklsSTNCeY5yy8HHQNEvY0L LTaihOjWDoXSwtZjv2G7gs77K3ygwV0L/CBnPZu8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 70FC16044B; Mon, 28 May 2018 21:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527542479; bh=AHMrd6ZywvJGIrz1vwluQH/8SHmyN4Ki+UbaYl9UiG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lk8JalKB0Gmy+sUC5v+gu7CKavAK0s2ruU2C83Nvtlm6PAb+shg+fzN0VXE+x3D0U xMKMisd9Y+GSoWG64ap5xh7uiXeCrFceJEzPZQEezQ7e9vl8J1aDa4/U0RsMyQ5S86 s3kp42kxY1l1zk1UogEVCpeM9zBf85XKKk+slWU8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 70FC16044B 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 V3 2/2] scsi: hpsa: drop shutdown callback Date: Mon, 28 May 2018 17:21:11 -0400 Message-Id: <1527542471-10316-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527542471-10316-1-git-send-email-okaya@codeaurora.org> References: <1527542471-10316-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org '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(). Drop the shutdown API and do an orderly clean up by using the remove. 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: Ryan Finnie --- drivers/scsi/hpsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 3a9eca1..3dbef28 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -8970,7 +8970,6 @@ static struct pci_driver hpsa_pci_driver = { .probe = hpsa_init_one, .remove = hpsa_remove_one, .id_table = hpsa_pci_device_id, /* id_table */ - .shutdown = hpsa_shutdown, .suspend = hpsa_suspend, .resume = hpsa_resume, };