diff options
Diffstat (limited to 'target/linux/mvebu/patches-3.8/017-arm_cache_l2x0_aurora_use_writel_relaxed.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.8/017-arm_cache_l2x0_aurora_use_writel_relaxed.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/target/linux/mvebu/patches-3.8/017-arm_cache_l2x0_aurora_use_writel_relaxed.patch b/target/linux/mvebu/patches-3.8/017-arm_cache_l2x0_aurora_use_writel_relaxed.patch deleted file mode 100644 index 5f5ba11d7..000000000 --- a/target/linux/mvebu/patches-3.8/017-arm_cache_l2x0_aurora_use_writel_relaxed.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6c8928f877a1572f16cfc8a0c055d7e16320c741 Mon Sep 17 00:00:00 2001 -From: Gregory CLEMENT <gregory.clement@free-electrons.com> -Date: Thu, 13 Dec 2012 18:33:06 +0100 -Subject: [PATCH] arm: 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: Gregory CLEMENT <gregory.clement@free-electrons.com> ---- - arch/arm/mm/cache-l2x0.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c -index 7ffe943..96a1ae4 100644 ---- a/arch/arm/mm/cache-l2x0.c -+++ b/arch/arm/mm/cache-l2x0.c -@@ -459,8 +459,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(); -@@ -674,8 +674,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); - } - } - --- -1.7.10.4 - |