298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-19 14:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.110 (#6676)

Browse Source
This commit is contained in:
Beginner 2021-04-12 18:47:14 +08:00 committed by GitHub
parent 763081f891
commit 5dcbd82a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -8,11 +8,11 @@ endif
LINUX_VERSION-4.14 = .195 LINUX_VERSION-4.14 = .195
LINUX_VERSION-4.19 = .138 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.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021
LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 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)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

4
target/linux/generic/hack-5.4/204-module_strip.patch
View File

@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config MODULES_TREE_LOOKUP config MODULES_TREE_LOOKUP
--- a/kernel/module.c --- a/kernel/module.c
+++ b/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) static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{ {
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC) if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL; modmagic = NULL;
@@ -3165,6 +3167,7 @@ static int check_modinfo(struct module * @@ -3247,6 +3249,7 @@ static int check_modinfo(struct module *
mod->name); mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
} }

8
target/linux/generic/hack-5.4/721-phy_packets.patch
View File

@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN
/** /* Specifies the type of the struct net_device::ml_priv pointer */
* struct net_device - The DEVICE structure. enum netdev_ml_priv_type {
@@ -1882,6 +1884,11 @@ struct net_device { @@ -1889,6 +1891,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops; const struct tlsdev_ops *tlsdev_ops;
#endif #endif
@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
const struct header_ops *header_ops; const struct header_ops *header_ops;
unsigned int flags; unsigned int flags;
@@ -1964,6 +1971,10 @@ struct net_device { @@ -1971,6 +1978,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr; struct mpls_dev __rcu *mpls_ptr;
#endif #endif

2
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/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 mc;
struct netdev_hw_addr_list dev_addrs; struct netdev_hw_addr_list dev_addrs;

25
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
View File

@ -50,7 +50,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
enum gro_result { 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); int (*poll)(struct napi_struct *, int), int weight);
/** /**
@ -111,7 +119,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
____napi_schedule(this_cpu_ptr(&softnet_data), n); ____napi_schedule(this_cpu_ptr(&softnet_data), n);
} }
EXPORT_SYMBOL(__napi_schedule_irqoff); 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; napi->gro_bitmask = 0;
} }
@ -196,7 +204,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
void netif_napi_add(struct net_device *dev, struct napi_struct *napi, void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight) 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 #ifdef CONFIG_NETPOLL
napi->poll_owner = -1; napi->poll_owner = -1;
#endif #endif
@ -204,7 +217,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_SCHED, &napi->state);
set_bit(NAPI_STATE_NPSVC, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list); 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) void netif_napi_del(struct napi_struct *napi)
{ {
might_sleep(); might_sleep();
@ -212,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (napi_hash_del(napi)) if (napi_hash_del(napi))
synchronize_net(); synchronize_net();
list_del_init(&napi->dev_list); 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) static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{ {
@ -267,7 +280,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule /* Some drivers may have called napi_schedule
* prior to exhausting their budget. * 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; sd->backlog.weight = weight_p;
} }

6
target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
View File

@ -7,11 +7,11 @@ This patch fixes the checkpatch warnings about too long lines.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/rx-offload.c | 39 ++++++++++++++++++++++++++------------- drivers/net/can/dev/rx-offload.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-) 1 file changed, 26 insertions(+), 13 deletions(-)
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
-/* -/*

6
target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
View File

@ -7,11 +7,11 @@ This patch fixes a typo found by checkpatch.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/rx-offload.c | 2 +- drivers/net/can/dev/rx-offload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct @@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct
cb_a = can_rx_offload_get_cb(a); cb_a = can_rx_offload_get_cb(a);
cb_b = can_rx_offload_get_cb(b); cb_b = can_rx_offload_get_cb(b);

6
target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
View File

@ -8,11 +8,11 @@ This patch moves the assignment of queue_len out of the if condition.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/rx-offload.c | 4 ++-- drivers/net/can/dev/rx-offload.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -238,8 +238,8 @@ int can_rx_offload_irq_offload_timestamp @@ -238,8 +238,8 @@ int can_rx_offload_irq_offload_timestamp
skb_queue_splice_tail(&skb_queue, &offload->skb_queue); skb_queue_splice_tail(&skb_queue, &offload->skb_queue);
spin_unlock_irqrestore(&offload->skb_queue.lock, flags); spin_unlock_irqrestore(&offload->skb_queue.lock, flags);

6
target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
View File

@ -9,12 +9,12 @@ nothing. If we ever need this function, add it back again.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/rx-offload.c | 7 ------- drivers/net/can/dev/rx-offload.c | 7 -------
include/linux/can/rx-offload.h | 1 - include/linux/can/rx-offload.h | 1 -
2 files changed, 8 deletions(-) 2 files changed, 8 deletions(-)
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str @@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str
offload->skb_queue_len_max *= 4; offload->skb_queue_len_max *= 4;
skb_queue_head_init(&offload->skb_queue); skb_queue_head_init(&offload->skb_queue);

6
target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/flexcan.c | 27 +++++++++++----- 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 ++-- include/linux/can/rx-offload.h | 6 ++--
3 files changed, 40 insertions(+), 63 deletions(-) 3 files changed, 40 insertions(+), 63 deletions(-)
@ -98,8 +98,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
} }
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct @@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct
static struct sk_buff * static struct sk_buff *
can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n) can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n)

6
target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- ---
drivers/net/can/flexcan.c | 34 +++++++++++++++++----------------- 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(-) 2 files changed, 19 insertions(+), 19 deletions(-)
--- a/drivers/net/can/flexcan.c --- a/drivers/net/can/flexcan.c
@ -97,8 +97,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
} }
mark_as_read: mark_as_read:
--- a/drivers/net/can/rx-offload.c --- a/drivers/net/can/dev/rx-offload.c
+++ b/drivers/net/can/rx-offload.c +++ b/drivers/net/can/dev/rx-offload.c
@@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru @@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru
while ((work_done < quota) && while ((work_done < quota) &&