From patchwork Sat Nov 30 22:51:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Sittig X-Patchwork-Id: 3261211 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AF14E9F371 for ; Sat, 30 Nov 2013 22:53:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3C11204A9 for ; Sat, 30 Nov 2013 22:52:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 16ED2204A2 for ; Sat, 30 Nov 2013 22:52:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmtOl-0008D1-Nc; Sat, 30 Nov 2013 22:52:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmtOj-0007P2-3C; Sat, 30 Nov 2013 22:52:25 +0000 Received: from mail-out.m-online.net ([212.18.0.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmtOd-0007Nj-QK for linux-arm-kernel@lists.infradead.org; Sat, 30 Nov 2013 22:52:22 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3dX7BH1WS9z4KK2v; Sat, 30 Nov 2013 23:51:51 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3dX7BH1DQFzbbgD; Sat, 30 Nov 2013 23:51:51 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id dXGuJ4sCCS1X; Sat, 30 Nov 2013 23:51:49 +0100 (CET) X-Auth-Info: jgNIUyGQqrIsieoU991q7/uN4AnHpGjqoEJLouiCNNM= Received: from localhost (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 30 Nov 2013 23:51:49 +0100 (CET) From: Gerhard Sittig To: linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Anatolij Gustschin , Mike Turquette Subject: [PATCH v6 01/17] powerpc/fsl-pci: improve clock API use Date: Sat, 30 Nov 2013 23:51:21 +0100 Message-Id: <1385851897-23475-2-git-send-email-gsi@denx.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1385851897-23475-1-git-send-email-gsi@denx.de> References: <1385851897-23475-1-git-send-email-gsi@denx.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131130_175220_091394_D747A00F X-CRM114-Status: GOOD ( 19.70 ) X-Spam-Score: -1.9 (-) Cc: Detlev Zundel , Benjamin Herrenschmidt , Gerhard Sittig , Kumar Gala , Paul Mackerras , Scott Wood X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP make the Freescale PCI driver get, prepare and enable the PCI clock during probe(); the clock gets put upon device shutdown by the devm approach clock lookup is non-fatal as not all platforms may provide clock specs in their device tree or implement a device tree based clock provider, but failure to enable clocks after successful lookup is fatal the driver appears to not have a remove() routine, so no reference to the clock is kept during use, and the clock isn't released (the devm approach will put the clock, but it won't get disabled or unprepared) the 85xx/86xx platforms go through the probe() routine, where clock lookup occurs and the clock gets acquired if one was specified; the 512x/83xx platforms don't pass through probe() but instead directly call the add_bridge() routine at a point in time where the clock provider has not been setup yet even if the platform implements one -- add comments to the code paths as a reminder for the potential need of a workaround in the platform's clock driver, and to keep awareness if code should get re-arranged or moved Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Kumar Gala Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Gerhard Sittig --- arch/powerpc/sysdev/fsl_pci.c | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 4dfd61df8aba..bee8011d6bd7 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -17,6 +17,8 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ + +#include #include #include #include @@ -756,6 +758,32 @@ int __init mpc83xx_add_bridge(struct device_node *dev) const int *bus_range; int primary; + /* + * 85xx/86xx platforms take the path through the probe() routine + * as one would expect, PCI related clocks get acquired there if + * specified + * + * 83xx/512x _don't_ pass through probe(), this add_bridge() + * routine instead is called from within .setup_arch() at a + * point in time where clock providers haven't been setup yet; + * so clocks cannot get acquired here -- lookup would always + * fail even on those platforms which implement the provider + * + * there is no counterpart for add_bridge() just like there is + * no remove() counterpart for probe(), so in either case the + * PCI related clock won't get released, and all of the + * 512x/83xx/85xx/86xx platforms behave in identical ways + * + * this comment is here to "keep the balance" against the + * probe() routine, and as a reminder to acquire clocks if the + * add_bridge() call should move to some later point in time + * + * until then clock providers are expected to work around the + * peripheral driver's not acquiring the PCI clock on those + * platforms where clock providers exist, while nothing needs to + * be done for those platforms without a clock provider + */ + is_mpc83xx_pci = 1; if (!of_device_is_available(dev)) { @@ -1087,9 +1115,33 @@ void fsl_pci_assign_primary(void) static int fsl_pci_probe(struct platform_device *pdev) { + struct clk *clk; int ret; struct device_node *node; + /* + * clock lookup is non-fatal since the driver is shared among + * platforms and not all of them provide clocks specs in their + * device tree, but failure to enable a specified clock is + * considered fatal + * + * note that only the 85xx and 86xx platforms pass through this + * probe() routine, while 83xx and 512x directly invoke the + * mpc83xx_add_bridge() routine from within .setup_arch() code + */ + clk = devm_clk_get(&pdev->dev, "ipg"); + if (!IS_ERR(clk)) { + ret = clk_prepare_enable(clk); + if (ret) { + dev_err(&pdev->dev, "Could not enable PCI clock\n"); + return ret; + } + /* + * TODO where to store the 'clk' reference? there appears + * to be no remove() routine which undoes what probe() does + */ + } + node = pdev->dev.of_node; ret = fsl_add_bridge(pdev, fsl_pci_primary == node);