diff options
| author | Tero Kristo <t-kristo@ti.com> | 2020-05-14 09:37:18 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-05-19 20:20:53 +0200 |
| commit | 98ece19f247159a51003796ede7112fef2df5d7f (patch) | |
| tree | 6e65d9fb0794dd328ae0b818cd9f3c3bf7b14c93 /drivers | |
| parent | ARM: dts: Fix wrong mdio clock for dm814x (diff) | |
| download | linux-98ece19f247159a51003796ede7112fef2df5d7f.tar.xz linux-98ece19f247159a51003796ede7112fef2df5d7f.zip | |
soc: ti: omap-prm: use atomic iopoll instead of sleeping one
The reset handling APIs for omap-prm can be invoked PM runtime which
runs in atomic context. For this to work properly, switch to atomic
iopoll version instead of the current which can sleep. Otherwise,
this throws a "BUG: scheduling while atomic" warning. Issue is seen
rather easily when CONFIG_PREEMPT is enabled.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/ti/omap_prm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index 96c6f777519c..c9b3f9ebf0bb 100644 --- a/drivers/soc/ti/omap_prm.c +++ b/drivers/soc/ti/omap_prm.c @@ -256,10 +256,10 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, goto exit; /* wait for the status to be set */ - ret = readl_relaxed_poll_timeout(reset->prm->base + - reset->prm->data->rstst, - v, v & BIT(st_bit), 1, - OMAP_RESET_MAX_WAIT); + ret = readl_relaxed_poll_timeout_atomic(reset->prm->base + + reset->prm->data->rstst, + v, v & BIT(st_bit), 1, + OMAP_RESET_MAX_WAIT); if (ret) pr_err("%s: timedout waiting for %s:%lu\n", __func__, reset->prm->data->name, id); |