Unverified Commit 3393f7d9 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Mark Brown
Browse files

spi: bcm2835: only split transfers that exceed DLEN if DMA available 



There is no use for this when performing non DMA operations. So we
bypass the split.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 35ceb675

drivers/spi/spi-bcm2835.c

+11 −9
Original line number Diff line number Diff line
@@ -895,15 +895,17 @@ static int bcm2835_spi_prepare_message(struct spi_master *master, 
	u32 cs = bcm2835_rd(bs, BCM2835_SPI_CS);

	int ret;



	if (master->can_dma) {

		/*

	 * DMA transfers are limited to 16 bit (0 to 65535 bytes) by the SPI HW

	 * due to DLEN. Split up transfers (32-bit FIFO aligned) if the limit is

	 * exceeded.

		 * DMA transfers are limited to 16 bit (0 to 65535 bytes) by

		 * the SPI HW due to DLEN. Split up transfers (32-bit FIFO

		 * aligned) if the limit is exceeded.

		 */

		ret = spi_split_transfers_maxsize(master, msg, 65532,

						  GFP_KERNEL | GFP_DMA);

		if (ret)

			return ret;

	}



	cs &= ~(BCM2835_SPI_CS_CPOL | BCM2835_SPI_CS_CPHA);