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: 9967701 X-Patchwork-Delegate: bhelgaas@google.com 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 9FA7D6057F for ; Sun, 24 Sep 2017 00:18:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A8122900F for ; Sun, 24 Sep 2017 00:18:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78EDF2923A; Sun, 24 Sep 2017 00:18:27 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 32FDA2900F for ; Sun, 24 Sep 2017 00:18:27 +0000 (UTC) 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= 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 X-Virus-Scanned: ClamAV using ClamSMTP 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)