From patchwork Mon May 21 13:11:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10415283 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 902C860545 for ; Mon, 21 May 2018 13:12:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8006E28917 for ; Mon, 21 May 2018 13:12:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7975228972; Mon, 21 May 2018 13:12:33 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 8708428991 for ; Mon, 21 May 2018 13:11:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751188AbeEUNLn (ORCPT ); Mon, 21 May 2018 09:11:43 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:46790 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbeEUNLm (ORCPT ); Mon, 21 May 2018 09:11:42 -0400 Received: by mail-wr0-f194.google.com with SMTP id x9-v6so13105351wrl.13; Mon, 21 May 2018 06:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uF4Vip1zj70Dbw983A3zf95jJOpBdfWnk3cSPx0nupI=; b=Vu0y0CcG0AjhqmgeXUfNehD4SAK+6ij1h8e6HVUypepY6PlKFcjJAjPHGEtDOI0kdp Pgf1xW7DgspztrJmNBawsMphTQc2CbyIfPiF3IgdQmULB4FDhL7OOIMrPV6Vbe6OCMm7 aAqjdcwsTIzRomV5dJFG+LRGV8M1w8Jgemou/SiNjztrZSCULELZCa9Bt0HIJ/peo+r7 cjo8RXkb/R6murK2x3jfEIv46+A00oWd6xwGmXIUBt7WgID65RjWpfgX7ifOOEymRxjh 4MdleSd0HS5ebabqV06nC0oXuJK6rVVSBzF1Gj07Ac2l07s2Ipe058079Nm3FW2Sx7wX J/dg== 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:in-reply-to :references; bh=uF4Vip1zj70Dbw983A3zf95jJOpBdfWnk3cSPx0nupI=; b=DvBEig0lWcDP7B+DTZiIaa2VvPcnTMg7gV5jzSlSa3r5Kw4qyVZJOQVtYkyevtH8/m wS6VltbF7V4M1woS0Lu8XQzcbxh2Y/Scy7C14nH81pICzxgRyDCWRog8D5Z3hbPxgFQY OsOKpXRLLhODz4NoiHcs13NRuh6uIYlS2LLZmUvxXNLBub1POZ1hTd4W0b/EphlfmDwD /8qfQBHlcJgYsHrOjuOfdsORphcX0Bi3PFopQTkm7yVroCWLtwqJbx5+ShdFsJPlH3I0 OI/VxtFoFMwOKwoJsGF+TVjXqeDYI4tU48G5twXc8Z1XYZBelYHfJqCKN0fAYmW95XRG MerA== X-Gm-Message-State: ALKqPwdYMBYDGRy7MH0DG6DVKz2+udsSe30Xdp2wHI19R1j27ZX/klFO /U9kK47Qt+utIbge4buofHhhHgmZ X-Google-Smtp-Source: AB8JxZoP5ravf9qw8nz+d+veokHe4+fjXcToLv9594VDtpGqSjOaGXIBng9560y0VODTR5t1ZNIHOw== X-Received: by 2002:adf:df81:: with SMTP id z1-v6mr10094210wrl.49.1526908300482; Mon, 21 May 2018 06:11:40 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id f15-v6sm3077068wrm.52.2018.05.21.06.11.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 06:11:39 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 2/4] PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() Date: Mon, 21 May 2018 15:11:21 +0200 Message-Id: <20180521131123.2009-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180521131123.2009-1-marek.vasut+renesas@gmail.com> References: <20180521131123.2009-1-marek.vasut+renesas@gmail.com> 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 The rcar_pcie_get_resources() is another misnomer with a side effect. The function does not only get resources, but also enables/disables bus clock. This is forgotten in the probe() function though and if anything in probe() fails after rcar_pcie_get_resources() is called, the bus clock are never disabled. This patch pulls the clock handling out of the rcar_pcie_get_resources() and enables clock after all the resources were requested. Moreover, this patch also always disables the clock in case of failure. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Reviewed-by: Simon Horman Reported-by: Geert Uytterhoeven Reviewed-by: Geert Uytterhoeven --- drivers/pci/host/pcie-rcar.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index dbc80e457f95..eac4b71d9c60 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -919,32 +919,22 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) dev_err(dev, "cannot get pcie bus clock\n"); return PTR_ERR(pcie->bus_clk); } - err = clk_prepare_enable(pcie->bus_clk); - if (err) - return err; i = irq_of_parse_and_map(dev->of_node, 0); if (!i) { dev_err(dev, "cannot get platform resources for msi interrupt\n"); - err = -ENOENT; - goto err_map_reg; + return -ENOENT; } pcie->msi.irq1 = i; i = irq_of_parse_and_map(dev->of_node, 1); if (!i) { dev_err(dev, "cannot get platform resources for msi interrupt\n"); - err = -ENOENT; - goto err_map_reg; + return -ENOENT; } pcie->msi.irq2 = i; return 0; - -err_map_reg: - clk_disable_unprepare(pcie->bus_clk); - - return err; } static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, @@ -1125,9 +1115,15 @@ static int rcar_pcie_probe(struct platform_device *pdev) goto err_pm_put; } + err = clk_prepare_enable(pcie->bus_clk); + if (err) { + dev_err(dev, "failed to enable bus clock: %d\n", err); + goto err_pm_put; + } + err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); if (err) - goto err_pm_put; + goto err_clk_disable; /* Failure to get a link might just be that no cards are inserted */ hw_init_fn = of_device_get_match_data(dev); @@ -1135,7 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) if (err) { dev_info(dev, "PCIe link down\n"); err = -ENODEV; - goto err_pm_put; + goto err_clk_disable; } data = rcar_pci_read_reg(pcie, MACSR); @@ -1147,16 +1143,19 @@ static int rcar_pcie_probe(struct platform_device *pdev) dev_err(dev, "failed to enable MSI support: %d\n", err); - goto err_pm_put; + goto err_clk_disable; } } err = rcar_pcie_enable(pcie); if (err) - goto err_pm_put; + goto err_clk_disable; return 0; +err_clk_disable: + clk_disable_unprepare(pcie->bus_clk); + err_pm_put: pm_runtime_put(dev);