From patchwork Mon Nov 27 06:20:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841480 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="SoM+LCvE"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="E0Z12jNf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylc9h1xxhz9sPr for ; Mon, 27 Nov 2017 17:20:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751135AbdK0GUj (ORCPT ); Mon, 27 Nov 2017 01:20:39 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48534 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbdK0GUh (ORCPT ); Mon, 27 Nov 2017 01:20:37 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3C14E69B23; Mon, 27 Nov 2017 06:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763637; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SoM+LCvEdIN8b3JyfuiVAJXxNWnQTaz6XEKRtljSLlMzch4YmeTF9O5RWn05m1HVw f1rBHhy/xiLTGxKnrtQqRqFDRxu7Hc8jz79xt8UGYdc0wt7sK23GHMddPEd/SJFgsv GRVeTX7y4SMTRzjVWQCAkWYGUToEKKOZwSVEtWLQ= 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 D965469B1D; Mon, 27 Nov 2017 06:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763636; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E0Z12jNfHb4mYLbev7fSkY0AtYA/oQ2pJJh7ueRmyZ4Pnsjl4Xpsb2JT2mmiP6uOq Wb8E8vx/UqPc7roeOQBilJvd+H5wDCKdB6ztx1eoGDND8CqD/wxrUqo3uHkLL2ynAm GJbpJzmQiifBDgz22w8fv/JGjkbfFGFVSXejAv74= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D965469B1D 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 1/7] PCI: protect restore with device lock to be consistent Date: Mon, 27 Nov 2017 01:20:22 -0500 Message-Id: <1511763628-11856-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Commit b014e96d1abb ("PCI: Protect pci_error_handlers->reset_notify() usage with device_lock()") added protection around pci_dev_restore() function so that device specific remove callback does not cause a race condition against hotplug. pci_dev_lock() usage has been forgotten in two different places in the code. Adding locks for pci_slot_restore() and moving pci_dev_restore() inside the locks for pci_try_reset_function(). Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6078dfc..23681f4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4344,9 +4344,9 @@ int pci_try_reset_function(struct pci_dev *dev) pci_dev_save_and_disable(dev); rc = __pci_reset_function_locked(dev); + pci_dev_restore(dev); pci_dev_unlock(dev); - pci_dev_restore(dev); return rc; } EXPORT_SYMBOL_GPL(pci_try_reset_function); @@ -4546,7 +4546,9 @@ static void pci_slot_restore(struct pci_slot *slot) list_for_each_entry(dev, &slot->bus->devices, bus_list) { if (!dev->slot || dev->slot != slot) continue; + pci_dev_lock(dev); pci_dev_restore(dev); + pci_dev_unlock(dev); if (dev->subordinate) pci_bus_restore(dev->subordinate); } From patchwork Mon Nov 27 06:20:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841486 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="ibuOiFr3"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="RQ1i+/AC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcCW5cjlz9sPm for ; Mon, 27 Nov 2017 17:22:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbdK0GWB (ORCPT ); Mon, 27 Nov 2017 01:22:01 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48666 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751156AbdK0GUj (ORCPT ); Mon, 27 Nov 2017 01:20:39 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DF1FA69B20; Mon, 27 Nov 2017 06:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763638; bh=hKqZVx8hw23hCIuxUdZmn+S5ObxkQjbYYPjURapsG28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ibuOiFr3c0HPz5XaCGZfwhRrUc8xAeOtp5g3zAk05Xs6R7k/6up1QLW+E6iGLzvBX LK/aLYjTCa6sQOiLKZdJBOWDmZEEy/c6Q0CtGzHrPpc63MIctoi4g4HkLceLhsFKzN c5Sl9ORTs5hx30gwS16I3Mo8uKEJvJ9Sv2sAytVI= 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 16A1169B22; Mon, 27 Nov 2017 06:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763637; bh=hKqZVx8hw23hCIuxUdZmn+S5ObxkQjbYYPjURapsG28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQ1i+/ACthvoJBR+/cAQC2yxajIo3S7nd49/efboOP8aN+FJ0wM2EVhLn0hZwtRLd gZcWV4H6vtuAEetpd7liLsDDSEojXaLs4i9VGnRdrxsjUODNXZbzBkIfiIcSWHlQBQ cq8DUM36hTAs0fJBAjl/j6fGDyzb3cAsjW4fXx9U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 16A1169B22 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 2/7] PCI: handle FLR failure and allow other reset types Date: Mon, 27 Nov 2017 01:20:23 -0500 Message-Id: <1511763628-11856-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org pci_flr_wait() and pci_af_flr() functions assume graceful return even though the device is inaccessible under error conditions. Return -ENOTTY in error cases so that __pci_reset_function_locked() can try other reset types if AF_FLR/FLR reset fails. Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 18 ++++++++++-------- include/linux/pci.h | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 23681f4..27ec45d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3820,7 +3820,7 @@ int pci_wait_for_pending_transaction(struct pci_dev *dev) } EXPORT_SYMBOL(pci_wait_for_pending_transaction); -static void pci_flr_wait(struct pci_dev *dev) +static int pci_flr_wait(struct pci_dev *dev) { int delay = 1, timeout = 60000; u32 id; @@ -3849,7 +3849,7 @@ static void pci_flr_wait(struct pci_dev *dev) if (delay > timeout) { dev_warn(&dev->dev, "not ready %dms after FLR; giving up\n", 100 + delay - 1); - return; + return -ENOTTY; } if (delay > 1000) @@ -3863,6 +3863,8 @@ static void pci_flr_wait(struct pci_dev *dev) if (delay > 1000) dev_info(&dev->dev, "ready %dms after FLR\n", 100 + delay - 1); + + return 0; } /** @@ -3891,13 +3893,13 @@ static bool pcie_has_flr(struct pci_dev *dev) * device supports FLR before calling this function, e.g. by using the * pcie_has_flr() helper. */ -void pcie_flr(struct pci_dev *dev) +int pcie_flr(struct pci_dev *dev) { if (!pci_wait_for_pending_transaction(dev)) dev_err(&dev->dev, "timed out waiting for pending transaction; performing function level reset anyway\n"); pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); - pci_flr_wait(dev); + return pci_flr_wait(dev); } EXPORT_SYMBOL_GPL(pcie_flr); @@ -3930,8 +3932,7 @@ static int pci_af_flr(struct pci_dev *dev, int probe) dev_err(&dev->dev, "timed out waiting for pending transaction; performing AF function level reset anyway\n"); pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR); - pci_flr_wait(dev); - return 0; + return pci_flr_wait(dev); } /** @@ -4203,8 +4204,9 @@ int __pci_reset_function_locked(struct pci_dev *dev) if (rc != -ENOTTY) return rc; if (pcie_has_flr(dev)) { - pcie_flr(dev); - return 0; + rc = pcie_flr(dev); + if (rc != -ENOTTY) + return rc; } rc = pci_af_flr(dev, 0); if (rc != -ENOTTY) diff --git a/include/linux/pci.h b/include/linux/pci.h index d16a7c0..354b018 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1089,7 +1089,7 @@ static inline int pci_is_managed(struct pci_dev *pdev) int pcie_set_mps(struct pci_dev *dev, int mps); int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed, enum pcie_link_width *width); -void pcie_flr(struct pci_dev *dev); +int pcie_flr(struct pci_dev *dev); int __pci_reset_function(struct pci_dev *dev); int __pci_reset_function_locked(struct pci_dev *dev); int pci_reset_function(struct pci_dev *dev); From patchwork Mon Nov 27 06:20:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841484 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="JKS9c5oH"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="JKS9c5oH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcBs0Lr4z9sPr for ; Mon, 27 Nov 2017 17:21:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751096AbdK0GUl (ORCPT ); Mon, 27 Nov 2017 01:20:41 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48692 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbdK0GUj (ORCPT ); Mon, 27 Nov 2017 01:20:39 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 67B2769B2B; Mon, 27 Nov 2017 06:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763639; bh=b/AzsVvxqKdwld6CE+MDoACLvOI7z3Fb0/dUwCxbqTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKS9c5oHKU8bj4mZUB05v6lsJYfFz7JWJJbNqivAgoAORDkaPXQ9w5q1q2nSSf7tS MoqF42/F/0YNbOa6ZRzIZRC/KuUmwrSVT8XF84KT3hRK/7XdGOyfFFNbLqGhnTu0rq 6Ed0lYjfmLOCv3+ooCmbHJ1RC2A+4qkZXJ/XWax8= 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 3C93A69B29; Mon, 27 Nov 2017 06:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763639; bh=b/AzsVvxqKdwld6CE+MDoACLvOI7z3Fb0/dUwCxbqTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKS9c5oHKU8bj4mZUB05v6lsJYfFz7JWJJbNqivAgoAORDkaPXQ9w5q1q2nSSf7tS MoqF42/F/0YNbOa6ZRzIZRC/KuUmwrSVT8XF84KT3hRK/7XdGOyfFFNbLqGhnTu0rq 6Ed0lYjfmLOCv3+ooCmbHJ1RC2A+4qkZXJ/XWax8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3C93A69B29 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 3/7] PCI: make pci_flr_wait() generic and rename to pci_dev_wait() Date: Mon, 27 Nov 2017 01:20:24 -0500 Message-Id: <1511763628-11856-4-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rev 3.1 Sec 2.3.1 Request Handling Rules: Valid reset conditions after which a device is permitted to return CRS are: * Cold, Warm, and Hot Resets, * FLR * A reset initiated in response to a D3hot to D0 uninitialized Try to reuse FLR implementation towards other reset types. Signed-off-by: Sinan Kaya --- drivers/pci/pci.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 27ec45d..ed3c3bc 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -125,6 +125,9 @@ static int __init pcie_port_pm_setup(char *str) } __setup("pcie_port_pm=", pcie_port_pm_setup); +/* time to wait after a reset for device to become responsive */ +#define PCIE_RESET_READY_POLL_MS 60000 + /** * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children * @bus: pointer to PCI bus structure to search @@ -3820,20 +3823,13 @@ int pci_wait_for_pending_transaction(struct pci_dev *dev) } EXPORT_SYMBOL(pci_wait_for_pending_transaction); -static int pci_flr_wait(struct pci_dev *dev) +static int pci_dev_wait(struct pci_dev *dev, char *reset_type, int timeout) { - int delay = 1, timeout = 60000; + int delay = 1; u32 id; /* - * Per PCIe r3.1, sec 6.6.2, a device must complete an FLR within - * 100ms, but may silently discard requests while the FLR is in - * progress. Wait 100ms before trying to access the device. - */ - msleep(100); - - /* - * After 100ms, the device should not silently discard config + * After reset, the device should not silently discard config * requests, but it may still indicate that it needs more time by * responding to them with CRS completions. The Root Port will * generally synthesize ~0 data to complete the read (except when @@ -3847,14 +3843,14 @@ static int pci_flr_wait(struct pci_dev *dev) pci_read_config_dword(dev, PCI_COMMAND, &id); while (id == ~0) { if (delay > timeout) { - dev_warn(&dev->dev, "not ready %dms after FLR; giving up\n", - 100 + delay - 1); + dev_warn(&dev->dev, "not ready %dms after %s; giving up\n", + delay - 1, reset_type); return -ENOTTY; } if (delay > 1000) - dev_info(&dev->dev, "not ready %dms after FLR; waiting\n", - 100 + delay - 1); + dev_info(&dev->dev, "not ready %dms after %s; waiting\n", + delay - 1, reset_type); msleep(delay); delay *= 2; @@ -3862,7 +3858,8 @@ static int pci_flr_wait(struct pci_dev *dev) } if (delay > 1000) - dev_info(&dev->dev, "ready %dms after FLR\n", 100 + delay - 1); + dev_info(&dev->dev, "ready %dms after %s\n", delay - 1, + reset_type); return 0; } @@ -3899,7 +3896,15 @@ int pcie_flr(struct pci_dev *dev) dev_err(&dev->dev, "timed out waiting for pending transaction; performing function level reset anyway\n"); pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); - return pci_flr_wait(dev); + + /* + * Per PCIe r3.1, sec 6.6.2, a device must complete an FLR within + * 100ms, but may silently discard requests while the FLR is in + * progress. Wait 100ms before trying to access the device. + */ + msleep(100); + + return pci_dev_wait(dev, "FLR", PCIE_RESET_READY_POLL_MS); } EXPORT_SYMBOL_GPL(pcie_flr); @@ -3932,7 +3937,15 @@ static int pci_af_flr(struct pci_dev *dev, int probe) dev_err(&dev->dev, "timed out waiting for pending transaction; performing AF function level reset anyway\n"); pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR); - return pci_flr_wait(dev); + + /* + * Per PCIe r3.1, sec 6.6.2, a device must complete an FLR within + * 100ms, but may silently discard requests while the FLR is in + * progress. Wait 100ms before trying to access the device. + */ + msleep(100); + + return pci_dev_wait(dev, "AF_FLR", PCIE_RESET_READY_POLL_MS); } /** From patchwork Mon Nov 27 06:20:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841485 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="D/wT+3ab"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="D/wT+3ab"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcC65dKhz9sPr for ; Mon, 27 Nov 2017 17:21:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264AbdK0GVj (ORCPT ); Mon, 27 Nov 2017 01:21:39 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48784 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbdK0GUl (ORCPT ); Mon, 27 Nov 2017 01:20:41 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9762369B37; Mon, 27 Nov 2017 06:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763640; bh=ncxsBMbi00kUp9GICr3hprp4tLdQf7MfrTK0rsiP0IA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/wT+3ab8bJu8oyEMzckWLH3j+pr1Lz/loje2v6W98zt+0nfdkhBeol5DE/YqEV31 QdVxEiVicRODHapz6euXvWtSEaoJ5lo+wholfkIYRqQ3fqgYkMkXidHUmZ5dtNtbS8 4Vpvsmn+nhf+qVgILlSnsoj1VPcx1xYmgAdhM6pI= 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 6071A69B2F; Mon, 27 Nov 2017 06:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763640; bh=ncxsBMbi00kUp9GICr3hprp4tLdQf7MfrTK0rsiP0IA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/wT+3ab8bJu8oyEMzckWLH3j+pr1Lz/loje2v6W98zt+0nfdkhBeol5DE/YqEV31 QdVxEiVicRODHapz6euXvWtSEaoJ5lo+wholfkIYRqQ3fqgYkMkXidHUmZ5dtNtbS8 4Vpvsmn+nhf+qVgILlSnsoj1VPcx1xYmgAdhM6pI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6071A69B2F 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 4/7] PCI: wait device ready after pci_pm_reset() Date: Mon, 27 Nov 2017 01:20:25 -0500 Message-Id: <1511763628-11856-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rev 3.1 Sec 2.3.1 Request Handling Rules says a device can issue CRS following a D3hot->D0 transition. Add pci_dev_wait() call to see if device is available before returning. Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ed3c3bc..87e4688 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3990,7 +3990,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe) pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr); pci_dev_d3_sleep(dev); - return 0; + return pci_dev_wait(dev, "PM D3->D0", PCIE_RESET_READY_POLL_MS); } void pci_reset_secondary_bus(struct pci_dev *dev) From patchwork Mon Nov 27 06:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841483 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="FMiezS4u"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="FMiezS4u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcBS4jXfz9sPm for ; Mon, 27 Nov 2017 17:21:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751569AbdK0GVS (ORCPT ); Mon, 27 Nov 2017 01:21:18 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48888 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751313AbdK0GUm (ORCPT ); Mon, 27 Nov 2017 01:20:42 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D698669B2F; Mon, 27 Nov 2017 06:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763641; bh=H2FNrbEFBR00et4aWztzNNP7upYvaJy9+PqWBlwIaLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMiezS4unCWyB9sldOAAd/U1pMEkCQZRZ/E9QyY8jDvpCY2WZNkEI8ByAYM3Z15Wi swYtkFkx6i4sZoAF98UbRz8vmsMFViJmlN3ucpsuRH2+A+BOFFvmHFuEgDlHFe1le+ K8sWqGqmEf872xKv5+PhtXQ4JHr3wd84TIrfyunU= 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 9128E69B2F; Mon, 27 Nov 2017 06:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763641; bh=H2FNrbEFBR00et4aWztzNNP7upYvaJy9+PqWBlwIaLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMiezS4unCWyB9sldOAAd/U1pMEkCQZRZ/E9QyY8jDvpCY2WZNkEI8ByAYM3Z15Wi swYtkFkx6i4sZoAF98UbRz8vmsMFViJmlN3ucpsuRH2+A+BOFFvmHFuEgDlHFe1le+ K8sWqGqmEf872xKv5+PhtXQ4JHr3wd84TIrfyunU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9128E69B2F 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 5/7] PCI: add a return type for pci_reset_bridge_secondary_bus() Date: Mon, 27 Nov 2017 01:20:26 -0500 Message-Id: <1511763628-11856-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Getting ready to return an error from pci_reset_bridge_secondary_bus() when device is unreachable. Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 4 +++- include/linux/pci.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 87e4688..0a9a696 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4031,9 +4031,11 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) * Use the bridge control register to assert reset on the secondary bus. * Devices on the secondary bus are left in power-on state. */ -void pci_reset_bridge_secondary_bus(struct pci_dev *dev) +int pci_reset_bridge_secondary_bus(struct pci_dev *dev) { pcibios_reset_secondary_bus(dev); + + return 0; } EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); diff --git a/include/linux/pci.h b/include/linux/pci.h index 354b018..539b3af 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1103,7 +1103,7 @@ int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed, int pci_try_reset_bus(struct pci_bus *bus); void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev); -void pci_reset_bridge_secondary_bus(struct pci_dev *dev); +int pci_reset_bridge_secondary_bus(struct pci_dev *dev); void pci_update_resource(struct pci_dev *dev, int resno); int __must_check pci_assign_resource(struct pci_dev *dev, int i); int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align); From patchwork Mon Nov 27 06:20:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841482 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="NLVkNJkb"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="QBGP6SLx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcBM02vwz9sPm for ; Mon, 27 Nov 2017 17:21:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378AbdK0GUp (ORCPT ); Mon, 27 Nov 2017 01:20:45 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48932 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbdK0GUn (ORCPT ); Mon, 27 Nov 2017 01:20:43 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3BFF869B3E; Mon, 27 Nov 2017 06:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763643; bh=OFTEhXMhOn+ouQotubtUZQFwW9haejBp2Gs5CO3q4VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NLVkNJkb9v8aHpZxSpwqI4ykrdJFklwd1ajkExZKPPalr8JJ9QT5KlZzPOUNHhlCr 3k7LZ8CZxIXLUhwXiF7sm42wcS1wzwjJ9sfFHggm92w/Dz/8BJAt99ezDbFnL5Gn9N p4izJRoXYMOBqIgi6M5hn6M0a4droag3+fOPkDEk= 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 F010E69B3A; Mon, 27 Nov 2017 06:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763642; bh=OFTEhXMhOn+ouQotubtUZQFwW9haejBp2Gs5CO3q4VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QBGP6SLxz5ofRT2B6jM0QxKTlUBm7wXM0PimNRxh1Nit3G3r4+eXXUNPD+pMuPzrY ZAJ4371LF8YqBQ8M5FU27NTuriUHCLgec8WvXtpefgQJcVEmeNyy7804uWdV4YSeGG +vc7+rGa+eklNRPAKhdSJ68/t/VaQCxiDAm/nUik= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org F010E69B3A 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 6/7] PCI: add device wait after slot and bus reset Date: Mon, 27 Nov 2017 01:20:27 -0500 Message-Id: <1511763628-11856-7-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rev 3.1 Sec 2.3.1 Request Handling Rules indicates that a device can issue CRS following secondary bus reset. Handle device presence gracefully. Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0a9a696..8472c24 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4035,7 +4035,7 @@ int pci_reset_bridge_secondary_bus(struct pci_dev *dev) { pcibios_reset_secondary_bus(dev); - return 0; + return pci_dev_wait(dev, "bus reset", PCIE_RESET_READY_POLL_MS); } EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); From patchwork Mon Nov 27 06:20:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841481 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; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="fXb1yVEk"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="fQ7S2J9R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylcBD3c91z9sPm for ; Mon, 27 Nov 2017 17:21:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbdK0GUv (ORCPT ); Mon, 27 Nov 2017 01:20:51 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:49090 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbdK0GUs (ORCPT ); Mon, 27 Nov 2017 01:20:48 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A5F7D69B49; Mon, 27 Nov 2017 06:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763647; bh=qxdJQn9AI4tqf4BU5ND+/39ZheJDC1qL7ai5e/lGkvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fXb1yVEke9GOTmcpc/cKv7x63QBgRgpzdlSSz9j93FjRnGHbfdjelMNe3xxM/ogk6 zi2DnTivCCYporM6yEU5/3LLo1pR96tCzMONXxDjqLwq+JV2bW80s0KONfiqH7iymv If+S7heXAUOZDV4Tx09xS5YL1DxbVJuA120/viJY= 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 5138969B3A; Mon, 27 Nov 2017 06:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763645; bh=qxdJQn9AI4tqf4BU5ND+/39ZheJDC1qL7ai5e/lGkvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQ7S2J9RKi0EnPZ2m8LZsihHS3YcRlQDwClyKm+KWr1ALGks2NCZ4SfTXSXDOMsak 2OdpPotjCDJySYWY2RQPwUfiz8bzUVVGwSp4GlIElm/8XXlIUmar/EqylubBot9ADM lgF9cTvH+z07ULMiz6Fjk3/kp7SEcx3zEHtTBRUw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5138969B3A 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Jonathan Corbet , Bjorn Helgaas , "Paul E. McKenney" , Andrew Morton , Thomas Gleixner , Ingo Molnar , Christoffer Dall , Mimi Zohar , Marc Zyngier , Ding Tianhong , Michal Hocko , linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 7/7] PCI: make reset poll time adjustable Date: Mon, 27 Nov 2017 01:20:28 -0500 Message-Id: <1511763628-11856-8-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Introduce pci=resetpolltime= argument to override 60 seconds poll time in units of milliseconds. Signed-off-by: Sinan Kaya --- Documentation/admin-guide/kernel-parameters.txt | 2 ++ drivers/pci/pci.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0549662..a07d4f5 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3071,6 +3071,8 @@ pcie_scan_all Scan all possible PCIe devices. Otherwise we only look for one device below a PCIe downstream port. + resetpolltime= Adjusts the default poll time following hot reset + and D3->D0 transition. pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power Management. diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8472c24..a6c3e25 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -127,7 +127,7 @@ static int __init pcie_port_pm_setup(char *str) /* time to wait after a reset for device to become responsive */ #define PCIE_RESET_READY_POLL_MS 60000 - +static unsigned long pci_reset_polltime = PCIE_RESET_READY_POLL_MS; /** * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children * @bus: pointer to PCI bus structure to search @@ -3904,7 +3904,7 @@ int pcie_flr(struct pci_dev *dev) */ msleep(100); - return pci_dev_wait(dev, "FLR", PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "FLR", pci_reset_polltime); } EXPORT_SYMBOL_GPL(pcie_flr); @@ -3945,7 +3945,7 @@ static int pci_af_flr(struct pci_dev *dev, int probe) */ msleep(100); - return pci_dev_wait(dev, "AF_FLR", PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "AF_FLR", pci_reset_polltime); } /** @@ -3990,7 +3990,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe) pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr); pci_dev_d3_sleep(dev); - return pci_dev_wait(dev, "PM D3->D0", PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "PM D3->D0", pci_reset_polltime); } void pci_reset_secondary_bus(struct pci_dev *dev) @@ -4035,7 +4035,7 @@ int pci_reset_bridge_secondary_bus(struct pci_dev *dev) { pcibios_reset_secondary_bus(dev); - return pci_dev_wait(dev, "bus reset", PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "bus reset", pci_reset_polltime); } EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); @@ -5528,6 +5528,9 @@ static int __init pci_setup(char *str) pcie_bus_config = PCIE_BUS_PEER2PEER; } else if (!strncmp(str, "pcie_scan_all", 13)) { pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS); + } else if (!strncmp(str, "resetpolltime=", 14)) { + pci_reset_polltime = + simple_strtoul(str + 14, &str, 0); } else { printk(KERN_ERR "PCI: Unknown option `%s'\n", str);