summaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorFelix Fietkau2018-07-20 13:58:22 +0200
committerPaul Burton2018-07-25 03:57:49 +0200
commitf8a7bfe1cb2c1ebfa07775c9c8ac0ad3ba8e5ff5 (patch)
treea2174471a7c66500bc03b32e3cbe00191b5c9ab7 /arch/mips/include
parentMIPS: ath79: select the PINCTRL subsystem (diff)
downloadkernel-qcow2-linux-f8a7bfe1cb2c1ebfa07775c9c8ac0ad3ba8e5ff5.tar.gz
kernel-qcow2-linux-f8a7bfe1cb2c1ebfa07775c9c8ac0ad3ba8e5ff5.tar.xz
kernel-qcow2-linux-f8a7bfe1cb2c1ebfa07775c9c8ac0ad3ba8e5ff5.zip
MIPS: ath79: fix system restart
This patch disables irq on reboot to fix hang issues that were observed due to pending interrupts. Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: Paul Burton <paul.burton@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/19913/ Cc: James Hogan <jhogan@kernel.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/mach-ath79/ath79.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h
index f54c9b0c6325..73dcd63b8243 100644
--- a/arch/mips/include/asm/mach-ath79/ath79.h
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
@@ -167,6 +167,7 @@ static inline u32 ath79_pll_rr(unsigned reg)
static inline void ath79_reset_wr(unsigned reg, u32 val)
{
__raw_writel(val, ath79_reset_base + reg);
+ (void) __raw_readl(ath79_reset_base + reg); /* flush */
}
static inline u32 ath79_reset_rr(unsigned reg)