Commit 89a8567d authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Vinod Koul
Browse files

dmaengine: sh: rz-dmac: Move CHCTRL updates under spinlock 



Both rz_dmac_disable_hw() and rz_dmac_irq_handle_channel() update the
CHCTRL register. To avoid concurrency issues when configuring
functionalities exposed by this registers, take the virtual channel lock.
All other CHCTRL updates were already protected by the same lock.

Previously, rz_dmac_disable_hw() disabled and re-enabled local IRQs, before
accessing CHCTRL registers but this does not ensure race-free access.
Remove the local IRQ disable/enable code as well.

Fixes: 5000d370 ("dmaengine: sh: Add DMAC driver for RZ/G2L SoC")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20260316133252.240348-3-claudiu.beznea.uj@bp.renesas.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent abb863e6

drivers/dma/sh/rz-dmac.c

+4 −5
Original line number Diff line number Diff line
@@ -297,13 +297,10 @@ static void rz_dmac_disable_hw(struct rz_dmac_chan *channel) 
{

	struct dma_chan *chan = &channel->vc.chan;

	struct rz_dmac *dmac = to_rz_dmac(chan->device);

	unsigned long flags;



	dev_dbg(dmac->dev, "%s channel %d\n", __func__, channel->index);



	local_irq_save(flags);

	rz_dmac_ch_writel(channel, CHCTRL_DEFAULT, CHCTRL, 1);

	local_irq_restore(flags);

}



static void rz_dmac_set_dmars_register(struct rz_dmac *dmac, int nr, u32 dmars)
@@ -568,8 +565,8 @@ static int rz_dmac_terminate_all(struct dma_chan *chan) 
	unsigned int i;

	LIST_HEAD(head);



	rz_dmac_disable_hw(channel);

	spin_lock_irqsave(&channel->vc.lock, flags);

	rz_dmac_disable_hw(channel);

	for (i = 0; i < DMAC_NR_LMDESC; i++)

		lmdesc[i].header = 0;
@@ -706,6 +703,8 @@ static void rz_dmac_irq_handle_channel(struct rz_dmac_chan *channel) 
	if (chstat & CHSTAT_ER) {

		dev_err(dmac->dev, "DMAC err CHSTAT_%d = %08X\n",

			channel->index, chstat);



		scoped_guard(spinlock_irqsave, &channel->vc.lock)

			rz_dmac_ch_writel(channel, CHCTRL_DEFAULT, CHCTRL, 1);

		goto done;

	}