korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: davinci: Adapt transfer's timeout to transfer's length

Browse Source 
The timeout used when waiting for transfer's completion is always set to
HZ. This isn't enough if a transfer is too large or if the bus speed is
too low.

Use the bus speed and the transfer length to calculate an appropriate
timeout

Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20240828063131.10507-1-bastien.curutchet@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bastien Curutchet 2024-08-28 08:31:31 +02:00 committed by Mark Brown
parent 91232b00b1
commit 2fe6102bf0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi-davinci.c
View File

@ -570,6 +570,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
u32 errors = 0; u32 errors = 0;
struct davinci_spi_config *spicfg; struct davinci_spi_config *spicfg;
struct davinci_spi_platform_data *pdata; struct davinci_spi_platform_data *pdata;
unsigned long timeout;
dspi = spi_controller_get_devdata(spi->controller); dspi = spi_controller_get_devdata(spi->controller);
pdata = &dspi->pdata; pdata = &dspi->pdata;
@ -661,7 +662,12 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
/* Wait for the transfer to complete */ /* Wait for the transfer to complete */
if (spicfg->io_type != SPI_IO_TYPE_POLL) { if (spicfg->io_type != SPI_IO_TYPE_POLL) {
if (wait_for_completion_timeout(&dspi->done, HZ) == 0) timeout = DIV_ROUND_UP(t->speed_hz, MSEC_PER_SEC);
timeout = DIV_ROUND_UP(t->len * 8, timeout);
/* Assume we are at most 2x slower than the nominal bus speed */
timeout = 2 * msecs_to_jiffies(timeout);
if (wait_for_completion_timeout(&dspi->done, timeout) == 0)
errors = SPIFLG_TIMEOUT_MASK; errors = SPIFLG_TIMEOUT_MASK;
} else { } else {
while (dspi->rcount > 0 || dspi->wcount > 0) { while (dspi->rcount > 0 || dspi->wcount > 0) {