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

Commit 4302a596 authored by Stefan Roese's avatar Stefan Roese Committed by Mark Brown
Browse files

spi: fsl: Fix problem with multi message transfers 



When used via spidev with more than one messages to tranfer via
SPI_IOC_MESSAGE the current implementation would return with
-EINVAL, since bits_per_word and speed_hz are set in all
transfer structs. And in the 2nd loop status will stay at
-EINVAL as its not overwritten again via fsl_spi_setup_transfer().

This patch changes this behavious by first checking if one of
the messages uses different settings. If this is the case
the function will return with -EINVAL. If not, the messages
are transferred correctly.

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

drivers/spi/spi-fsl-spi.c

+15 −5
Original line number Diff line number Diff line
@@ -362,18 +362,28 @@ static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t, 
static void fsl_spi_do_one_msg(struct spi_message *m)

{

	struct spi_device *spi = m->spi;

	struct spi_transfer *t;

	struct spi_transfer *t, *first;

	unsigned int cs_change;

	const int nsecs = 50;

	int status;



	cs_change = 1;

	status = 0;

	list_for_each_entry(t, &m->transfers, transfer_list) {

		if (t->bits_per_word || t->speed_hz) {

	/* Don't allow changes if CS is active */

	first = list_first_entry(&m->transfers, struct spi_transfer,

			transfer_list);

	list_for_each_entry(t, &m->transfers, transfer_list) {

		if ((first->bits_per_word != t->bits_per_word) ||

			(first->speed_hz != t->speed_hz)) {

			status = -EINVAL;

			dev_err(&spi->dev,

				"bits_per_word/speed_hz should be same for the same SPI transfer\n");

			return;

		}

	}



	cs_change = 1;

	status = -EINVAL;

	list_for_each_entry(t, &m->transfers, transfer_list) {

		if (t->bits_per_word || t->speed_hz) {

			if (cs_change)

				status = fsl_spi_setup_transfer(spi, t);

			if (status < 0)