diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-07 08:57:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-07 08:57:32 -0400 |
| commit | 07b53103b7a6c228ae8b74ae720b9c5d219ee7fd (patch) | |
| tree | ab78b271289deb21d345c92e1e3ecc8d46d2e085 /drivers/spi/atcspi200_spi.c | |
| parent | 1b8ad819cead7020d35f6251ef0cf3f393c61e51 (diff) | |
| parent | 91e4b7516d84cefab7324765b3c8d6a909185ce2 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
Diffstat (limited to 'drivers/spi/atcspi200_spi.c')
| -rw-r--r-- | drivers/spi/atcspi200_spi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 634cd565610..775b9ffc259 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -201,7 +201,7 @@ static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, size_t cmd_len = ns->cmd_len; unsigned long data_len = bitlen / 8; int rf_cnt; - int ret = 0; + int ret = 0, timeout = 0; max_tran_len = ns->max_transfer_length; switch (flags) { @@ -243,11 +243,12 @@ static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, ns->tran_len = tran_len; num_blks = DIV_ROUND_UP(tran_len , CHUNK_SIZE); num_bytes = (tran_len) % CHUNK_SIZE; + timeout = SPI_TIMEOUT; if(num_bytes == 0) num_bytes = CHUNK_SIZE; __atcspi200_spi_start(ns); - while (num_blks) { + while (num_blks && (timeout--)) { event = in_le32(&ns->regs->status); if ((event & TXEPTY) && (data_out)) { __nspi_espi_tx(ns, dout); @@ -269,6 +270,11 @@ static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, din = (unsigned char *)din + rx_bytes; } } + + if (!timeout) { + debug("spi_xfer: %s() timeout\n", __func__); + break; + } } data_len -= tran_len; |