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)