| Message ID | 1513935965-12909-1-git-send-email-aisheng.dong@nxp.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 22 December 2017 at 10:46, Dong Aisheng <aisheng.dong@nxp.com> wrote: > Current clk_pm_runtime_put is using pm_runtime_put_sync which > is not safe to be called in clk_core_is_enabled as it should > be able to run in atomic context. > > Thus use pm_runtime_put instead which is atomic safe. > > Cc: Stephen Boyd <sboyd@codeaurora.org> > Cc: Michael Turquette <mturquette@baylibre.com> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Fixes: 9a34b45397e5 ("clk: Add support for runtime PM") > Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > drivers/clk/clk.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 5ec5809..e24968f 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c > @@ -227,7 +227,8 @@ static bool clk_core_is_enabled(struct clk_core *core) > > ret = core->ops->is_enabled(core->hw); > done: > - clk_pm_runtime_put(core); > + if (core->dev) > + pm_runtime_put(core->dev); > > return ret; > } > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/22, Dong Aisheng wrote: > Current clk_pm_runtime_put is using pm_runtime_put_sync which > is not safe to be called in clk_core_is_enabled as it should > be able to run in atomic context. > > Thus use pm_runtime_put instead which is atomic safe. > > Cc: Stephen Boyd <sboyd@codeaurora.org> > Cc: Michael Turquette <mturquette@baylibre.com> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Fixes: 9a34b45397e5 ("clk: Add support for runtime PM") > Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> > --- Applied to clk-fixes
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 5ec5809..e24968f 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -227,7 +227,8 @@ static bool clk_core_is_enabled(struct clk_core *core) ret = core->ops->is_enabled(core->hw); done: - clk_pm_runtime_put(core); + if (core->dev) + pm_runtime_put(core->dev); return ret; }
Current clk_pm_runtime_put is using pm_runtime_put_sync which is not safe to be called in clk_core_is_enabled as it should be able to run in atomic context. Thus use pm_runtime_put instead which is atomic safe. Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Fixes: 9a34b45397e5 ("clk: Add support for runtime PM") Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> --- drivers/clk/clk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)