Unverified Commit 419bc8f6 authored by Jon Lin's avatar Jon Lin Committed by Mark Brown
Browse files

spi: rockchip: Unmask IRQ at the final to avoid preemption 



Avoid pio_write process is preempted, resulting in abnormal state.

Signed-off-by: default avatarJon Lin <jon.lin@rock-chips.com>
Signed-off-by: default avatarJon <jon.lin@rock-chips.com>
Link: https://lore.kernel.org/r/20220617124251.5051-1-jon.lin@rock-chips.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6aa27071

drivers/spi/spi-rockchip.c

+7 −4
Original line number Diff line number Diff line
@@ -381,15 +381,18 @@ static int rockchip_spi_prepare_irq(struct rockchip_spi *rs, 
	rs->tx_left = rs->tx ? xfer->len / rs->n_bytes : 0;

	rs->rx_left = xfer->len / rs->n_bytes;



	if (rs->cs_inactive)

		writel_relaxed(INT_RF_FULL | INT_CS_INACTIVE, rs->regs + ROCKCHIP_SPI_IMR);

	else

		writel_relaxed(INT_RF_FULL, rs->regs + ROCKCHIP_SPI_IMR);

	writel_relaxed(0xffffffff, rs->regs + ROCKCHIP_SPI_ICR);



	spi_enable_chip(rs, true);



	if (rs->tx_left)

		rockchip_spi_pio_writer(rs);



	if (rs->cs_inactive)

		writel_relaxed(INT_RF_FULL | INT_CS_INACTIVE, rs->regs + ROCKCHIP_SPI_IMR);

	else

		writel_relaxed(INT_RF_FULL, rs->regs + ROCKCHIP_SPI_IMR);



	/* 1 means the transfer is in progress */

	return 1;

}