From patchwork Wed Dec 7 17:09:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9464999 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 8473860512 for ; Wed, 7 Dec 2016 18:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D72128543 for ; Wed, 7 Dec 2016 18:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F0892854A; Wed, 7 Dec 2016 18:10:36 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2BB228543 for ; Wed, 7 Dec 2016 18:10:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEge7-0000WF-QS; Wed, 07 Dec 2016 18:08:47 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEge2-0000VP-0U for linux-arm-kernel@bombadil.infradead.org; Wed, 07 Dec 2016 18:08:42 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by merlin.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEfj8-0001fU-QE for linux-arm-kernel@lists.infradead.org; Wed, 07 Dec 2016 17:09:56 +0000 Received: by mail-wm0-x22b.google.com with SMTP id t79so176793629wmt.0 for ; Wed, 07 Dec 2016 09:09:33 -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=0bO2BnVZ2XrYi8AZmD+Kopc8qbML/MVSrETWYij+AE8=; b=UrznpErOo2v0XMWFzt2nX59E4akGzs4m36FX7pb8A9f0PGxDsqlUOoEfxn6r/YiWGP i1hsVuouKCZifWuqR39VU9kEkKLJjU5NfIGJ9dYsAiFTrgaQt1BIoPXLXgb0okOJFXXh qSRggPw9MxEXO5Xsw4YxhcHcHkIUpT0GgeDBFblNnwIaBvXr5SQWOzNpGLdzPCn5afp5 HQoNY+nkyw8zL49R6dh0iDbZCqUMQqEq+/sU8bTA/dW1UK+7H+SudT3ja5018Ii1s1YL Doku6b1u1Yvto6skihpAWQhNysF5/oUh/+QztMEUo8lOIWQRibCWHv6Od0106BGWEENo Pqtw== 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=0bO2BnVZ2XrYi8AZmD+Kopc8qbML/MVSrETWYij+AE8=; b=K/VNTaXGFWyxy2WW3PbG6jXYXPol+Pwl6SP7o1IH5LakbwxUR/vVExNk1wyyJfsVj/ LjEKbm5r88mZq9nNdsc9nsqqGxwzLGw/1L/84uhk8Hze08cTyGWOj/Td99L2ddBfyTOA I6tkszdzmaGTBwS/YgqUMXe35iGLHCIho7vwZUH8r3Acax10rXsj7N8Z8FYW5xBHdsnK TKjnrUy9xiLcVM+4Q5y6f+hab9qn7tPmfjwOqkyrIdA7rTpfxwMbBKvHAKReq2QcNS53 nIlJnew1kRQJIAo9BR79xrKz5+BL0i5KOg9Ryq+uYRzF294SMM6Z2KqmfHEuEVBheJLP riyQ== X-Gm-Message-State: AKaTC006YCJwuOitLsGG7EFkknpB/uvW4j8CPpncCj3TqrPd22CXqETjxvmxUlVF0qYyUf+a X-Received: by 10.28.167.199 with SMTP id q190mr3903700wme.15.1481130571987; Wed, 07 Dec 2016 09:09:31 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id v3sm32375638wjp.13.2016.12.07.09.09.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 09:09:31 -0800 (PST) From: Alexandre Bailon To: nsekhar@ti.com Subject: [PATCH v6 2/2] ARM: davinci: da8xx: Fix sleeping function called from invalid context Date: Wed, 7 Dec 2016 18:09:27 +0100 Message-Id: <1481130567-27829-2-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1481130567-27829-1-git-send-email-abailon@baylibre.com> References: <1481130567-27829-1-git-send-email-abailon@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161207_120955_016025_270033DE X-CRM114-Status: GOOD ( 16.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, ahaslam@baylibre.com, khilman@baylibre.com, Alexandre Bailon , ptitiano@baylibre.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Everytime the usb20 phy is enabled, there is a "sleeping function called from invalid context" BUG. In addition, there is a recursive locking happening because of the recurse call to clk_enable(). clk_enable() from arch/arm/mach-davinci/clock.c uses spin_lock_irqsave() before to invoke the callback usb20_phy_clk_enable(). usb20_phy_clk_enable() uses clk_get() and clk_enable_prepapre() which may sleep. replace clk_prepare_enable() by davinci_clk_enable(). Signed-off-by: Alexandre Bailon Suggested-by: David Lechner --- arch/arm/mach-davinci/usb-da8xx.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index c6feecf..9edd2d8 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -22,6 +22,8 @@ #define DA8XX_USB0_BASE 0x01e00000 #define DA8XX_USB1_BASE 0x01e25000 +static struct clk *usb20_clk; + static struct platform_device da8xx_usb_phy = { .name = "da8xx-usb-phy", .id = -1, @@ -158,26 +160,14 @@ int __init da8xx_register_usb_refclkin(int rate) static void usb20_phy_clk_enable(struct clk *clk) { - struct clk *usb20_clk; int err; u32 val; u32 timeout = 500000; /* 500 msec */ val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG)); - usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20"); - if (IS_ERR(usb20_clk)) { - pr_err("could not get usb20 clk: %ld\n", PTR_ERR(usb20_clk)); - return; - } - /* The USB 2.O PLL requires that the USB 2.O PSC is enabled as well. */ - err = clk_prepare_enable(usb20_clk); - if (err) { - pr_err("failed to enable usb20 clk: %d\n", err); - clk_put(usb20_clk); - return; - } + davinci_clk_enable(usb20_clk); /* * Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1 @@ -197,8 +187,7 @@ static void usb20_phy_clk_enable(struct clk *clk) pr_err("Timeout waiting for USB 2.0 PHY clock good\n"); done: - clk_disable_unprepare(usb20_clk); - clk_put(usb20_clk); + davinci_clk_disable(usb20_clk); } static void usb20_phy_clk_disable(struct clk *clk) @@ -285,11 +274,19 @@ static struct clk_lookup usb20_phy_clk_lookup = int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin) { struct clk *parent; - int ret = 0; + int ret; + + usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20"); + ret = PTR_ERR_OR_ZERO(usb20_clk); + if (ret) + return ret; parent = clk_get(NULL, use_usb_refclkin ? "usb_refclkin" : "pll0_aux"); - if (IS_ERR(parent)) - return PTR_ERR(parent); + ret = PTR_ERR_OR_ZERO(parent); + if (ret) { + clk_put(usb20_clk); + return ret; + } usb20_phy_clk.parent = parent; ret = clk_register(&usb20_phy_clk);