From b0a34e886da1ccfa356133381cd3ab7a79f4c7b3 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 7 Apr 2021 10:13:50 -0400 Subject: [PATCH] kernel: bump 5.4 to 5.4.110 Ran update_kernel.sh in a fresh clone without any existing toolchains. Manually rebased due to movement of rx-offload.c in 5.4.110: layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- include/kernel-version.mk | 4 ++-- target/linux/generic/hack-5.4/204-module_strip.patch | 4 ++-- target/linux/generic/hack-5.4/721-phy_packets.patch | 8 ++++---- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 2 +- .../690-net-add-support-for-threaded-NAPI-polling.patch | 4 ++-- .../802-can-0002-can-rx-offload-fix-long-lines.patch | 6 +++--- ...3-can-rx-offload-can_rx_offload_compare-fix-typo.patch | 6 +++--- ...rx-offload-can_rx_offload_irq_offload_timestamp-.patch | 6 +++--- ...rx-offload-can_rx_offload_reset-remove-no-op-fun.patch | 6 +++--- ...n-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch | 6 +++--- ...flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2e29f637bbd..74fd81969b2 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-5.4 = .109 +LINUX_VERSION-5.4 = .110 LINUX_VERSION-5.10 = .27 -LINUX_KERNEL_HASH-5.4.109 = ac6af4562717d030266fcddb0a3c44598610ca8c9c3a654725f58b9cbd61b7ee +LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228 LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch index ca0c228e10b..96e124b21a8 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3142,9 +3142,11 @@ static int setup_load_info(struct load_i +@@ -3224,9 +3224,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3165,6 +3167,7 @@ static int check_modinfo(struct module * +@@ -3247,6 +3249,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index 55233369ef8..836fc54ba29 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN - /** - * struct net_device - The DEVICE structure. -@@ -1882,6 +1884,11 @@ struct net_device { + /* Specifies the type of the struct net_device::ml_priv pointer */ + enum netdev_ml_priv_type { +@@ -1889,6 +1891,11 @@ struct net_device { const struct tlsdev_ops *tlsdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau const struct header_ops *header_ops; unsigned int flags; -@@ -1964,6 +1971,10 @@ struct net_device { +@@ -1971,6 +1978,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 47e12b0166a..ac7a24a049b 100644 --- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1924,6 +1924,8 @@ struct net_device { +@@ -1931,6 +1931,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch index 6392b9d7562..a6ef897869e 100644 --- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch @@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau }; enum gro_result { -@@ -2092,6 +2095,7 @@ struct net_device { +@@ -2101,6 +2104,7 @@ struct net_device { struct lock_class_key addr_list_lock_key; bool proto_down; unsigned wol_enabled:1; @@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau }; #define to_net_dev(d) container_of(d, struct net_device, dev) -@@ -2249,6 +2253,26 @@ void netif_napi_add(struct net_device *d +@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d int (*poll)(struct napi_struct *, int), int weight); /** diff --git a/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch b/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch index 88692a20209..6f30ee2fea0 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch @@ -7,11 +7,11 @@ This patch fixes the checkpatch warnings about too long lines. Signed-off-by: Marc Kleine-Budde --- - drivers/net/can/rx-offload.c | 39 ++++++++++++++++++++++++++------------- + drivers/net/can/dev/rx-offload.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -1,7 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only -/* diff --git a/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch b/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch index 26d4a90576c..5861dbe0d31 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch @@ -7,11 +7,11 @@ This patch fixes a typo found by checkpatch. Signed-off-by: Marc Kleine-Budde --- - drivers/net/can/rx-offload.c | 2 +- + drivers/net/can/dev/rx-offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct cb_a = can_rx_offload_get_cb(a); cb_b = can_rx_offload_get_cb(b); diff --git a/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch b/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch index 77cc9f8e1cd..45010204142 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch @@ -8,11 +8,11 @@ This patch moves the assignment of queue_len out of the if condition. Signed-off-by: Marc Kleine-Budde --- - drivers/net/can/rx-offload.c | 4 ++-- + drivers/net/can/dev/rx-offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -238,8 +238,8 @@ int can_rx_offload_irq_offload_timestamp skb_queue_splice_tail(&skb_queue, &offload->skb_queue); spin_unlock_irqrestore(&offload->skb_queue.lock, flags); diff --git a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch index 45a20c4af61..68e5c4c604f 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch @@ -9,12 +9,12 @@ nothing. If we ever need this function, add it back again. Signed-off-by: Marc Kleine-Budde --- - drivers/net/can/rx-offload.c | 7 ------- + drivers/net/can/dev/rx-offload.c | 7 ------- include/linux/can/rx-offload.h | 1 - 2 files changed, 8 deletions(-) ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str offload->skb_queue_len_max *= 4; skb_queue_head_init(&offload->skb_queue); diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch index 09961c88d8f..d5c88ac0c84 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Joakim Zhang Signed-off-by: Marc Kleine-Budde --- drivers/net/can/flexcan.c | 27 +++++++++++----- - drivers/net/can/rx-offload.c | 70 ++++++++++-------------------------------- + drivers/net/can/dev/rx-offload.c | 70 ++++++++++-------------------------------- include/linux/can/rx-offload.h | 6 ++-- 3 files changed, 40 insertions(+), 63 deletions(-) @@ -98,8 +98,8 @@ Signed-off-by: Marc Kleine-Budde } ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct static struct sk_buff * can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n) diff --git a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch index 1f4515ab7e0..1e2a89d9135 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch @@ -10,7 +10,7 @@ Signed-off-by: Joakim Zhang Signed-off-by: Marc Kleine-Budde --- drivers/net/can/flexcan.c | 34 +++++++++++++++++----------------- - drivers/net/can/rx-offload.c | 4 ++-- + drivers/net/can/dev/rx-offload.c | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) --- a/drivers/net/can/flexcan.c @@ -97,8 +97,8 @@ Signed-off-by: Marc Kleine-Budde } mark_as_read: ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru while ((work_done < quota) &&