mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-25 16:05:34 +07:00
can: flexcan: avoid calling usleep_range from interrupt context
Apparently can_restart() runs from a (timer-) interrupt and can call flexcan_chip_[en|dis]able(), so avoid using usleep_range() Signed-off-by: David Jander <david@protonic.nl> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
1d7efe9dfa
commit
8badd65e48
@ -298,7 +298,7 @@ static int flexcan_chip_enable(struct flexcan_priv *priv)
|
|||||||
flexcan_write(reg, ®s->mcr);
|
flexcan_write(reg, ®s->mcr);
|
||||||
|
|
||||||
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
||||||
usleep_range(10, 20);
|
udelay(10);
|
||||||
|
|
||||||
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)
|
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK)
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
@ -317,7 +317,7 @@ static int flexcan_chip_disable(struct flexcan_priv *priv)
|
|||||||
flexcan_write(reg, ®s->mcr);
|
flexcan_write(reg, ®s->mcr);
|
||||||
|
|
||||||
while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
||||||
usleep_range(10, 20);
|
udelay(10);
|
||||||
|
|
||||||
if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_LPM_ACK))
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
@ -336,7 +336,7 @@ static int flexcan_chip_freeze(struct flexcan_priv *priv)
|
|||||||
flexcan_write(reg, ®s->mcr);
|
flexcan_write(reg, ®s->mcr);
|
||||||
|
|
||||||
while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
while (timeout-- && !(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
||||||
usleep_range(100, 200);
|
udelay(100);
|
||||||
|
|
||||||
if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
if (!(flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
@ -355,7 +355,7 @@ static int flexcan_chip_unfreeze(struct flexcan_priv *priv)
|
|||||||
flexcan_write(reg, ®s->mcr);
|
flexcan_write(reg, ®s->mcr);
|
||||||
|
|
||||||
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK))
|
||||||
usleep_range(10, 20);
|
udelay(10);
|
||||||
|
|
||||||
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)
|
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
@ -370,7 +370,7 @@ static int flexcan_chip_softreset(struct flexcan_priv *priv)
|
|||||||
|
|
||||||
flexcan_write(FLEXCAN_MCR_SOFTRST, ®s->mcr);
|
flexcan_write(FLEXCAN_MCR_SOFTRST, ®s->mcr);
|
||||||
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST))
|
while (timeout-- && (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST))
|
||||||
usleep_range(10, 20);
|
udelay(10);
|
||||||
|
|
||||||
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST)
|
if (flexcan_read(®s->mcr) & FLEXCAN_MCR_SOFTRST)
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
|
Loading…
Reference in New Issue
Block a user