From patchwork Wed Dec 7 15:22:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9464709 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 6F14460459 for ; Wed, 7 Dec 2016 15:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7148F28493 for ; Wed, 7 Dec 2016 15:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 660A9284F5; Wed, 7 Dec 2016 15:23:21 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 DC87728493 for ; Wed, 7 Dec 2016 15:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932297AbcLGPXT (ORCPT ); Wed, 7 Dec 2016 10:23:19 -0500 Received: from mail-wj0-f181.google.com ([209.85.210.181]:34461 "EHLO mail-wj0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932336AbcLGPW2 (ORCPT ); Wed, 7 Dec 2016 10:22:28 -0500 Received: by mail-wj0-f181.google.com with SMTP id tg4so108800260wjb.1 for ; Wed, 07 Dec 2016 07:22:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d2pYRm1fddzAUglKxcCnoeBfivzrg6/Jll/RKmHLUR0=; b=TX1P9s5Tf67Dc40SOYBWCZZRjoY8GXe6B7ex9Yr+3hHQLsCXA9Xnhwd6psVlNG6XjL zHRrl87HgIfetlb6DizQuAZ0jiL1xlNQjJBRudU7BDnSEIX+3BZNk16qwmw0wMxkziDf C5ugV/xPFmrRUa23ubZ7kFalRLiFIV7bzw+2w6T9LEhna+OoMG7KgKjemPzAO3qcQbRo 9QcO2BT276Gc9DnMJ0Fem2VxdGBHmnhFw2gmB0EqVZH3lNuIsAMIOfYeKPX/pOoT4Kvw xyA8+3MoqG3QQrEev5B+ZTGO1MHDtzk6vPjTFYVD2nLv4uM5PRmnhOLS4OBMCwjZhXXF 65Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d2pYRm1fddzAUglKxcCnoeBfivzrg6/Jll/RKmHLUR0=; b=f1sqXrXPuii1PAXgd66xeH1P58TVAIFyfDs1miry/59AoyJrC2xzQzQ+YgVgoXdN22 muXKvEFoY0Zm7KVatniNLnl+IU6zA+HY5i4k7mXCUID9JHLTNiKLl0bUtVpVkGeq107w QoSst3eEGmaQysF7vwOHGxh36XAflo+zJreJY/oAVU5F3uYQEOJTUiAGWuW0+Lqiou/6 pf/iYsx32v4ncIKVH7yP5IAexRT+L7EYCkwgClQdl6U3qFLSJ1KonolYv9ZS/dy3/xxA 5V3tZQJCtJvg8ZvAI8BqDBBAMRQrqW1y78YA0eSecbx/fmQRKF+ND5BgGbbJQILtzpPB m4Ug== X-Gm-Message-State: AKaTC00U3VXhqv1xvpkzyZo7LOETG0Ic1rblf+mBozR0ZuajqaUs34Z6lVrNMQUHnysowXYv X-Received: by 10.194.23.67 with SMTP id k3mr61005316wjf.103.1481124146741; Wed, 07 Dec 2016 07:22:26 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id r138sm10198123wme.9.2016.12.07.07.22.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 07:22:25 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Peter Ujfalusi , Russell King , Viresh Kumar , Boris Brezillon , "Rafael J. Wysocki" , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen Cc: LKML , arm-soc , linux-pm@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 1/4] ARM: da850: fix infinite loop in clk_set_rate() Date: Wed, 7 Dec 2016 16:22:15 +0100 Message-Id: <1481124138-27337-2-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1481124138-27337-1-git-send-email-bgolaszewski@baylibre.com> References: <1481124138-27337-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The aemif clock is added twice to the lookup table in da850.c. This breaks the children list of pll0_sysclk3 as we're using the same list links in struct clk. When calling clk_set_rate(), we get stuck in propagate_rate(). Create a separate clock for nand, inheriting the rate of the aemif clock and retrieve it in the davinci_nand module. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da850.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e770c97..e9d019c 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -367,6 +367,16 @@ static struct clk aemif_clk = { .flags = ALWAYS_ENABLED, }; +/* + * In order to avoid adding the aemif_clk to the clock lookup table twice (and + * screwing up the linked list in the process) create a separate clock for + * nand inheriting the rate from aemif_clk. + */ +static struct clk aemif_nand_clk = { + .name = "nand", + .parent = &aemif_clk, +}; + static struct clk usb11_clk = { .name = "usb11", .parent = &pll0_sysclk4, @@ -537,7 +547,15 @@ static struct clk_lookup da850_clks[] = { CLK("da830-mmc.0", NULL, &mmcsd0_clk), CLK("da830-mmc.1", NULL, &mmcsd1_clk), CLK("ti-aemif", NULL, &aemif_clk), - CLK(NULL, "aemif", &aemif_clk), + /* + * The only user of this clock is davinci_nand and it get's it through + * con_id. The nand node itself is created from within the aemif + * driver to guarantee that it's probed after the aemif timing + * parameters are configured. of_dev_auxdata is not accessible from + * the aemif driver and can't be passed to of_platform_populate(). For + * that reason we're leaving the dev_id here as NULL. + */ + CLK(NULL, "aemif", &aemif_nand_clk), CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk),