spi: bcm2835: change timeout of polling driver to 1s
The way that the timeout code is written in the polling function the timeout does also trigger when interrupted or rescheduled while in the polling loop. This patch changes the timeout from effectively 20ms (=2 jiffies) to 1 second and removes the time that the transfer really takes out of the computation, as - per design - this is <30us and the jiffie resolution is 10ms so that does not make any difference what so ever. Signed-off-by: Martin Sperl <kernel@martin.sperl.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
56afdb70ca
commit
145367baa4
|
@ -164,13 +164,12 @@ static int bcm2835_spi_transfer_one_poll(struct spi_master *master,
|
|||
unsigned long xfer_time_us)
|
||||
{
|
||||
struct bcm2835_spi *bs = spi_master_get_devdata(master);
|
||||
unsigned long timeout = jiffies +
|
||||
max(4 * xfer_time_us * HZ / 1000000, 2uL);
|
||||
/* set timeout to 1 second of maximum polling */
|
||||
unsigned long timeout = jiffies + HZ;
|
||||
|
||||
/* enable HW block without interrupts */
|
||||
bcm2835_wr(bs, BCM2835_SPI_CS, cs | BCM2835_SPI_CS_TA);
|
||||
|
||||
/* set timeout to 4x the expected time, or 2 jiffies */
|
||||
/* loop until finished the transfer */
|
||||
while (bs->rx_len) {
|
||||
/* read from fifo as much as possible */
|
||||
|
|
Loading…
Reference in a new issue