summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2018-11-08 08:06:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-09 17:38:44 +0100
commitcc8b83ff6a6968bb69b7e2ddf7cacaf33f1bd301 (patch)
treebcc00e1613fd5d71dcf43ae33d35a1c1dee14cf3 /drivers/spi
parent63f97d305aed08e7ed41cac823d4240481e0b4ef (diff)
downloadlinux-stable-cc8b83ff6a6968bb69b7e2ddf7cacaf33f1bd301.tar.gz
linux-stable-cc8b83ff6a6968bb69b7e2ddf7cacaf33f1bd301.tar.bz2
linux-stable-cc8b83ff6a6968bb69b7e2ddf7cacaf33f1bd301.zip
spi: bcm2835: Fix book-keeping of DMA termination
commit dbc944115eed48af110646992893dc43321368d8 upstream. If submission of a DMA TX transfer succeeds but submission of the corresponding RX transfer does not, the BCM2835 SPI driver terminates the TX transfer but neglects to reset the dma_pending flag to false. Thus, if the next transfer uses interrupt mode (because it is shorter than BCM2835_SPI_DMA_MIN_LENGTH) and runs into a timeout, dmaengine_terminate_all() will be called both for TX (once more) and for RX (which was never started in the first place). Fix it. Signed-off-by: Lukas Wunner <lukas@wunner.de> Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions") Cc: stable@vger.kernel.org # v4.2+ Cc: Mathias Duckeck <m.duckeck@kunbus.de> Cc: Frank Pavlic <f.pavlic@kunbus.de> Cc: Martin Sperl <kernel@martin.sperl.org> Cc: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-bcm2835.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index feb921005382..a011189b698c 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -341,6 +341,7 @@ static int bcm2835_spi_transfer_one_dma(struct spi_master *master,
if (ret) {
/* need to reset on errors */
dmaengine_terminate_all(master->dma_tx);
+ bs->dma_pending = false;
bcm2835_spi_reset_hw(master);
return ret;
}