| Message ID | 20200920112914.26501-4-Sergey.Semin@baikalelectronics.ru |
|---|---|
| State | Accepted |
| Commit | 8225c1c9a073c323f68833d136fcf94fbc75a275 |
| Headers | show |
| Series | [01/30] spi: dw: Discard IRQ threshold macro | expand |
On Sun, Sep 20, 2020 at 02:28:47PM +0300, Serge Semin wrote: > Since n_bytes field of the DW SPI private data is also utilized by the > IRQ handler, we need to make sure it' initialization is done before the > memory barrier. This looks like a fix so should have been before any cosmetic cleanups.
On Tue, Sep 29, 2020 at 02:12:25PM +0100, Mark Brown wrote: > On Sun, Sep 20, 2020 at 02:28:47PM +0300, Serge Semin wrote: > > Since n_bytes field of the DW SPI private data is also utilized by the > > IRQ handler, we need to make sure it' initialization is done before the > > memory barrier. > > This looks like a fix so should have been before any cosmetic cleanups. Ah, sorry about that. I had that in mind, but have just forgotten to move it to the series head. -Sergey
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c index 8b3ce5a0378a..1af74362461d 100644 --- a/drivers/spi/spi-dw-core.c +++ b/drivers/spi/spi-dw-core.c @@ -299,6 +299,7 @@ static int dw_spi_transfer_one(struct spi_controller *master, dws->dma_mapped = 0; spin_lock_irqsave(&dws->buf_lock, flags); + dws->n_bytes = DIV_ROUND_UP(transfer->bits_per_word, BITS_PER_BYTE); dws->tx = (void *)transfer->tx_buf; dws->tx_end = dws->tx + transfer->len; dws->rx = transfer->rx_buf; @@ -323,7 +324,6 @@ static int dw_spi_transfer_one(struct spi_controller *master, } transfer->effective_speed_hz = dws->max_freq / chip->clk_div; - dws->n_bytes = DIV_ROUND_UP(transfer->bits_per_word, BITS_PER_BYTE); cr0 = dws->update_cr0(master, spi, transfer); dw_writel(dws, DW_SPI_CTRLR0, cr0);
Since n_bytes field of the DW SPI private data is also utilized by the IRQ handler, we need to make sure it' initialization is done before the memory barrier. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- drivers/spi/spi-dw-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)