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

Unverified Commit f8a7bfe1 authored by Felix Fietkau's avatar Felix Fietkau Committed by Paul Burton
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarPaul 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
parent a08227a2

arch/mips/ath79/setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYPE_LEN]; 




static void ath79_restart(char *command)

static void ath79_restart(char *command)

{

{

	local_irq_disable();

	ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);

	ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);

	for (;;)

	for (;;)

		if (cpu_wait)

		if (cpu_wait)

arch/mips/include/asm/mach-ath79/ath79.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -167,6 +167,7 @@ static inline u32 ath79_pll_rr(unsigned reg) 
static inline void ath79_reset_wr(unsigned reg, u32 val)

static inline void ath79_reset_wr(unsigned reg, u32 val)

{

{

	__raw_writel(val, ath79_reset_base + reg);

	__raw_writel(val, ath79_reset_base + reg);

	(void) __raw_readl(ath79_reset_base + reg); /* flush */

}

}





static inline u32 ath79_reset_rr(unsigned reg)

static inline u32 ath79_reset_rr(unsigned reg)