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

Commit 8696938a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A couple of driver specific fixes of the usual "important if you have
  that device" kind together with a fix for a use after free bug that
  was introduced into the trace code in some of the recent refactoring
  of the message queue handling"

* tag 'spi-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: trigger trace event for message-done before mesg->complete
  spi: dw-mid: clear BUSY flag fist and test other one
  spi: qup: Fix cs-num DT property parsing
parents 7c9049dd 072ac04d

drivers/spi/spi-dw-mid.c

+4 −2
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static void dw_spi_dma_tx_done(void *arg) 
{

	struct dw_spi *dws = arg;



	if (test_and_clear_bit(TX_BUSY, &dws->dma_chan_busy) & BIT(RX_BUSY))

	clear_bit(TX_BUSY, &dws->dma_chan_busy);

	if (test_bit(RX_BUSY, &dws->dma_chan_busy))

		return;

	dw_spi_xfer_done(dws);

}
@@ -156,7 +157,8 @@ static void dw_spi_dma_rx_done(void *arg) 
{

	struct dw_spi *dws = arg;



	if (test_and_clear_bit(RX_BUSY, &dws->dma_chan_busy) & BIT(TX_BUSY))

	clear_bit(RX_BUSY, &dws->dma_chan_busy);

	if (test_bit(TX_BUSY, &dws->dma_chan_busy))

		return;

	dw_spi_xfer_done(dws);

}

drivers/spi/spi-qup.c

+5 −4
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int spi_qup_probe(struct platform_device *pdev) 
	struct resource *res;

	struct device *dev;

	void __iomem *base;

	u32 max_freq, iomode;

	u32 max_freq, iomode, num_cs;

	int ret, irq, size;



	dev = &pdev->dev;
@@ -550,10 +550,11 @@ static int spi_qup_probe(struct platform_device *pdev) 
	}



	/* use num-cs unless not present or out of range */

	if (of_property_read_u16(dev->of_node, "num-cs",

			&master->num_chipselect) ||

			(master->num_chipselect > SPI_NUM_CHIPSELECTS))

	if (of_property_read_u32(dev->of_node, "num-cs", &num_cs) ||

	    num_cs > SPI_NUM_CHIPSELECTS)

		master->num_chipselect = SPI_NUM_CHIPSELECTS;

	else

		master->num_chipselect = num_cs;



	master->bus_num = pdev->id;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;

drivers/spi/spi.c

+3 −2
Original line number Diff line number Diff line
@@ -1105,13 +1105,14 @@ void spi_finalize_current_message(struct spi_master *master) 
				"failed to unprepare message: %d\n", ret);

		}

	}



	trace_spi_message_done(mesg);



	master->cur_msg_prepared = false;



	mesg->state = NULL;

	if (mesg->complete)

		mesg->complete(mesg->context);



	trace_spi_message_done(mesg);

}

EXPORT_SYMBOL_GPL(spi_finalize_current_message);