diff options
| author | Koen Vandeputte <koen.vandeputte@citymesh.com> | 2021-04-12 11:38:51 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2021-04-30 10:56:39 +0200 |
| commit | 906f560e79d285abf35c492ab486d23bb8b7ccaa (patch) | |
| tree | fc16beedaa184c5825553f85850ccb8b3fb6b0ca /target/linux/generic | |
| parent | cc0b70467d0f67ea6481100631119ae77b76c9eb (diff) | |
| download | upstream-906f560e79d285abf35c492ab486d23bb8b7ccaa.tar.gz upstream-906f560e79d285abf35c492ab486d23bb8b7ccaa.tar.bz2 upstream-906f560e79d285abf35c492ab486d23bb8b7ccaa.zip | |
kernel: bump 4.14 to 4.14.230
Refreshed all patches.
Remove upstreamed:
- 840-can-flexcan-flexcan_chip_freeze-fix-chip-freeze-for-.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@citymesh.com>
Diffstat (limited to 'target/linux/generic')
5 files changed, 4 insertions, 54 deletions
diff --git a/target/linux/generic/hack-4.14/204-module_strip.patch b/target/linux/generic/hack-4.14/204-module_strip.patch index fe4ca47f16..9d8f0f9af8 100644 --- a/target/linux/generic/hack-4.14/204-module_strip.patch +++ b/target/linux/generic/hack-4.14/204-module_strip.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1904,6 +1904,13 @@ config TRIM_UNUSED_KSYMS +@@ -1903,6 +1903,13 @@ config TRIM_UNUSED_KSYMS If unsure, or if you need to build out-of-tree modules, say N. diff --git a/target/linux/generic/hack-4.14/930-crashlog.patch b/target/linux/generic/hack-4.14/930-crashlog.patch index 397046ad62..fd58841af0 100644 --- a/target/linux/generic/hack-4.14/930-crashlog.patch +++ b/target/linux/generic/hack-4.14/930-crashlog.patch @@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -1010,6 +1010,10 @@ config RELAY +@@ -1009,6 +1009,10 @@ config RELAY If unsure, say N. diff --git a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch index 159a79988f..1f5c83e94f 100644 --- a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1082,6 +1082,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1081,6 +1081,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-4.14/840-can-flexcan-flexcan_chip_freeze-fix-chip-freeze-for-.patch b/target/linux/generic/pending-4.14/840-can-flexcan-flexcan_chip_freeze-fix-chip-freeze-for-.patch deleted file mode 100644 index 20c84617d1..0000000000 --- a/target/linux/generic/pending-4.14/840-can-flexcan-flexcan_chip_freeze-fix-chip-freeze-for-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47c5e474bc1e1061fb037d13b5000b38967eb070 Mon Sep 17 00:00:00 2001 -From: Angelo Dureghello <angelo@kernel-space.org> -Date: Tue, 16 Mar 2021 00:15:10 +0100 -Subject: can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate - -From: Angelo Dureghello <angelo@kernel-space.org> - -commit 47c5e474bc1e1061fb037d13b5000b38967eb070 upstream. - -For cases when flexcan is built-in, bitrate is still not set at -registering. So flexcan_chip_freeze() generates: - -[ 1.860000] *** ZERO DIVIDE *** FORMAT=4 -[ 1.860000] Current process id is 1 -[ 1.860000] BAD KERNEL TRAP: 00000000 -[ 1.860000] PC: [<402e70c8>] flexcan_chip_freeze+0x1a/0xa8 - -To allow chip freeze, using an hardcoded timeout when bitrate is still -not set. - -Fixes: ec15e27cc890 ("can: flexcan: enable RX FIFO after FRZ/HALT valid") -Link: https://lore.kernel.org/r/20210315231510.650593-1-angelo@kernel-space.org -Signed-off-by: Angelo Dureghello <angelo@kernel-space.org> -[mkl: use if instead of ? operator] -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> -Cc: Koen Vandeputte <koen.vandeputte@citymesh.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/net/can/flexcan.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -413,9 +413,15 @@ static int flexcan_chip_disable(struct f - static int flexcan_chip_freeze(struct flexcan_priv *priv) - { - struct flexcan_regs __iomem *regs = priv->regs; -- unsigned int timeout = 1000 * 1000 * 10 / priv->can.bittiming.bitrate; -+ unsigned int timeout; -+ u32 bitrate = priv->can.bittiming.bitrate; - u32 reg; - -+ if (bitrate) -+ timeout = 1000 * 1000 * 10 / bitrate; -+ else -+ timeout = FLEXCAN_TIMEOUT_US / 10; -+ - reg = flexcan_read(®s->mcr); - reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT; - flexcan_write(reg, ®s->mcr); diff --git a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch index 4d7dd3364d..2f6a52c23d 100644 --- a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1428,6 +1428,15 @@ config EMBEDDED +@@ -1427,6 +1427,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. |