From patchwork Thu May 24 14:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10424931 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 950456019D for ; Thu, 24 May 2018 14:37:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1F582951B for ; Thu, 24 May 2018 14:37:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96A9E29620; Thu, 24 May 2018 14:37:01 +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 3C1552951B for ; Thu, 24 May 2018 14:37:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970461AbeEXOg6 (ORCPT ); Thu, 24 May 2018 10:36:58 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:43739 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970451AbeEXOge (ORCPT ); Thu, 24 May 2018 10:36:34 -0400 Received: by mail-wr0-f195.google.com with SMTP id r13-v6so3548909wrj.10; Thu, 24 May 2018 07:36:33 -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=7tEu2mruVZDuG+fmYccKQn1fiYLUOmibFHIEJYk5bwc=; b=s5no3r6CmtKY6DxKx7eUHecaLiqbnEk1q3hhBYwywfdTBGbw0jMpgc72+I6ADtrYj4 eInhHglNpAkQN1kL1PjYjW4DbScNryEyCChk/uhSurnr6zearWhUwzHNbSQL5LicwCfC sMVhvdP4ZWqeZ8RPQDO/JEvCcMCBoShsGfKiEqXzzMBC7aRDSggvpTRN7VOeiwrpsAbl BxNNc35oOJr5l+XDwoXrstoOMJMW5bvjUCYTge9xLVXqTEBsxlKyNwC97X3NH3aGqJV/ UFDJJIduTCHn4TJTOcaI2ZA701U9q8M8EIh8GuR6pGqvosQudfxor8qcdgNelhoRfohu 2EXw== 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=7tEu2mruVZDuG+fmYccKQn1fiYLUOmibFHIEJYk5bwc=; b=hUAGOuIAcGP0P4PYF2KlR+W2/xDRtcw2O6Jxymsh+/gV6jbvuH4FEXlp5JXGuIxSRt /nlCg4glOeluUqLMWgo57nhyg2eYneBfQDUZkqBN+28RWOQaVmUumL43jTW+fvninyLE 9I7oGGLY4dmuWjbZ/VrvZTRHhQHAYyZJ29bZ0B7cW0/wyOOpCFzLICY3RcrH7/VXfeJd meey1yf6jwapL+9OK9S8IovPjaQiEM3/xsgfakUReeELr3FCF84T8DnDti8GxtOXbBIA MC0Ccc0IaQggiKc4Ze0CFCyAQcvdLuWw44c3rbKpzguqKotqmrI2yW35Mhtm9urzbirI YY9w== X-Gm-Message-State: ALKqPwcwJxZza3YVlsw3l+PRE30kDvqv/+PURdesjm036Oz6SCgzaFS4 BrqB5akTth7sDkWaQuev9J9G5mgw X-Google-Smtp-Source: AB8JxZoPZXfjfedd+gRGR0x5TBwyF6wgFpFVjRPcUt3A4NVo+kf0f3nYB/yLkI6VZUlLNVSISLVS7A== X-Received: by 2002:adf:e447:: with SMTP id t7-v6mr2801333wrm.145.1527172592413; Thu, 24 May 2018 07:36:32 -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 x17-v6sm14348276wmd.46.2018.05.24.07.36.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 07:36:31 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Lorenzo Pieralisi , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH v4 1/6] PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() Date: Thu, 24 May 2018 16:36:19 +0200 Message-Id: <20180524143624.26718-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180524143624.26718-1-marek.vasut+renesas@gmail.com> References: <20180524143624.26718-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: Lorenzo Pieralisi Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Acked-by: Simon Horman --- V2: No change V3: No change V4: Rebase on top of Lorenzo's pci/rcar, fix up the rebase breakage induced by patches therein --- drivers/pci/host/pcie-rcar.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 8d161563bce8..0879880f7975 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -946,32 +946,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, @@ -1115,22 +1105,28 @@ 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; phy_init_fn = of_device_get_match_data(dev); err = phy_init_fn(pcie); if (err) { dev_err(dev, "failed to init PCIe PHY\n"); - goto err_pm_put; + goto err_clk_disable; } /* Failure to get a link might just be that no cards are inserted */ if (rcar_pcie_hw_init(pcie)) { dev_info(dev, "PCIe link down\n"); err = -ENODEV; - goto err_pm_put; + goto err_clk_disable; } data = rcar_pci_read_reg(pcie, MACSR); @@ -1142,16 +1138,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);