From patchwork Sun Apr 17 13:34:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 611439 X-Patchwork-Delegate: jonathanh@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qnsky6WFYz9t47 for ; Sun, 17 Apr 2016 23:36:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=nUbJf8Lg; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753028AbcDQNgn (ORCPT ); Sun, 17 Apr 2016 09:36:43 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34553 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbcDQNgm (ORCPT ); Sun, 17 Apr 2016 09:36:42 -0400 Received: by mail-lf0-f68.google.com with SMTP id e190so22644288lfe.1; Sun, 17 Apr 2016 06:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=QQgn/v7gIEVLJGLNO2LRKA/d331KM7xM45IYuIMsDK8=; b=nUbJf8Lgr7LhfZwtnxALNzqD7rPm+3soCplgSq9iJX7pqEV+/qhP0OAaCkDhIzrPxM ZlvXIGSCG9SF34YWUnB9nPl115qQWZDqkNXvdD6L74EoG6+dCLreV3dXBp1EJoX648zH ZJ5JV97sMxdAzdZgrpX1UDorFKjdej4sqDOQozg/nVDcJ0bRYsoqadJachYfpxTBqOHE ekpaIFcLZp55WMtXffud426WCGvWzf2oslWBgsubZXXWo6WuHGDjWPGTSDjQOIDRxU2S CogkxNB6jOYDKA5SnOYHQxVUQNFGXRO2uQOhBluifJSITIOtOwQcAOMKmnqIZkR6dxg4 uqzg== 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=QQgn/v7gIEVLJGLNO2LRKA/d331KM7xM45IYuIMsDK8=; b=cocCsk2AAK/Q+z1KbHdu3OtXAxv8F+bXuKiudEAwk9eFmji5uAKSoIoJFzxT4f5Eo+ 0CMUGMkbWfvZQa03IQ3gZQ61pechCPgYnL0UvEz9nFdsUOe0X6hPLHOmFwLp5ZeHF2YM g2NF3bVMHGiHfQhHU1dWgXGCSxrchaaCyGU9QQgT3fbqQCpYf7RGtAHdKlyeOndvxa7M ICcpLVHZAEIDqaYg9Ldb175jBBcSoTJp9foQTQI1lxxehJ279sO7IvTPWkbAGaXZJ8Sh 9ZAmp69RmYBVdcSaVmj0etYxy6XotH/+HbGTn3qImNaYgLA6SVXNRHsgbilfzl9EfDND QCEA== X-Gm-Message-State: AOPr4FWiEZGuWrq0AkSmYyv30KO2RheXv3oqVaXCROAK8Sx1TuXc+NGG7/uXv8Od1pu3OQ== X-Received: by 10.25.156.133 with SMTP id f127mr13015076lfe.102.1460900200013; Sun, 17 Apr 2016 06:36:40 -0700 (PDT) Received: from localhost.localdomain (ppp91-77-101-241.pppoe.mtu-net.ru. [91.77.101.241]) by smtp.gmail.com with ESMTPSA id h94sm3805616lfi.39.2016.04.17.06.36.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Apr 2016 06:36:39 -0700 (PDT) From: Dmitry Osipenko To: Stephen Warren , Thierry Reding , Alexandre Courbot , Peter De Schrijver , Prashant Gaikwad Cc: linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc/tegra: pmc: Fix "scheduling while atomic" Date: Sun, 17 Apr 2016 16:34:11 +0300 Message-Id: <1460900051-3065-1-git-send-email-digetx@gmail.com> X-Mailer: git-send-email 2.8.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org clk_get_rate() takes a mutex, hence cannot be used while IRQ's been disabled. Replace it with a locked version. [ 3.430853] [] (dump_stack) from [] (__schedule_bug+0x50/0x64) [ 3.431079] [] (__schedule_bug) from [] (__schedule+0x5c8/0x688) [ 3.431453] [] (__schedule) from [] (schedule_preempt_disabled+0x24/0x34) [ 3.431835] [] (schedule_preempt_disabled) from [] (__mutex_lock_slowpath+0xbc/0x170) [ 3.432204] [] (__mutex_lock_slowpath) from [] (mutex_lock+0x4c/0x50) [ 3.432427] [] (mutex_lock) from [] (clk_prepare_lock+0x88/0xfc) [ 3.432800] [] (clk_prepare_lock) from [] (clk_get_rate+0xc/0x60) [ 3.433177] [] (clk_get_rate) from [] (tegra_pmc_enter_suspend_mode+0x188/0x20c) [ 3.433580] [] (tegra_pmc_enter_suspend_mode) from [] (tegra_idle_lp2_last+0xc/0x40) [ 3.433795] [] (tegra_idle_lp2_last) from [] (tegra20_idle_lp2_coupled+0x118/0x1fc) [ 3.434171] [] (tegra20_idle_lp2_coupled) from [] (cpuidle_enter_state+0x3c/0x160) [ 3.434551] [] (cpuidle_enter_state) from [] (cpuidle_enter_state_coupled+0x3dc/0x3f4) [ 3.434959] [] (cpuidle_enter_state_coupled) from [] (cpu_startup_entry+0x240/0x288) [ 3.435340] [] (cpu_startup_entry) from [] (start_kernel+0x3b4/0x3c0) [ 3.435557] [] (start_kernel) from [<00008074>] (0x8074) Signed-off-by: Dmitry Osipenko --- drivers/clk/tegra/clk-tegra-pmc.c | 9 +++++++++ drivers/soc/tegra/pmc.c | 2 +- include/linux/clk/tegra.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/clk/tegra/clk-tegra-pmc.c b/drivers/clk/tegra/clk-tegra-pmc.c index 91377ab..1ccf414 100644 --- a/drivers/clk/tegra/clk-tegra-pmc.c +++ b/drivers/clk/tegra/clk-tegra-pmc.c @@ -78,6 +78,8 @@ static struct pmc_clk_init_data pmc_clks[] = { PMC_CLK(3, 22, 18), }; +static struct clk_hw *pclk_hw; + void __init tegra_pmc_clk_init(void __iomem *pmc_base, struct tegra_clk *tegra_clks) { @@ -112,6 +114,9 @@ void __init tegra_pmc_clk_init(void __iomem *pmc_base, clk_register_clkdev(clk, data->dev_name, data->gate_name); } + dt_clk = tegra_lookup_dt_id(tegra_clk_pclk, tegra_clks); + pclk_hw = __clk_get_hw(*dt_clk); + /* blink */ writel_relaxed(0, pmc_base + PMC_BLINK_TIMER); clk = clk_register_gate(NULL, "blink_override", "clk_32k", 0, @@ -129,3 +134,7 @@ void __init tegra_pmc_clk_init(void __iomem *pmc_base, *dt_clk = clk; } +unsigned long tegra_pmc_get_pclk_rate(void) +{ + return clk_hw_get_rate(pclk_hw); +} diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 08966c2..6752714 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -638,7 +638,7 @@ void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode) break; case TEGRA_SUSPEND_LP2: - rate = clk_get_rate(pmc->clk); + rate = tegra_pmc_get_pclk_rate(); break; default: diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 57bf7aa..717d71d 100644 --- a/include/linux/clk/tegra.h +++ b/include/linux/clk/tegra.h @@ -121,4 +121,6 @@ static inline void tegra_cpu_clock_resume(void) } #endif +unsigned long tegra_pmc_get_pclk_rate(void); + #endif /* __LINUX_CLK_TEGRA_H_ */