Skip to content

Commit

Permalink
spi/fsl-espi: Don't wait transaction completion forever
Browse files Browse the repository at this point in the history
Because the eSPI driver uses wait_for_completion(), any stuck-able
phenomenon at half-way transaction progress made worker task hang up.
This phenomenon is perhaps caused by eSPI device errata which seems not
to be published from vendor site yet.

Anyway, we fix hang task by using fixed 2 seconds timeout
that is our preferred value for eSPI maximum transaction size.

It seems to be better that eSPI driver can detect this stuck and
report error (EMSGSIZE) to the upper device driver because
the upper device driver can decide to retry or recover.

Signed-off-by: Nobuteru Hayashi <hayashi.nbb@ncos.nec.co.jp>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nobuteru Hayashi authored and Mark Brown committed Mar 28, 2016
1 parent a12ddd6 commit aa70e56
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/spi/spi-fsl-espi.c
Original file line number Diff line number Diff line change
@@ -245,7 +245,12 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
if (ret)
return ret;

wait_for_completion(&mpc8xxx_spi->done);
/* Won't hang up forever, SPI bus sometimes got lost interrupts... */
ret = wait_for_completion_timeout(&mpc8xxx_spi->done, 2 * HZ);
if (ret == 0)
dev_err(mpc8xxx_spi->dev,
"Transaction hanging up (left %d bytes)\n",
mpc8xxx_spi->count);

/* disable rx ints */
mpc8xxx_spi_write_reg(&reg_base->mask, 0);

0 comments on commit aa70e56

Please sign in to comment.