summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorNobuteru Hayashi <hayashi.nbb@ncos.nec.co.jp>2016-03-18 11:35:21 +0000
committerMark Brown <broonie@kernel.org>2016-03-28 19:41:18 +0100
commita12ddd60ed0a88c3bb83a8d4c07762e41620bf8c (patch)
treec4f9047ec259878a8dd68c7777aa8e84cc5cec2f /drivers/spi
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
downloadlinux-a12ddd60ed0a88c3bb83a8d4c07762e41620bf8c.tar.gz
linux-a12ddd60ed0a88c3bb83a8d4c07762e41620bf8c.tar.bz2
linux-a12ddd60ed0a88c3bb83a8d4c07762e41620bf8c.zip
spi/fsl-espi: Don't spin forever on SPIE_RXCNT
Infinite loop on SPIE_RXCNT occurred. while (SPIE_RXCNT(events) < min(4, mspi->len)) { cpu_relax(); events = mpc8xxx_spi_read_reg(&reg_base->event); } We met a soft lockup at fsl_espi_cpu_irq() because of this. Fix it by using spin_event_timeout() so that fsl_espi_cpu_irq() can break loop with timeouts dmesg. Signed-off-by: Nobuteru Hayashi <hayashi.nbb@ncos.nec.co.jp> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-espi.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 7cb0c1921495..5d7fb81240cd 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -539,11 +539,18 @@ void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)
if (events & SPIE_NE) {
u32 rx_data, tmp;
u8 rx_data_8;
+ int ret;
/* Spin until RX is done */
- while (SPIE_RXCNT(events) < min(4, mspi->len)) {
- cpu_relax();
- events = mpc8xxx_spi_read_reg(&reg_base->event);
+ if (SPIE_RXCNT(events) < min(4, mspi->len)) {
+ ret = spin_event_timeout(
+ !(SPIE_RXCNT(events =
+ mpc8xxx_spi_read_reg(&reg_base->event)) <
+ min(4, mspi->len)),
+ 10000, 0); /* 10 msec */
+ if (!ret)
+ dev_err(mspi->dev,
+ "tired waiting for SPIE_RXCNT\n");
}
if (mspi->len >= 4) {