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

Commit 1590ebfa authored by Justin Chen's avatar Justin Chen Committed by Greg Kroah-Hartman
Browse files

spi: bcm-qspi: when tx/rx buffer is NULL set to 0 



commit 4df3bea7f9d2ddd9ac2c29ba945c7c4db2def29c upstream.

Currently we set the tx/rx buffer to 0xff when NULL. This causes
problems with some spi slaves where 0xff is a valid command. Looking
at other drivers, the tx/rx buffer is usually set to 0x00 when NULL.
Following this convention solves the issue.

Fixes: fa236a7e ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: default avatarJustin Chen <justinpopo6@gmail.com>
Signed-off-by: default avatarKamal Dasu <kdasu.kdev@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200420190853.45614-6-kdasu.kdev@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75956dbe

drivers/spi/spi-bcm-qspi.c

+4 −4
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static void read_from_hw(struct bcm_qspi *qspi, int slots) 
			if (buf)

				buf[tp.byte] = read_rxram_slot_u8(qspi, slot);

			dev_dbg(&qspi->pdev->dev, "RD %02x\n",

				buf ? buf[tp.byte] : 0xff);

				buf ? buf[tp.byte] : 0x0);

		} else {

			u16 *buf = tp.trans->rx_buf;
@@ -689,7 +689,7 @@ static void read_from_hw(struct bcm_qspi *qspi, int slots) 
				buf[tp.byte / 2] = read_rxram_slot_u16(qspi,

								      slot);

			dev_dbg(&qspi->pdev->dev, "RD %04x\n",

				buf ? buf[tp.byte] : 0xffff);

				buf ? buf[tp.byte / 2] : 0x0);

		}



		update_qspi_trans_byte_count(qspi, &tp,
@@ -744,13 +744,13 @@ static int write_to_hw(struct bcm_qspi *qspi, struct spi_device *spi) 
	while (!tstatus && slot < MSPI_NUM_CDRAM) {

		if (tp.trans->bits_per_word <= 8) {

			const u8 *buf = tp.trans->tx_buf;

			u8 val = buf ? buf[tp.byte] : 0xff;

			u8 val = buf ? buf[tp.byte] : 0x00;



			write_txram_slot_u8(qspi, slot, val);

			dev_dbg(&qspi->pdev->dev, "WR %02x\n", val);

		} else {

			const u16 *buf = tp.trans->tx_buf;

			u16 val = buf ? buf[tp.byte / 2] : 0xffff;

			u16 val = buf ? buf[tp.byte / 2] : 0x0000;



			write_txram_slot_u16(qspi, slot, val);

			dev_dbg(&qspi->pdev->dev, "WR %04x\n", val);