mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
e39414ed07
Refreshed all patches Dropped upstreamed patches: 522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch 523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch 525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch 527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch updated patches: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch 030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch Added new ARM64 symbol: CONFIG_ARM64_ERRATUM_1024718 Compile-tested on: cns3xxx, imx6, mvebu (arm64), x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From 11562939754b8f877562d9a137854022eb521716 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 5 Mar 2018 11:33:54 +0100
|
|
Subject: [PATCH 13/27] MIPS: ath79: fix system restart
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
arch/mips/ath79/setup.c | 1 +
|
|
arch/mips/include/asm/mach-ath79/ath79.h | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
--- a/arch/mips/ath79/setup.c
|
|
+++ b/arch/mips/ath79/setup.c
|
|
@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYP
|
|
|
|
static void ath79_restart(char *command)
|
|
{
|
|
+ local_irq_disable();
|
|
ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
|
|
for (;;)
|
|
if (cpu_wait)
|
|
--- a/arch/mips/include/asm/mach-ath79/ath79.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
|
|
@@ -134,6 +134,7 @@ static inline u32 ath79_pll_rr(unsigned
|
|
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)
|