kernel: bump 4.14 to 4.14.72
Refreshed all patches. Removed upstreamed: - 203-MIPS-ath79-fix-restart.patch - 0013-MIPS-ath79-fix-system-restart.patch - 180-earlycon-initialize-port-uartclk-based-on-clock-frequency-property.patch - 181-earlycon-remove-hardcoded-port-uartclk-initialization-in-of_setup_earlycon. patch - 700-1-6-e1000e-Remove-Other-from-EIAC.patch - 700-2-6-Partial-revert-e1000e-Avoid-receiver-overrun-interrupt-bursts.patch - 700-3-6-e1000e-Fix-queue-interrupt-re-raising-in-Other-interrupt.patch - 700-4-6-e1000e-Avoid-missed-interrupts-following-ICR-read.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -280,7 +280,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||
|
||||
--- a/arch/mips/ath79/setup.c
|
||||
+++ b/arch/mips/ath79/setup.c
|
||||
@@ -59,6 +59,7 @@ static void __init ath79_detect_sys_type
|
||||
@@ -60,6 +60,7 @@ static void __init ath79_detect_sys_type
|
||||
u32 major;
|
||||
u32 minor;
|
||||
u32 rev = 0;
|
||||
@@ -288,7 +288,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||
|
||||
id = ath79_reset_rr(AR71XX_RESET_REG_REV_ID);
|
||||
major = id & REV_ID_MAJOR_MASK;
|
||||
@@ -151,6 +152,17 @@ static void __init ath79_detect_sys_type
|
||||
@@ -152,6 +153,17 @@ static void __init ath79_detect_sys_type
|
||||
rev = id & AR934X_REV_ID_REVISION_MASK;
|
||||
break;
|
||||
|
||||
@@ -306,7 +306,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||
case REV_ID_MAJOR_QCA9556:
|
||||
ath79_soc = ATH79_SOC_QCA9556;
|
||||
chip = "9556";
|
||||
@@ -163,14 +175,30 @@ static void __init ath79_detect_sys_type
|
||||
@@ -164,14 +176,30 @@ static void __init ath79_detect_sys_type
|
||||
rev = id & QCA955X_REV_ID_REVISION_MASK;
|
||||
break;
|
||||
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 59c7470bc5c4b29ed77d46fc4982f1d85b5cbec1 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/33] 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>
|
||||
---
|
||||
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
|
||||
@@ -167,6 +167,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)
|
||||
Reference in New Issue
Block a user