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

Commit f5be2cda authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spi: spi_qsd: Disable packing for unaliged non DMA mode transfers"

parents cab83ca3 9de45af8

drivers/spi/spi_qsd.c

+10 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1257,11 +1257,15 @@ static void msm_spi_set_qup_io_modes(struct msm_spi *dd) 
	spi_iom &= ~(SPI_IO_M_INPUT_MODE | SPI_IO_M_OUTPUT_MODE);

	spi_iom = (spi_iom | (dd->tx_mode << OUTPUT_MODE_SHIFT));

	spi_iom = (spi_iom | (dd->rx_mode << INPUT_MODE_SHIFT));

	/* Always enable packing for all % 8 bits_per_word */

	if (dd->cur_transfer->bits_per_word &&

		((dd->cur_transfer->bits_per_word == 8) ||

		(dd->cur_transfer->bits_per_word == 16) ||

		(dd->cur_transfer->bits_per_word == 32))) {



	/* Always enable packing for the BAM mode and for non BAM mode only

	 * if bpw is % 8 and transfer length is % 4 Bytes.

	 */

	if (dd->tx_mode == SPI_BAM_MODE ||

		((dd->cur_msg_len % SPI_MAX_BYTES_PER_WORD == 0) &&

		(dd->cur_transfer->bits_per_word) &&

		(dd->cur_transfer->bits_per_word <= 32) &&

		(dd->cur_transfer->bits_per_word % 8 == 0))) {

		spi_iom |= SPI_IO_M_PACK_EN | SPI_IO_M_UNPACK_EN;

		dd->pack_words = true;

	} else {