From patchwork Thu Dec 1 17:12:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9456597 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 D090E60585 for ; Thu, 1 Dec 2016 17:14:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9A332851F for ; Thu, 1 Dec 2016 17:14:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC3B728521; Thu, 1 Dec 2016 17:14:43 +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 A728F2851F for ; Thu, 1 Dec 2016 17:14:42 +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 1cCUur-0001rv-AI; Thu, 01 Dec 2016 17:13:01 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCUue-0001Kq-VL for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2016 17:12:53 +0000 Received: by mail-wm0-x234.google.com with SMTP id f82so254938582wmf.1 for ; Thu, 01 Dec 2016 09:12:28 -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; bh=7d3pUDVtFRAbDwpHbGBOuIpC/OUY5tHm3PqoakAjtgw=; b=tB9BrZX7A84S3RFRN/P21Tb2z1oDMe6Ru10lpfiT4G8s34XIRt4IApGs6VN3UUnLWY NygF1na0q2wFg2aFsMnJvGzFwKfA7VxgmSpk6mwC5VE3MUZIZEI2D7hbCns23G6q3Xbs /RkyVmzPeWEFseSoI02nOkPBWz/tuOCgYVUXHeczmYgZ2oYvyIosBwxumFQVpFFzV/W1 r6lc2wRRhaxcGul4JPEosgovkOrXtMthxD6C//Ghd823DzZAz0Ke4rYwKwIPp3IVODmv gw5E5U6mT2arnDFoFfGrIyoZSNOUzWFw0gWLi/2UgoygeDQ22w5+lLPuZ3Qw3Pi8Kf/+ V7Hg== 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; bh=7d3pUDVtFRAbDwpHbGBOuIpC/OUY5tHm3PqoakAjtgw=; b=l7KXaNknEvlwIUKywY5vhu1W3+k+v5fV/cO3tliCZr1JRywQThN35AtPzhrLNRs73w z9tHCqWfDMZTuoG26p4SzPZJmwracazn/1iWjNwoBFNNe1KK9wcY1kcTPbFZWbhiSVpx pzprniVgkPKWZ8vmgeY/KY+nbIKGiBNrU0sE+eQRnhI8/q6pkda6QtHwZZyk0mZ/lkRo P/WRE9qvFsValujMzQ67fVuwKRo7l4qV+T49aLsx/JUrD3eY5FZhUXdwvc1j/dTe5vk9 khisf550/bVfkpON+z+fvVb1jcxkQV7SLqhm79BzOTAh5/zShIp/k7b8LbvLGBBxSRcy qorw== X-Gm-Message-State: AKaTC00RhFuhv08KYqz89+W5vH8G3QJcXNv/fgf4olsvIcXxe6hXasCe/IwJUeKi3PKSjOEB X-Received: by 10.28.109.156 with SMTP id b28mr33627010wmi.116.1480612346515; Thu, 01 Dec 2016 09:12:26 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id d17sm1247270wjr.14.2016.12.01.09.12.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 09:12:26 -0800 (PST) From: Alexandre Bailon To: nsekhar@ti.com Subject: [PATCH v3] ARM: davinci: da8xx: Fix sleeping function called from invalid context Date: Thu, 1 Dec 2016 18:12:22 +0100 Message-Id: <1480612342-23614-1-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161201_091249_495852_840B5527 X-CRM114-Status: GOOD ( 13.83 ) 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, david@lechnology.com 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. 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. Move clk_get() to da8xx_register_usb20_phy_clk() and replace clk_prepare_enable() by clk_enable(). Signed-off-by: Alexandre Bailon --- arch/arm/mach-davinci/usb-da8xx.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index b010e5f..bfb55b9 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -156,23 +156,18 @@ int __init da8xx_register_usb_refclkin(int rate) return 0; } +static struct clk *usb20_clk; + 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); + err = clk_enable(usb20_clk); if (err) { pr_err("failed to enable usb20 clk: %d\n", err); clk_put(usb20_clk); @@ -197,8 +192,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); + clk_disable(usb20_clk); } static void usb20_phy_clk_disable(struct clk *clk) @@ -287,9 +281,16 @@ int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin) struct clk *parent; int ret = 0; + 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)) + if (IS_ERR(parent)) { + clk_put(usb20_clk); return PTR_ERR(parent); + } usb20_phy_clk.parent = parent; ret = clk_register(&usb20_phy_clk);