aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2016-02-04 05:30:57 -0500
committerMark Brown <broonie@kernel.org>2016-02-04 05:49:17 -0500
commit7a8d44bc89e5cddcd5c0704a11a90484d36ba6ba (patch)
treeaf36d094597ace64a449fdb7c28706c3e182b705
parent07550df04712c88717d2ab6578bb36bbd4305e35 (diff)
spi: pxa2xx: Fix too early chipselect deassert
There is a chance that chipselect is deasserted too early while the last clock cycle is still running. Protocol analyzers will see this as a failed last byte. This is more likely to occur with slow bitrates, for instance at 25 kbps. Reason for this is when using SPI mode 0 that both SPI host controller and SPI slave will drive the data lines at the falling edge of clock signal and sample at the rising edge. Receive FIFO gets the last bit now at the rising edge and code sees transfer to be finished either by the interrupt in PIO mode or by the DMA completion in DMA mode. The SSP Time Out register SSTO should take care of delaying the completion but it does not seems to have effect at least on Intel Skylake and Broxton even when using long enough values. Depending on timing code may get into point where chipselect is deasserted while the last clock cycle is still running at its second half cycle. Fix this by adding a wait loop in giveback() that waits until SSP becomes idle before deasserting the chipselect. Reported-by: Weifeng Voon <weifeng.voon@intel.com> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-pxa2xx.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 9b9a528a9fbd..ce66cf44bba5 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -496,6 +496,7 @@ static void giveback(struct driver_data *drv_data)
496{ 496{
497 struct spi_transfer* last_transfer; 497 struct spi_transfer* last_transfer;
498 struct spi_message *msg; 498 struct spi_message *msg;
499 unsigned long timeout;
499 500
500 msg = drv_data->cur_msg; 501 msg = drv_data->cur_msg;
501 drv_data->cur_msg = NULL; 502 drv_data->cur_msg = NULL;
@@ -508,6 +509,12 @@ static void giveback(struct driver_data *drv_data)
508 if (last_transfer->delay_usecs) 509 if (last_transfer->delay_usecs)
509 udelay(last_transfer->delay_usecs); 510 udelay(last_transfer->delay_usecs);
510 511
512 /* Wait until SSP becomes idle before deasserting the CS */
513 timeout = jiffies + msecs_to_jiffies(10);
514 while (pxa2xx_spi_read(drv_data, SSSR) & SSSR_BSY &&
515 !time_after(jiffies, timeout))
516 cpu_relax();
517
511 /* Drop chip select UNLESS cs_change is true or we are returning 518 /* Drop chip select UNLESS cs_change is true or we are returning
512 * a message with an error, or next message is for another chip 519 * a message with an error, or next message is for another chip
513 */ 520 */