From patchwork Sun Sep 24 00:16:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 817855 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="jpp6OuQ+"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="jpp6OuQ+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y077p1kpVz9t43 for ; Sun, 24 Sep 2017 10:17:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751609AbdIXARI (ORCPT ); Sat, 23 Sep 2017 20:17:08 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52188 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdIXARH (ORCPT ); Sat, 23 Sep 2017 20:17:07 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B747C6071C; Sun, 24 Sep 2017 00:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212226; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:From; b=jpp6OuQ+NVtTHIPU8vezkaurKWsZFO8/JaSxgstEX3IkYEugNzb3EfmxC1iFiEyfF J9Ba35Nod4KMjbo4IPmG9+BHHWrVM2Cd/RsV/dEaeqC7Q3ZGh3JfRd+i2n7B3BVWKM P3j6OEtht2bnOBcUaZWa4J3t23Kj3zDIIObqcndo= 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 5BBAA60618; Sun, 24 Sep 2017 00:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212226; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:From; b=jpp6OuQ+NVtTHIPU8vezkaurKWsZFO8/JaSxgstEX3IkYEugNzb3EfmxC1iFiEyfF J9Ba35Nod4KMjbo4IPmG9+BHHWrVM2Cd/RsV/dEaeqC7Q3ZGh3JfRd+i2n7B3BVWKM P3j6OEtht2bnOBcUaZWa4J3t23Kj3zDIIObqcndo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5BBAA60618 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, alex.williamson@redhat.com Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] PCI: protect restore with device lock to be consistent Date: Sat, 23 Sep 2017 20:16:54 -0400 Message-Id: <1506212218-29103-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 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 --- 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 Sun Sep 24 00:16:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 817859 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="a4DENfkN"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="SuZkwYmg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y078q4t4Gz9t43 for ; Sun, 24 Sep 2017 10:18:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbdIXASB (ORCPT ); Sat, 23 Sep 2017 20:18:01 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52262 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdIXARJ (ORCPT ); Sat, 23 Sep 2017 20:17:09 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7800860726; Sun, 24 Sep 2017 00:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212228; bh=0gEb3ulVTFEGzvj++6sYjZ9eFLPPkC76kVxbkB5CeRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a4DENfkNUcCUxiVK93Y0q1dovYtlplbWv2XIOEhgWqYGdNketOL8SYEET0u3h3YOC Imzji6AwQBcSWGM/wIbA2gUOtDxtGZEcx1PnGyQ4ZLTAv8Rjq5ajQ8lwUk3vUk7xpr UTk8O4NpcDPfWdZB10w+Ui5Gb62B7mhGSucVIYzQ= 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 E4C5660710; Sun, 24 Sep 2017 00:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212227; bh=0gEb3ulVTFEGzvj++6sYjZ9eFLPPkC76kVxbkB5CeRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuZkwYmgZEACjYcxlgSGiO0d9oNXZGFOmtg3Rbi9e8OlVJtBPBOCpLtKnKSkMwvHQ xpTb+WvZgsHGGAG7wBLfXyLgwjSZjL7M1h8B/nBc5acrXkI1dMiExg+U5U7qTOsKv7 GJmD8vhcnDvTK2yii3UUcK70rdZe5XK/1I4DiPD4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E4C5660710 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, alex.williamson@redhat.com Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] PCI: handle FLR failure and allow other reset types Date: Sat, 23 Sep 2017 20:16:55 -0400 Message-Id: <1506212218-29103-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506212218-29103-1-git-send-email-okaya@codeaurora.org> References: <1506212218-29103-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 --- 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 f68c58a..104224f7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1088,7 +1088,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 Sun Sep 24 00:16:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 817857 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="VOA2VhuZ"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="VOA2VhuZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y078L4xMwz9t43 for ; Sun, 24 Sep 2017 10:17:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751896AbdIXARL (ORCPT ); Sat, 23 Sep 2017 20:17:11 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52306 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751875AbdIXARK (ORCPT ); Sat, 23 Sep 2017 20:17:10 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6C9386072D; Sun, 24 Sep 2017 00:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212229; bh=1v0ALGE+GVavjMtrS3XrsuNc0+XLny6pliWDZB1kYlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOA2VhuZnp2GtRkjZeJllHE6GXTXAW8s1aC3yIQNtuFawe4fniy1MTQyMKySg4gG6 W1Gtik+96zY0n8OSW/RxtF80WZ8ryjL4pbS7lIliKoFZwz6+/dM5vz+xJiHw/05NQp Jq3WMbEys63hYPdAFBI7cMtTkQqPTi6ZIdGLMttI= 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 2CFC760727; Sun, 24 Sep 2017 00:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212229; bh=1v0ALGE+GVavjMtrS3XrsuNc0+XLny6pliWDZB1kYlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOA2VhuZnp2GtRkjZeJllHE6GXTXAW8s1aC3yIQNtuFawe4fniy1MTQyMKySg4gG6 W1Gtik+96zY0n8OSW/RxtF80WZ8ryjL4pbS7lIliKoFZwz6+/dM5vz+xJiHw/05NQp Jq3WMbEys63hYPdAFBI7cMtTkQqPTi6ZIdGLMttI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2CFC760727 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, alex.williamson@redhat.com Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] PCI: make pci_flr_wait() generic and rename to pci_dev_wait() Date: Sat, 23 Sep 2017 20:16:56 -0400 Message-Id: <1506212218-29103-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506212218-29103-1-git-send-email-okaya@codeaurora.org> References: <1506212218-29103-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 | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 27ec45d..fd4a3b6 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3820,20 +3820,14 @@ 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 initial_wait, 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 +3841,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", + initial_wait + 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", + initial_wait + delay - 1, reset_type); msleep(delay); delay *= 2; @@ -3862,7 +3856,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", + initial_wait + delay - 1, reset_type); return 0; } @@ -3899,7 +3894,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", 100, 60000); } EXPORT_SYMBOL_GPL(pcie_flr); @@ -3932,7 +3935,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", 100, 60000); } /** From patchwork Sun Sep 24 00:16:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 817858 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="RDN7xCog"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="RDN7xCog"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y078g0dv2z9t43 for ; Sun, 24 Sep 2017 10:17:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751833AbdIXARk (ORCPT ); Sat, 23 Sep 2017 20:17:40 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52440 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdIXARL (ORCPT ); Sat, 23 Sep 2017 20:17:11 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B534A60732; Sun, 24 Sep 2017 00:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212230; bh=Rv6+OCsiTHMXuiB2B+6hgIpAWmjL+k++gMwjdqBDXkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDN7xCogjiW5ahDF8u4pDA98BAcHMo2rybmC4sGoLonUMftEyQnL1H7caxQzT1r2b 5NsX/yn8IckVEYhSJ9SdpAhkBMVWnQzv6QNtKSjgWiCupKUqiJeMW3FAW+F5P1u5QS 95/fxXrFFlKJT9UnQXqyfP3cIMQa7LpQwqmRKBEE= 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 63AB360738; Sun, 24 Sep 2017 00:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212230; bh=Rv6+OCsiTHMXuiB2B+6hgIpAWmjL+k++gMwjdqBDXkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDN7xCogjiW5ahDF8u4pDA98BAcHMo2rybmC4sGoLonUMftEyQnL1H7caxQzT1r2b 5NsX/yn8IckVEYhSJ9SdpAhkBMVWnQzv6QNtKSjgWiCupKUqiJeMW3FAW+F5P1u5QS 95/fxXrFFlKJT9UnQXqyfP3cIMQa7LpQwqmRKBEE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 63AB360738 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, alex.williamson@redhat.com Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] PCI: wait device ready after pci_pm_reset() Date: Sat, 23 Sep 2017 20:16:57 -0400 Message-Id: <1506212218-29103-4-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506212218-29103-1-git-send-email-okaya@codeaurora.org> References: <1506212218-29103-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 with 1 second timeout to see if device is available before returning. Signed-off-by: Sinan Kaya --- drivers/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index fd4a3b6..074adf9 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3963,6 +3963,7 @@ static int pci_af_flr(struct pci_dev *dev, int probe) */ static int pci_pm_reset(struct pci_dev *dev, int probe) { + unsigned int delay = dev->d3_delay; u16 csr; if (!dev->pm_cap || dev->dev_flags & PCI_DEV_FLAGS_NO_PM_RESET) @@ -3988,7 +3989,10 @@ 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; + if (delay < pci_pm_d3_delay) + delay = pci_pm_d3_delay; + + return pci_dev_wait(dev, "PM D3->D0", delay, 1000); } void pci_reset_secondary_bus(struct pci_dev *dev) From patchwork Sun Sep 24 00:16:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 817856 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="nKkcA/Kd"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Ot/G0e6/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y078B2y2Cz9t43 for ; Sun, 24 Sep 2017 10:17:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751932AbdIXARQ (ORCPT ); Sat, 23 Sep 2017 20:17:16 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52526 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbdIXARM (ORCPT ); Sat, 23 Sep 2017 20:17:12 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 08BFF60865; Sun, 24 Sep 2017 00:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212232; bh=WjQSnzV4QmYLzJsgIhYiRV6NNrlQ1wa8lbZ2jJOS4/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nKkcA/KdpwYnOUmeIvPOQZ+EE/WfY15384Yvx22z4Jcsx3co5siqNDcnfr+Va5C2U P7L/zakyDFQlWNkS69DI3m1QQBQFYc6mKNW/E9dYnYyFUSJJ98NVX6fdd7hlvYlL24 0ohdk/kFylMxPXTMKblKqTi3RC4zOZvv7nPc28zo= 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 9C5F960768; Sun, 24 Sep 2017 00:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506212231; bh=WjQSnzV4QmYLzJsgIhYiRV6NNrlQ1wa8lbZ2jJOS4/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ot/G0e6/EAvyfNm24jCNz8t8m61Pz0xFyHmyIOq/QOg53q6QwzE4FPwYioAW76kyY Wk0ssKUyv//4Xprd7cajL2W05HfiasXeQXqASOaFjpzjoqNUXnA6ZIBEHMsUr6LBX8 mah8rNW2ShH/VV19ZRyizkBkzzZYR4WQtQenqYCw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9C5F960768 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, alex.williamson@redhat.com Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] PCI: add device wait after slot and bus reset Date: Sat, 23 Sep 2017 20:16:58 -0400 Message-Id: <1506212218-29103-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506212218-29103-1-git-send-email-okaya@codeaurora.org> References: <1506212218-29103-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 --- drivers/pci/pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 074adf9..7131aab 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4056,7 +4056,7 @@ static int pci_parent_bus_reset(struct pci_dev *dev, int probe) pci_reset_bridge_secondary_bus(dev->bus->self); - return 0; + return pci_dev_wait(dev, "bus reset", 1000, 60000); } static int pci_reset_hotplug_slot(struct hotplug_slot *hotplug, int probe) @@ -4077,6 +4077,7 @@ static int pci_reset_hotplug_slot(struct hotplug_slot *hotplug, int probe) static int pci_dev_reset_slot_function(struct pci_dev *dev, int probe) { struct pci_dev *pdev; + int rc; if (dev->subordinate || !dev->slot || dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET) @@ -4086,7 +4087,11 @@ static int pci_dev_reset_slot_function(struct pci_dev *dev, int probe) if (pdev != dev && pdev->slot == dev->slot) return -ENOTTY; - return pci_reset_hotplug_slot(dev->slot->hotplug, probe); + rc = pci_reset_hotplug_slot(dev->slot->hotplug, probe); + if (!rc && !probe) + rc = pci_dev_wait(dev, "slot reset", 1000, 60000); + + return rc; } static void pci_dev_lock(struct pci_dev *dev)