From patchwork Fri Nov 10 21:54:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10053819 X-Patchwork-Delegate: geert@linux-m68k.org 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 9D7756032D for ; Fri, 10 Nov 2017 21:54:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90F792B488 for ; Fri, 10 Nov 2017 21:54:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 842482B448; Fri, 10 Nov 2017 21:54:19 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham 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 C88E42B448 for ; Fri, 10 Nov 2017 21:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751186AbdKJVyS (ORCPT ); Fri, 10 Nov 2017 16:54:18 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:52568 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138AbdKJVyQ (ORCPT ); Fri, 10 Nov 2017 16:54:16 -0500 Received: by mail-wr0-f193.google.com with SMTP id j23so9707075wra.9; Fri, 10 Nov 2017 13:54:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+OpIf6mmzhQEGZHeO/d4awp+dHWThaNUC8vaVymDPUY=; b=LnPhi8dLohS6wih6VvpZJxHCo04MBIJ20HPLVIN2AIIjtSr/RrPhOF1h6T4l3HwHMW hpSB0TPJFsbgU1hT6tt8lQH3XNJ/fT01iXX26HTYy5C0gDRSw9YkWJq4kXTjSfYo9IYv 2Igp3Qw1q26CGa4pmRYLmqHHUVt51cPLcNLm3idx3eKBQmnK2850KXw/tBIJAScP8cfN U4xm5X2uJSA46HTL8t8Cu5n0p1dQlbiMVsgmrSxDj3h0mrDzT/xZprINhaTyihTe40ll 8zu+hHGgz6MLqtmfnPevFlDT6zwrkhEpRUcMGVkgZRqqSD7AbOxkTov246K1GYqx0cUa dHrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+OpIf6mmzhQEGZHeO/d4awp+dHWThaNUC8vaVymDPUY=; b=dP7zq1Rie1r3TwzrYvLdHvf5PG6td9FqVWiBazoSgdoaVe1ZVaNb1i04J+VL7QnXD4 FN+2ZFV/13hksYCiXQM28OAs79rTKMlaL40HLiuJHfd5sh5+k7g4T8yd6yN+lKf0nNNk GczQaUREjhZRGcsyJ5+PWbuUJNguypzo1206twzwQIW63/dx6TMPQL8ILFcCAy8jgBKB K0BXGDFk6OIFitSsQUncFP1cXGsL5OSO7jwNPXoBi/YttQKko65BsY4GFJ9oZLgDiqdN 2Lp+hH0RMSM7P3R/xjrf/rQEcFqM/XZDh9VYHzsuAvQHha5tnYIkJOXHySn9cv2+UDtx ph2w== X-Gm-Message-State: AJaThX4rz2Zl3TzA6CN4/jPRL4zrTqoRhgFLhGJRzO6o1WyArCR1jlwU UMJzqoLN8XmLRt3kJIBJ1Roaxi7a X-Google-Smtp-Source: AGs4zMbfB8LueYvuh0GanEKuTQ41JVsQhDpq2FpQKkFfPglR9NmDMf4w4FILgQY3IqU19uGHgAhNIQ== X-Received: by 10.223.201.8 with SMTP id m8mr1411562wrh.260.1510350854793; Fri, 10 Nov 2017 13:54:14 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id m187sm4438683wmb.17.2017.11.10.13.54.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 13:54:14 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-pci@vger.kernel.org Cc: Dien Pham , Hien Dang , Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH V3] PCI: rcar: Use runtime PM to control controller clock Date: Fri, 10 Nov 2017 22:54:11 +0100 Message-Id: <20171110215411.31912-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dien Pham The controller clock can be switched off during suspend/resume, let runtime PM take care of that. Signed-off-by: Dien Pham Signed-off-by: Hien Dang Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org To: linux-pci@vger.kernel.org Acked-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- V2: - Reorder the fail path in rcar_pcie_probe() to cater for the reordering of function calls in probe - Dispose of fail_clk in rcar_pcie_get_resources() V3: - Fix up the failpath in probe function --- drivers/pci/host/pcie-rcar.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 12796eccb2be..e00f865952d5 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -145,7 +145,6 @@ struct rcar_pcie { void __iomem *base; struct list_head resources; int root_bus_nr; - struct clk *clk; struct clk *bus_clk; struct rcar_msi msi; }; @@ -917,24 +916,14 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) if (IS_ERR(pcie->base)) return PTR_ERR(pcie->base); - pcie->clk = devm_clk_get(dev, "pcie"); - if (IS_ERR(pcie->clk)) { - dev_err(dev, "cannot get platform clock\n"); - return PTR_ERR(pcie->clk); - } - err = clk_prepare_enable(pcie->clk); - if (err) - return err; - pcie->bus_clk = devm_clk_get(dev, "pcie_bus"); if (IS_ERR(pcie->bus_clk)) { dev_err(dev, "cannot get pcie bus clock\n"); - err = PTR_ERR(pcie->bus_clk); - goto fail_clk; + return PTR_ERR(pcie->bus_clk); } err = clk_prepare_enable(pcie->bus_clk); if (err) - goto fail_clk; + return err; i = irq_of_parse_and_map(dev->of_node, 0); if (!i) { @@ -956,8 +945,6 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) err_map_reg: clk_disable_unprepare(pcie->bus_clk); -fail_clk: - clk_disable_unprepare(pcie->clk); return err; } @@ -1125,22 +1112,22 @@ static int rcar_pcie_probe(struct platform_device *pdev) rcar_pcie_parse_request_of_pci_ranges(pcie); + pm_runtime_enable(pcie->dev); + err = pm_runtime_get_sync(pcie->dev); + if (err < 0) { + dev_err(pcie->dev, "pm_runtime_get_sync failed\n"); + goto err_pm_disable; + } + err = rcar_pcie_get_resources(pcie); if (err < 0) { dev_err(dev, "failed to request resources: %d\n", err); - goto err_free_bridge; + goto err_pm_put; } err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); if (err) - goto err_free_bridge; - - pm_runtime_enable(dev); - err = pm_runtime_get_sync(dev); - if (err < 0) { - dev_err(dev, "pm_runtime_get_sync failed\n"); - goto err_pm_disable; - } + goto err_pm_put; /* Failure to get a link might just be that no cards are inserted */ hw_init_fn = of_device_get_match_data(dev); @@ -1172,13 +1159,10 @@ static int rcar_pcie_probe(struct platform_device *pdev) err_pm_put: pm_runtime_put(dev); - err_pm_disable: pm_runtime_disable(dev); - -err_free_bridge: - pci_free_host_bridge(bridge); pci_free_resource_list(&pcie->resources); + pci_free_host_bridge(bridge); return err; }