OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: fsi: Increase timeout and ensure status is checked 

Only timeout after at least one iteration of checking the
status registers. In addition, increase the transfer timeout
to 1 second.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20220623140547.71762-1-eajames@linux.ibm.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Eddie James 2022-06-23 09:05:47 -05:00 committed by Mark Brown
parent 26f30e3ee1
commit 40308f9642
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/spi/spi-fsi.c
View File

@ -24,8 +24,7 @@
#define FSI2SPI_IRQ 0x20 #define FSI2SPI_IRQ 0x20
#define SPI_FSI_BASE 0x70000 #define SPI_FSI_BASE 0x70000
#define SPI_FSI_INIT_TIMEOUT_MS 1000 #define SPI_FSI_TIMEOUT_MS 1000
#define SPI_FSI_STATUS_TIMEOUT_MS 100
#define SPI_FSI_MAX_RX_SIZE 8 #define SPI_FSI_MAX_RX_SIZE 8
#define SPI_FSI_MAX_TX_SIZE 40 #define SPI_FSI_MAX_TX_SIZE 40
@ -299,6 +298,7 @@ static void fsi_spi_sequence_init(struct fsi_spi_sequence *seq)
static int fsi_spi_transfer_data(struct fsi_spi *ctx, static int fsi_spi_transfer_data(struct fsi_spi *ctx,
struct spi_transfer *transfer) struct spi_transfer *transfer)
{ {
int loops;
int rc = 0; int rc = 0;
unsigned long end; unsigned long end;
u64 status = 0ULL; u64 status = 0ULL;
@ -317,9 +317,10 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,
if (rc) if (rc)
return rc; return rc;
end = jiffies + msecs_to_jiffies(SPI_FSI_STATUS_TIMEOUT_MS); loops = 0;
end = jiffies + msecs_to_jiffies(SPI_FSI_TIMEOUT_MS);
do { do {
if (time_after(jiffies, end)) if (loops++ && time_after(jiffies, end))
return -ETIMEDOUT; return -ETIMEDOUT;
rc = fsi_spi_status(ctx, &status, "TX"); rc = fsi_spi_status(ctx, &status, "TX");
@ -335,9 +336,10 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,
u8 *rx = transfer->rx_buf; u8 *rx = transfer->rx_buf;
while (transfer->len > recv) { while (transfer->len > recv) {
end = jiffies + msecs_to_jiffies(SPI_FSI_STATUS_TIMEOUT_MS); loops = 0;
end = jiffies + msecs_to_jiffies(SPI_FSI_TIMEOUT_MS);
do { do {
if (time_after(jiffies, end)) if (loops++ && time_after(jiffies, end))
return -ETIMEDOUT; return -ETIMEDOUT;
rc = fsi_spi_status(ctx, &status, "RX"); rc = fsi_spi_status(ctx, &status, "RX");
@ -359,6 +361,7 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,
static int fsi_spi_transfer_init(struct fsi_spi *ctx) static int fsi_spi_transfer_init(struct fsi_spi *ctx)
{ {
int loops = 0;
int rc; int rc;
bool reset = false; bool reset = false;
unsigned long end; unsigned long end;
@ -369,9 +372,9 @@ static int fsi_spi_transfer_init(struct fsi_spi *ctx)
SPI_FSI_CLOCK_CFG_SCK_NO_DEL | SPI_FSI_CLOCK_CFG_SCK_NO_DEL |
FIELD_PREP(SPI_FSI_CLOCK_CFG_SCK_DIV, 19); FIELD_PREP(SPI_FSI_CLOCK_CFG_SCK_DIV, 19);
end = jiffies + msecs_to_jiffies(SPI_FSI_INIT_TIMEOUT_MS); end = jiffies + msecs_to_jiffies(SPI_FSI_TIMEOUT_MS);
do { do {
if (time_after(jiffies, end)) if (loops++ && time_after(jiffies, end))
return -ETIMEDOUT; return -ETIMEDOUT;
rc = fsi_spi_read_reg(ctx, SPI_FSI_STATUS, &status); rc = fsi_spi_read_reg(ctx, SPI_FSI_STATUS, &status);