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

Commit 8a3a180d authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Russell King
Browse files

ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel 



The use of writel instead of writel_relaxed lead to deadlock in some
situation (SMP on Armada 370 for instance). The use of writel_relaxed
as it was done in the rest of this driver fixes this bug.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8b827c60

arch/arm/mm/cache-l2x0.c

+5 −4
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ static void aurora_pa_range(unsigned long start, unsigned long end, 
	unsigned long flags;



	raw_spin_lock_irqsave(&l2x0_lock, flags);

	writel(start, l2x0_base + AURORA_RANGE_BASE_ADDR_REG);

	writel(end, l2x0_base + offset);

	writel_relaxed(start, l2x0_base + AURORA_RANGE_BASE_ADDR_REG);

	writel_relaxed(end, l2x0_base + offset);

	raw_spin_unlock_irqrestore(&l2x0_lock, flags);



	cache_sync();
@@ -675,8 +675,9 @@ static void pl310_resume(void) 
static void aurora_resume(void)

{

	if (!(readl(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		writel(l2x0_saved_regs.aux_ctrl, l2x0_base + L2X0_AUX_CTRL);

		writel(l2x0_saved_regs.ctrl, l2x0_base + L2X0_CTRL);

		writel_relaxed(l2x0_saved_regs.aux_ctrl,

				l2x0_base + L2X0_AUX_CTRL);

		writel_relaxed(l2x0_saved_regs.ctrl, l2x0_base + L2X0_CTRL);

	}

}