| Message ID | 20201117094054.4696-1-Sergey.Semin@baikalelectronics.ru |
|---|---|
| State | Accepted |
| Commit | a41b0ad07bfa081584218431cb0cd7e7ecc71210 |
| Headers | show |
| Series | spi: dw: Set transfer handler before unmasking the IRQs | expand |
On Tue, 17 Nov 2020 12:40:54 +0300, Serge Semin wrote: > It turns out the IRQs most like can be unmasked before the controller is > enabled with no problematic consequences. The manual doesn't explicitly > state that, but the examples perform the controller initialization > procedure in that order. So the commit da8f58909e7e ("spi: dw: Unmask IRQs > after enabling the chip") hasn't been that required as I thought. But > anyway setting the IRQs up after the chip enabling still worth adding > since it has simplified the code a bit. The problem is that it has > introduced a potential bug. The transfer handler pointer is now > initialized after the IRQs are enabled. That may and eventually will cause > an invalid or uninitialized callback invocation. Fix that just by > performing the callback initialization before the IRQ unmask procedure. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: dw: Set transfer handler before unmasking the IRQs commit: a41b0ad07bfa081584218431cb0cd7e7ecc71210 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c index 2e50cc0a9291..0b2236ade412 100644 --- a/drivers/spi/spi-dw-core.c +++ b/drivers/spi/spi-dw-core.c @@ -357,11 +357,11 @@ static void dw_spi_irq_setup(struct dw_spi *dws) dw_writel(dws, DW_SPI_TXFTLR, level); dw_writel(dws, DW_SPI_RXFTLR, level - 1); + dws->transfer_handler = dw_spi_transfer_handler; + imask = SPI_INT_TXEI | SPI_INT_TXOI | SPI_INT_RXUI | SPI_INT_RXOI | SPI_INT_RXFI; spi_umask_intr(dws, imask); - - dws->transfer_handler = dw_spi_transfer_handler; } /*
It turns out the IRQs most like can be unmasked before the controller is enabled with no problematic consequences. The manual doesn't explicitly state that, but the examples perform the controller initialization procedure in that order. So the commit da8f58909e7e ("spi: dw: Unmask IRQs after enabling the chip") hasn't been that required as I thought. But anyway setting the IRQs up after the chip enabling still worth adding since it has simplified the code a bit. The problem is that it has introduced a potential bug. The transfer handler pointer is now initialized after the IRQs are enabled. That may and eventually will cause an invalid or uninitialized callback invocation. Fix that just by performing the callback initialization before the IRQ unmask procedure. Fixes: da8f58909e7e ("spi: dw: Unmask IRQs after enabling the chip") Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- drivers/spi/spi-dw-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)