Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7aef2b64 authored by Jiwei Sun's avatar Jiwei Sun Committed by Mark Brown
Browse files

spi: pl022: add a message state STATE_TIMEOUT for timeout transfer 



When transfer timeout, give -EAGAIN to the message's status, and it can
make the spi device driver choose repeated transimation or not. And if
transfer timeout, output some useful information for tracing the issue.

Signed-off-by: default avatarJiwei Sun <jiwei.sun@windriver.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2e236baf

drivers/spi/spi-pl022.c

+29 −1
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
#define STATE_RUNNING			((void *) 1)

#define STATE_DONE			((void *) 2)

#define STATE_ERROR			((void *) -1)

#define STATE_TIMEOUT			((void *) -2)



/*

 * SSP State - Whether Enabled or Disabled
@@ -1484,6 +1485,30 @@ static void do_interrupt_dma_transfer(struct pl022 *pl022) 
	writew(irqflags, SSP_IMSC(pl022->virtbase));

}



static void print_current_status(struct pl022 *pl022)

{

	u32 read_cr0;

	u16 read_cr1, read_dmacr, read_sr;



	if (pl022->vendor->extended_cr)

		read_cr0 = readl(SSP_CR0(pl022->virtbase));

	else

		read_cr0 = readw(SSP_CR0(pl022->virtbase));

	read_cr1 = readw(SSP_CR1(pl022->virtbase));

	read_dmacr = readw(SSP_DMACR(pl022->virtbase));

	read_sr = readw(SSP_SR(pl022->virtbase));



	dev_warn(&pl022->adev->dev, "spi-pl022 CR0: %x\n", read_cr0);

	dev_warn(&pl022->adev->dev, "spi-pl022 CR1: %x\n", read_cr1);

	dev_warn(&pl022->adev->dev, "spi-pl022 DMACR: %x\n", read_dmacr);

	dev_warn(&pl022->adev->dev, "spi-pl022 SR: %x\n", read_sr);

	dev_warn(&pl022->adev->dev,

			"spi-pl022 exp_fifo_level/fifodepth: %u/%d\n",

			pl022->exp_fifo_level,

			pl022->vendor->fifodepth);



}



static void do_polling_transfer(struct pl022 *pl022)

{

	struct spi_message *message = NULL;
@@ -1535,7 +1560,8 @@ static void do_polling_transfer(struct pl022 *pl022) 
			if (time_after(time, timeout)) {

				dev_warn(&pl022->adev->dev,

				"%s: timeout!\n", __func__);

				message->state = STATE_ERROR;

				message->state = STATE_TIMEOUT;

				print_current_status(pl022);

				goto out;

			}

			cpu_relax();
@@ -1553,6 +1579,8 @@ static void do_polling_transfer(struct pl022 *pl022) 
	/* Handle end of message */

	if (message->state == STATE_DONE)

		message->status = 0;

	else if (message->state == STATE_TIMEOUT)

		message->status = -EAGAIN;

	else

		message->status = -EIO;