kernel: bump 5.10 to 5.10.183 (#11301)

This commit is contained in:
Linhui Liu 2023-06-12 12:08:04 +08:00 committed by GitHub
parent a8788c3123
commit 4b89d5db8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 106 additions and 106 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .180
LINUX_KERNEL_HASH-5.10.180 = da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29
LINUX_VERSION-5.10 = .183
LINUX_KERNEL_HASH-5.10.183 = 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119

View File

@ -23,7 +23,7 @@ produce a noisy warning.
xhci->quirks |= XHCI_RESET_ON_RESUME;
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us
@@ -431,10 +431,14 @@ static int xhci_try_enable_msi(struct us
free_irq(hcd->irq, hcd);
hcd->irq = 0;

View File

@ -326,7 +326,7 @@ SVN-Revision: 35130
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1469,8 +1469,8 @@ struct sk_buff *inet_gro_receive(struct
@@ -1471,8 +1471,8 @@ struct sk_buff *inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;

View File

@ -40,7 +40,7 @@ it on BCM4708 family.
/* called during probe() after chip reset completes */
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -158,6 +158,49 @@ int xhci_start(struct xhci_hcd *xhci)
@@ -159,6 +159,49 @@ int xhci_start(struct xhci_hcd *xhci)
return ret;
}
@ -90,7 +90,7 @@ it on BCM4708 family.
/*
* Reset a halted HC.
*
@@ -608,10 +651,20 @@ static int xhci_init(struct usb_hcd *hcd
@@ -612,10 +655,20 @@ static int xhci_init(struct usb_hcd *hcd
static int xhci_run_finished(struct xhci_hcd *xhci)
{
@ -114,7 +114,7 @@ it on BCM4708 family.
xhci->shared_hcd->state = HC_STATE_RUNNING;
xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
@@ -621,6 +674,10 @@ static int xhci_run_finished(struct xhci
@@ -625,6 +678,10 @@ static int xhci_run_finished(struct xhci
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB3 roothub");
return 0;

View File

@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6813,15 +6813,10 @@ void __netif_napi_del(struct napi_struct
@@ -6815,15 +6815,10 @@ void __netif_napi_del(struct napi_struct
}
EXPORT_SYMBOL(__netif_napi_del);
@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
weight = n->weight;
/* This NAPI_STATE_SCHED test is for avoiding a race
@@ -6841,7 +6836,7 @@ static int napi_poll(struct napi_struct
@@ -6843,7 +6838,7 @@ static int napi_poll(struct napi_struct
n->poll, work, weight);
if (likely(work < weight))
@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Drivers must not modify the NAPI state if they
* consume the entire weight. In such cases this code
@@ -6850,7 +6845,7 @@ static int napi_poll(struct napi_struct
@@ -6852,7 +6847,7 @@ static int napi_poll(struct napi_struct
*/
if (unlikely(napi_disable_pending(n))) {
napi_complete(n);
@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
if (n->gro_bitmask) {
@@ -6868,12 +6863,29 @@ static int napi_poll(struct napi_struct
@@ -6870,12 +6865,29 @@ static int napi_poll(struct napi_struct
if (unlikely(!list_empty(&n->poll_list))) {
pr_warn_once("%s: Budget exhausted after napi rescheduled\n",
n->dev ? n->dev->name : "backlog");

View File

@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
{
const struct net_device_ops *ops = dev->netdev_ops;
@@ -4274,6 +4296,21 @@ int gro_normal_batch __read_mostly = 8;
@@ -4276,6 +4298,21 @@ int gro_normal_batch __read_mostly = 8;
static inline void ____napi_schedule(struct softnet_data *sd,
struct napi_struct *napi)
{
@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
list_add_tail(&napi->poll_list, &sd->poll_list);
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
}
@@ -6766,6 +6803,12 @@ void netif_napi_add(struct net_device *d
@@ -6768,6 +6805,12 @@ void netif_napi_add(struct net_device *d
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
napi_hash_add(napi);
@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
EXPORT_SYMBOL(netif_napi_add);
@@ -6782,9 +6825,28 @@ void napi_disable(struct napi_struct *n)
@@ -6784,9 +6827,28 @@ void napi_disable(struct napi_struct *n)
hrtimer_cancel(&n->timer);
clear_bit(NAPI_STATE_DISABLE, &n->state);
@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void flush_gro_hash(struct napi_struct *napi)
{
int i;
@@ -6810,6 +6872,11 @@ void __netif_napi_del(struct napi_struct
@@ -6812,6 +6874,11 @@ void __netif_napi_del(struct napi_struct
flush_gro_hash(napi);
napi->gro_bitmask = 0;
@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
EXPORT_SYMBOL(__netif_napi_del);
@@ -6891,6 +6958,51 @@ static int napi_poll(struct napi_struct
@@ -6893,6 +6960,51 @@ static int napi_poll(struct napi_struct
return work;
}

View File

@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* @n: NAPI context
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4300,8 +4300,9 @@ static inline void ____napi_schedule(str
@@ -4302,8 +4302,9 @@ static inline void ____napi_schedule(str
if (test_bit(NAPI_STATE_THREADED, &napi->state)) {
/* Paired with smp_mb__before_atomic() in
@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
@@ -6776,6 +6777,49 @@ static void init_gro_hash(struct napi_st
@@ -6778,6 +6779,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}

View File

@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4307,6 +4307,8 @@ static inline void ____napi_schedule(str
@@ -4309,6 +4309,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
wake_up_process(thread);
return;
}
@@ -6568,7 +6570,8 @@ bool napi_complete_done(struct napi_stru
@@ -6570,7 +6572,8 @@ bool napi_complete_done(struct napi_stru
WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
@@ -7004,16 +7007,25 @@ static int napi_poll(struct napi_struct
@@ -7006,16 +7009,25 @@ static int napi_poll(struct napi_struct
static int napi_thread_wait(struct napi_struct *napi)
{

View File

@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7011,7 +7011,7 @@ static int napi_thread_wait(struct napi_
@@ -7013,7 +7013,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* Testing SCHED_THREADED bit here to make sure the current
* kthread owns this napi and could poll on this napi.
* Testing SCHED bit is not enough because SCHED bit might be
@@ -7029,6 +7029,7 @@ static int napi_thread_wait(struct napi_
@@ -7031,6 +7031,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);

View File

@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6822,6 +6822,7 @@ int dev_set_threaded(struct net_device *
@@ -6824,6 +6824,7 @@ int dev_set_threaded(struct net_device *
return err;
}

View File

@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1474,13 +1474,16 @@ struct nft_trans_chain {
@@ -1475,13 +1475,16 @@ struct nft_trans_chain {
struct nft_trans_table {
bool update;
@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
@@ -7918,11 +7922,10 @@ static int nf_tables_commit(struct net *
@@ -7932,11 +7936,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} else {
nft_clear(net, trans->ctx.table);
}
@@ -8139,11 +8142,9 @@ static int __nf_tables_abort(struct net
@@ -8153,11 +8156,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {

View File

@ -646,7 +646,7 @@
}
/* Reposition in the original skb */
@@ -5187,6 +5208,20 @@ bool skb_try_coalesce(struct sk_buff *to
@@ -5192,6 +5213,20 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to))
return false;
@ -677,7 +677,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <linux/netfilter/nf_conntrack_common.h>
#endif
@@ -786,7 +787,8 @@ struct sk_buff {
@@ -787,7 +788,8 @@ struct sk_buff {
fclone:2,
peeked:1,
head_frag:1,
@ -687,7 +687,7 @@
#ifdef CONFIG_SKB_EXTENSIONS
__u8 active_extensions;
#endif
@@ -3029,9 +3031,15 @@ static inline void skb_frag_ref(struct s
@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s
*
* Releases a reference on the paged fragment @frag.
*/
@ -705,7 +705,7 @@
}
/**
@@ -3043,7 +3051,7 @@ static inline void __skb_frag_unref(skb_
@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_
*/
static inline void skb_frag_unref(struct sk_buff *skb, int f)
{
@ -714,7 +714,7 @@
}
/**
@@ -4642,5 +4650,12 @@ static inline u64 skb_get_kcov_handle(st
@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st
#endif
}

View File

@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5208,18 +5208,18 @@ bool skb_try_coalesce(struct sk_buff *to
@@ -5213,18 +5213,18 @@ bool skb_try_coalesce(struct sk_buff *to
if (skb_cloned(to))
return false;

View File

@ -423,7 +423,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (bgmac->irq < 0)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4480,7 +4480,6 @@ static int macb_probe(struct platform_de
@@ -4484,7 +4484,6 @@ static int macb_probe(struct platform_de
struct net_device *dev;
struct resource *regs;
void __iomem *mem;
@ -431,7 +431,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct macb *bp;
int err, val;
@@ -4593,15 +4592,11 @@ static int macb_probe(struct platform_de
@@ -4597,15 +4596,11 @@ static int macb_probe(struct platform_de
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR);
@ -1283,7 +1283,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return PTR_ERR(plat_dat);
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1392,7 +1392,7 @@ static int rk_gmac_probe(struct platform
@@ -1386,7 +1386,7 @@ static int rk_gmac_probe(struct platform
if (ret)
return ret;
@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int irq;
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5015,7 +5015,7 @@ int stmmac_dvr_probe(struct device *devi
@@ -5019,7 +5019,7 @@ int stmmac_dvr_probe(struct device *devi
priv->wol_irq = res->wol_irq;
priv->lpi_irq = res->lpi_irq;

View File

@ -24,8 +24,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
.write64 = b53_mmap_write64,
@@ -242,11 +243,65 @@ static const struct b53_io_ops b53_mmap_
.phy_write16 = b53_mmap_phy_write16,
};
+static int b53_mmap_probe_of(struct platform_device *pdev,

View File

@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2352,6 +2352,13 @@ config UNUSED_KSYMS_WHITELIST
@@ -2364,6 +2364,13 @@ config UNUSED_KSYMS_WHITELIST
one per line. The path can be absolute, or relative to the kernel
source tree.

View File

@ -1,6 +1,6 @@
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2384,7 +2384,7 @@ config PADATA
@@ -2396,7 +2396,7 @@ config PADATA
bool
config ASN1

View File

@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
@@ -3298,3 +3299,5 @@ static int __init regmap_initcall(void)
@@ -3300,3 +3301,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);

View File

@ -182,7 +182,7 @@
__le64 signature;
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -334,7 +334,11 @@ static void mtdblock_remove_dev(struct m
@@ -338,7 +338,11 @@ static void mtdblock_remove_dev(struct m
static struct mtd_blktrans_ops mtdblock_tr = {
.name = "mtdblock",
.major = MTD_BLOCK_MAJOR,

View File

@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -2296,7 +2296,7 @@ static int __init pktsched_init(void)
@@ -2310,7 +2310,7 @@ static int __init pktsched_init(void)
return err;
}

View File

@ -1,6 +1,6 @@
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2711,6 +2711,9 @@ static int mv88e6xxx_setup_port(struct m
@@ -2716,6 +2716,9 @@ static int mv88e6xxx_setup_port(struct m
if (dsa_is_cpu_port(ds, port))
reg = 0;

View File

@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2727,6 +2727,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2728,6 +2728,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2858,16 +2862,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2859,16 +2863,6 @@ static inline struct sk_buff *dev_alloc_
}
@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3656,6 +3656,11 @@ static int xmit_one(struct sk_buff *skb,
@@ -3658,6 +3658,11 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);

View File

@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3071,6 +3071,7 @@ int wake_up_state(struct task_struct *p,
@@ -3074,6 +3074,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}

View File

@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3760,9 +3767,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3756,9 +3763,15 @@ static int ctnetlink_stat_exp_cpu(struct
}
#ifdef CONFIG_NF_CONNTRACK_EVENTS

View File

@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -865,6 +865,10 @@ struct sk_buff {
@@ -866,6 +866,10 @@ struct sk_buff {
__u8 scm_io_uring:1;
__u8 gro_skip:1;
@ -80,7 +80,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3652,9 +3652,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3654,9 +3654,17 @@ static int xmit_one(struct sk_buff *skb,
{
unsigned int len;
int rc;
@ -99,7 +99,7 @@
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5206,6 +5214,11 @@ void netdev_rx_handler_unregister(struct
@@ -5208,6 +5216,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -111,7 +111,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5254,6 +5267,10 @@ static int __netif_receive_skb_core(stru
@@ -5256,6 +5269,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;
@ -122,7 +122,7 @@
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
trace_netif_receive_skb(skb);
@@ -5293,6 +5310,15 @@ another_round:
@@ -5295,6 +5312,15 @@ another_round:
goto out;
}

View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7107,7 +7107,7 @@ static void __ref alloc_node_mem_map(str
@@ -7123,7 +7123,7 @@ static void __ref alloc_node_mem_map(str
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
@@ -754,11 +754,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
@@ -756,11 +756,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

View File

@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1389,6 +1389,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
@@ -1401,6 +1401,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference

View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1822,6 +1822,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1823,6 +1823,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* When we registered the protocol we saved the socket in the data
@@ -1829,6 +1830,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1830,6 +1831,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Yank back the headers [hope the device set this
@@ -1841,7 +1843,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1842,7 +1844,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -2089,12 +2091,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -2088,12 +2090,12 @@ static int packet_rcv(struct sk_buff *sk
unsigned int snaplen, res;
bool is_drop_n_account = false;
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -2220,12 +2222,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -2219,12 +2221,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -3339,6 +3341,7 @@ static int packet_create(struct net *net
@@ -3342,6 +3344,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -3982,6 +3985,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
return 0;
}
+ case PACKET_RECV_TYPE:
@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
break;
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
@@ -137,6 +137,7 @@ struct packet_sock {
@@ -136,6 +136,7 @@ struct packet_sock {
int (*xmit)(struct sk_buff *skb);
struct packet_type prot_hook ____cacheline_aligned_in_smp;
atomic_t tp_drops ____cacheline_aligned_in_smp;

View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2693,7 +2693,7 @@ static inline int pskb_network_may_pull(
@@ -2694,7 +2694,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD

View File

@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -863,6 +863,7 @@ struct sk_buff {
@@ -864,6 +864,7 @@ struct sk_buff {
__u8 decrypted:1;
#endif
__u8 scm_io_uring:1;
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6069,6 +6069,9 @@ static enum gro_result dev_gro_receive(s
@@ -6071,6 +6071,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
@@ -8048,6 +8051,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8050,6 +8053,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8099,6 +8144,7 @@ static int __netdev_upper_dev_link(struc
@@ -8101,6 +8146,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8195,6 +8241,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8197,6 +8243,7 @@ static void __netdev_upper_dev_unlink(st
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
@@ -8981,6 +9028,7 @@ int dev_set_mac_address(struct net_devic
@@ -8983,6 +9030,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;

View File

@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2929,6 +2929,7 @@ static int mv88e6xxx_setup(struct dsa_sw
@@ -2934,6 +2934,7 @@ static int mv88e6xxx_setup(struct dsa_sw
chip->ds = ds;
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);

View File

@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5498,6 +5498,7 @@ static int mv88e6xxx_register_switch(str
@@ -5504,6 +5504,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1805,6 +1805,15 @@ config EMBEDDED
@@ -1817,6 +1817,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.

View File

@ -229,7 +229,7 @@ Cc: linux-tegra@vger.kernel.org
return dw_pcie_host_init(&pci->pp);
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -1426,14 +1426,6 @@ static int qcom_pcie_probe(struct platfo
@@ -1424,14 +1424,6 @@ static int qcom_pcie_probe(struct platfo
pp->ops = &qcom_pcie_dw_ops;

View File

@ -525,7 +525,7 @@ Cc: linux-tegra@vger.kernel.org
}
static void qcom_pcie_2_1_0_ltssm_enable(struct qcom_pcie *pcie)
@@ -1282,15 +1279,8 @@ static int qcom_pcie_host_init(struct pc
@@ -1280,15 +1277,8 @@ static int qcom_pcie_host_init(struct pc
qcom_ep_reset_deassert(pcie);
@ -542,7 +542,7 @@ Cc: linux-tegra@vger.kernel.org
err_disable_phy:
phy_power_off(pcie->phy);
err_deinit:
@@ -1357,6 +1347,7 @@ static const struct qcom_pcie_ops ops_2_
@@ -1355,6 +1345,7 @@ static const struct qcom_pcie_ops ops_2_
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = qcom_pcie_link_up,

View File

@ -220,7 +220,7 @@ Cc: linux-tegra@vger.kernel.org
}
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -1275,8 +1275,6 @@ static int qcom_pcie_host_init(struct pc
@@ -1273,8 +1273,6 @@ static int qcom_pcie_host_init(struct pc
}
dw_pcie_setup_rc(pp);

View File

@ -83,7 +83,7 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
soc: soc {
#address-cells = <0x1>;
#size-cells = <0x1>;
@@ -758,5 +812,72 @@
@@ -754,5 +808,72 @@
"axi_s_sticky";
status = "disabled";
};

View File

@ -73,7 +73,7 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
};
struct qcom_pcie;
@@ -1244,6 +1260,130 @@ static void qcom_pcie_post_deinit_2_7_0(
@@ -1242,6 +1258,130 @@ static void qcom_pcie_post_deinit_2_7_0(
clk_disable_unprepare(res->pipe_clk);
}
@ -204,7 +204,7 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
static int qcom_pcie_link_up(struct dw_pcie *pci)
{
u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
@@ -1343,6 +1483,15 @@ static const struct qcom_pcie_ops ops_2_
@@ -1341,6 +1481,15 @@ static const struct qcom_pcie_ops ops_2_
.post_deinit = qcom_pcie_post_deinit_2_7_0,
};
@ -220,7 +220,7 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = qcom_pcie_link_up,
.start_link = qcom_pcie_start_link,
@@ -1448,6 +1597,7 @@ static const struct of_device_id qcom_pc
@@ -1446,6 +1595,7 @@ static const struct of_device_id qcom_pc
{ .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 },
{ .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },

View File

@ -25,7 +25,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
struct reset_control *rst;
};
@@ -1271,8 +1271,10 @@ static int qcom_pcie_get_resources_2_9_0
@@ -1269,8 +1269,10 @@ static int qcom_pcie_get_resources_2_9_0
res->clks[0].id = "iface";
res->clks[1].id = "axi_m";
res->clks[2].id = "axi_s";
@ -38,7 +38,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks);
if (ret < 0)
@@ -1599,6 +1601,7 @@ static const struct of_device_id qcom_pc
@@ -1597,6 +1599,7 @@ static const struct of_device_id qcom_pc
{ .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
{ .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 },

View File

@ -12,7 +12,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -891,5 +891,155 @@
@@ -887,5 +887,155 @@
};
};
};

View File

@ -14,7 +14,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -1041,5 +1041,17 @@
@@ -1037,5 +1037,17 @@
resets = <&gcc GCC_EDMA_HW_RESET>;
reset-names = "edma_rst";
};

View File

@ -57,7 +57,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
next-level-cache = <&L2_0>;
};
@@ -901,8 +910,9 @@
@@ -897,8 +906,9 @@
apcs_glb: mailbox@b111000 {
compatible = "qcom,ipq8074-apcs-apps-global";

View File

@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -966,6 +966,117 @@
@@ -962,6 +962,117 @@
};
};

View File

@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -990,7 +990,7 @@
@@ -986,7 +986,7 @@
qcom,smem-state-names = "shutdown",
"stop";

View File

@ -74,7 +74,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
cryptobam: dma@704000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x00704000 0x20000>;
@@ -1276,4 +1291,90 @@
@@ -1272,4 +1287,90 @@
#clock-cells = <0>;
};
};

View File

@ -13,7 +13,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -647,6 +647,7 @@ typedef unsigned char *sk_buff_data_t;
@@ -648,6 +648,7 @@ typedef unsigned char *sk_buff_data_t;
* @offload_fwd_mark: Packet was L2-forwarded in hardware
* @offload_l3_fwd_mark: Packet was L3-forwarded in hardware
* @tc_skip_classify: do not classify packet. set by IFB device
@ -21,7 +21,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd
* @tc_at_ingress: used within tc_classify to distinguish in/egress
* @redirected: packet was redirected by packet classifier
* @from_ingress: packet was redirected from the ingress path
@@ -854,6 +855,7 @@ struct sk_buff {
@@ -855,6 +856,7 @@ struct sk_buff {
#ifdef CONFIG_NET_CLS_ACT
__u8 tc_skip_classify:1;
__u8 tc_at_ingress:1;

View File

@ -15,7 +15,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -647,7 +647,7 @@ typedef unsigned char *sk_buff_data_t;
@@ -648,7 +648,7 @@ typedef unsigned char *sk_buff_data_t;
* @offload_fwd_mark: Packet was L2-forwarded in hardware
* @offload_l3_fwd_mark: Packet was L3-forwarded in hardware
* @tc_skip_classify: do not classify packet. set by IFB device
@ -24,7 +24,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92
* @tc_at_ingress: used within tc_classify to distinguish in/egress
* @redirected: packet was redirected by packet classifier
* @from_ingress: packet was redirected from the ingress path
@@ -855,7 +855,7 @@ struct sk_buff {
@@ -856,7 +856,7 @@ struct sk_buff {
#ifdef CONFIG_NET_CLS_ACT
__u8 tc_skip_classify:1;
__u8 tc_at_ingress:1;

View File

@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum
@@ -70,13 +70,13 @@ static void phy_process_state_change(str
static void phy_link_up(struct phy_device *phydev)
{
@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
phy_led_trigger_change_speed(phydev);
}
@@ -572,7 +572,7 @@ int phy_start_cable_test(struct phy_devi
@@ -584,7 +584,7 @@ int phy_start_cable_test(struct phy_devi
goto out;
/* Mark the carrier down until the test is complete */
@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
netif_testing_on(dev);
err = phydev->drv->cable_test_start(phydev);
@@ -643,7 +643,7 @@ int phy_start_cable_test_tdr(struct phy_
@@ -655,7 +655,7 @@ int phy_start_cable_test_tdr(struct phy_
goto out;
/* Mark the carrier down until the test is complete */
@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
netif_testing_on(dev);
err = phydev->drv->cable_test_tdr_start(phydev, config);
@@ -714,7 +714,7 @@ static int phy_check_link_status(struct
@@ -726,7 +726,7 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
}
return 0;
@@ -1226,7 +1226,7 @@ void phy_state_machine(struct work_struc
@@ -1241,7 +1241,7 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;

View File

@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -714,7 +714,10 @@ static int phy_check_link_status(struct
@@ -726,7 +726,10 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
}
return 0;
@@ -1226,7 +1229,10 @@ void phy_state_machine(struct work_struc
@@ -1241,7 +1244,10 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;

View File

@ -1,6 +1,6 @@
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -477,6 +477,12 @@ static int dwc2_driver_probe(struct plat
@@ -465,6 +465,12 @@ static int dwc2_driver_probe(struct plat
if (retval)
return retval;

View File

@ -31,7 +31,7 @@
config MICREL_KS8995MA
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -84,6 +84,7 @@ obj-$(CONFIG_MICROCHIP_PHY) += microchip
@@ -86,6 +86,7 @@ obj-$(CONFIG_MICROCHIP_PHY) += microchip
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
obj-$(CONFIG_MICROSEMI_PHY) += mscc/
obj-$(CONFIG_NATIONAL_PHY) += national.o

View File

@ -29,7 +29,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
help
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -83,6 +83,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o
@@ -85,6 +85,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o
obj-$(CONFIG_MICROCHIP_PHY) += microchip.o
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
obj-$(CONFIG_MICROSEMI_PHY) += mscc/