From 5dcbd82a57966f98fc814f9a21dfa73f7c6d41b5 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 12 Apr 2021 18:47:14 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.110 (#6676) --- include/kernel-version.mk | 4 +-- .../generic/hack-5.4/204-module_strip.patch | 4 +-- .../generic/hack-5.4/721-phy_packets.patch | 8 +++--- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 2 +- ...dd-support-for-threaded-NAPI-polling.patch | 27 ++++++++++++++----- ...n-0002-can-rx-offload-fix-long-lines.patch | 6 ++--- ...load-can_rx_offload_compare-fix-typo.patch | 6 ++--- ...an_rx_offload_irq_offload_timestamp-.patch | 6 ++--- ...an_rx_offload_reset-remove-no-op-fun.patch | 6 ++--- ...x-offload-Prepare-for-CAN-FD-support.patch | 6 ++--- ...struct-canfd_frame-for-CAN-classic-f.patch | 6 ++--- 11 files changed, 47 insertions(+), 34 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7c72bcd38..636997248 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.14 = .195 LINUX_VERSION-4.19 = .138 -LINUX_VERSION-5.4 = .109 +LINUX_VERSION-5.4 = .110 LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 -LINUX_KERNEL_HASH-5.4.109 = ac6af4562717d030266fcddb0a3c44598610ca8c9c3a654725f58b9cbd61b7ee +LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(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 ca0c228e1..96e124b21 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 55233369e..836fc54ba 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 47e12b016..ac7a24a04 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 35442ce2d..da4013ea2 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,15 @@ Signed-off-by: Felix Fietkau }; enum gro_result { -@@ -2249,6 +2252,26 @@ void netif_napi_add(struct net_device *d +@@ -2101,6 +2104,7 @@ struct net_device { + struct lock_class_key addr_list_lock_key; + bool proto_down; + unsigned wol_enabled:1; ++ unsigned threaded:1; + }; + #define to_net_dev(d) container_of(d, struct net_device, dev) + +@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d int (*poll)(struct napi_struct *, int), int weight); /** @@ -111,7 +119,7 @@ Signed-off-by: Felix Fietkau ____napi_schedule(this_cpu_ptr(&softnet_data), n); } EXPORT_SYMBOL(__napi_schedule_irqoff); -@@ -6219,6 +6230,84 @@ static void init_gro_hash(struct napi_st +@@ -6219,9 +6230,89 @@ static void init_gro_hash(struct napi_st napi->gro_bitmask = 0; } @@ -196,7 +204,12 @@ Signed-off-by: Felix Fietkau void netif_napi_add(struct net_device *dev, struct napi_struct *napi, int (*poll)(struct napi_struct *, int), int weight) { -@@ -6238,6 +6327,7 @@ void netif_napi_add(struct net_device *d ++ if (dev->threaded) ++ set_bit(NAPI_STATE_THREADED, &napi->state); + INIT_LIST_HEAD(&napi->poll_list); + hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED); + napi->timer.function = napi_watchdog; +@@ -6238,6 +6329,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -204,7 +217,7 @@ Signed-off-by: Felix Fietkau set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state); list_add_rcu(&napi->dev_list, &dev->napi_list); -@@ -6278,6 +6368,7 @@ static void flush_gro_hash(struct napi_s +@@ -6278,6 +6370,7 @@ static void flush_gro_hash(struct napi_s void netif_napi_del(struct napi_struct *napi) { might_sleep(); @@ -212,7 +225,7 @@ Signed-off-by: Felix Fietkau if (napi_hash_del(napi)) synchronize_net(); list_del_init(&napi->dev_list); -@@ -6290,50 +6381,18 @@ EXPORT_SYMBOL(netif_napi_del); +@@ -6290,50 +6383,18 @@ EXPORT_SYMBOL(netif_napi_del); static int napi_poll(struct napi_struct *n, struct list_head *repoll) { @@ -267,7 +280,7 @@ Signed-off-by: Felix Fietkau /* Some drivers may have called napi_schedule * prior to exhausting their budget. -@@ -10313,6 +10372,10 @@ static int __init net_dev_init(void) +@@ -10313,6 +10374,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } @@ -340,4 +353,4 @@ Signed-off-by: Felix Fietkau + &dev_attr_napi_threaded.attr, &dev_attr_phys_port_id.attr, &dev_attr_phys_port_name.attr, - &dev_attr_phys_switch_id.attr, + &dev_attr_phys_switch_id.attr, \ No newline at end of file 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 88692a202..6f30ee2fe 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 26d4a9057..5861dbe0d 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 77cc9f8e1..450102041 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 45a20c4af..68e5c4c60 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 6e9c072f8..605dc4e84 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 1f4515ab7..1e2a89d91 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) &&