Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 5.10 to 5.10.84 #8411

Merged
merged 1 commit into from
Dec 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-5.4 = .162
LINUX_VERSION-5.10 = .83
LINUX_VERSION-5.10 = .84

LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b
LINUX_KERNEL_HASH-5.10.83 = ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70
LINUX_KERNEL_HASH-5.10.84 = 6e96271d72dd106c4bd83931ca16fda622413b34c5649e2916116c38c12e233d

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201118094758.506730-1-maxi
#include <drm/drm_atomic_helper.h>
#include <drm/drm_dp_mst_helper.h>
#include <drm/drm_dp_helper.h>
@@ -252,8 +253,10 @@ static int dm_dp_mst_get_modes(struct dr
@@ -264,8 +265,10 @@ static int dm_dp_mst_get_modes(struct dr

static struct drm_encoder *
dm_mst_atomic_best_encoder(struct drm_connector *connector,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <[email protected]>

--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -4252,9 +4252,9 @@ void xhci_queue_new_dequeue_state(struct
@@ -4259,9 +4259,9 @@ void xhci_queue_new_dequeue_state(struct
}
ep = &xhci->devs[slot_id]->eps[ep_index];
if ((ep->ep_state & SET_DEQ_PENDING)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2084,7 +2084,7 @@ config CPU_MIPS32
@@ -2082,7 +2082,7 @@ config CPU_MIPS32
config CPU_MIPS64
bool
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6802,15 +6802,10 @@ void __netif_napi_del(struct napi_struct
@@ -6805,15 +6805,10 @@ void __netif_napi_del(struct napi_struct
}
EXPORT_SYMBOL(__netif_napi_del);

Expand All @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
weight = n->weight;

/* This NAPI_STATE_SCHED test is for avoiding a race
@@ -6830,7 +6825,7 @@ static int napi_poll(struct napi_struct
@@ -6833,7 +6828,7 @@ static int napi_poll(struct napi_struct
n->poll, work, weight);

if (likely(work < weight))
Expand All @@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <[email protected]>

/* Drivers must not modify the NAPI state if they
* consume the entire weight. In such cases this code
@@ -6839,7 +6834,7 @@ static int napi_poll(struct napi_struct
@@ -6842,7 +6837,7 @@ static int napi_poll(struct napi_struct
*/
if (unlikely(napi_disable_pending(n))) {
napi_complete(n);
Expand All @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <[email protected]>
}

if (n->gro_bitmask) {
@@ -6857,12 +6852,29 @@ static int napi_poll(struct napi_struct
@@ -6860,12 +6855,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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <[email protected]>
static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
{
const struct net_device_ops *ops = dev->netdev_ops;
@@ -4264,6 +4286,21 @@ int gro_normal_batch __read_mostly = 8;
@@ -4267,6 +4289,21 @@ int gro_normal_batch __read_mostly = 8;
static inline void ____napi_schedule(struct softnet_data *sd,
struct napi_struct *napi)
{
Expand All @@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <[email protected]>
list_add_tail(&napi->poll_list, &sd->poll_list);
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
}
@@ -6755,6 +6792,12 @@ void netif_napi_add(struct net_device *d
@@ -6758,6 +6795,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);
Expand All @@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <[email protected]>
}
EXPORT_SYMBOL(netif_napi_add);

@@ -6771,9 +6814,28 @@ void napi_disable(struct napi_struct *n)
@@ -6774,9 +6817,28 @@ void napi_disable(struct napi_struct *n)
hrtimer_cancel(&n->timer);

clear_bit(NAPI_STATE_DISABLE, &n->state);
Expand Down Expand Up @@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <[email protected]>
static void flush_gro_hash(struct napi_struct *napi)
{
int i;
@@ -6799,6 +6861,11 @@ void __netif_napi_del(struct napi_struct
@@ -6802,6 +6864,11 @@ void __netif_napi_del(struct napi_struct

flush_gro_hash(napi);
napi->gro_bitmask = 0;
Expand All @@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <[email protected]>
}
EXPORT_SYMBOL(__netif_napi_del);

@@ -6880,6 +6947,51 @@ static int napi_poll(struct napi_struct
@@ -6883,6 +6950,51 @@ static int napi_poll(struct napi_struct
return work;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]>
* @n: NAPI context
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4290,8 +4290,9 @@ static inline void ____napi_schedule(str
@@ -4293,8 +4293,9 @@ static inline void ____napi_schedule(str

if (test_bit(NAPI_STATE_THREADED, &napi->state)) {
/* Paired with smp_mb__before_atomic() in
Expand All @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <[email protected]>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
@@ -6765,6 +6766,49 @@ static void init_gro_hash(struct napi_st
@@ -6768,6 +6769,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4297,6 +4297,8 @@ static inline void ____napi_schedule(str
@@ -4300,6 +4300,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
Expand All @@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
wake_up_process(thread);
return;
}
@@ -6557,7 +6559,8 @@ bool napi_complete_done(struct napi_stru
@@ -6560,7 +6562,8 @@ bool napi_complete_done(struct napi_stru

WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));

Expand All @@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <[email protected]>

/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
@@ -6993,16 +6996,25 @@ static int napi_poll(struct napi_struct
@@ -6996,16 +6999,25 @@ static int napi_poll(struct napi_struct

static int napi_thread_wait(struct napi_struct *napi)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7000,7 +7000,7 @@ static int napi_thread_wait(struct napi_
@@ -7003,7 +7003,7 @@ static int napi_thread_wait(struct napi_

set_current_state(TASK_INTERRUPTIBLE);

Expand All @@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
/* 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
@@ -7018,6 +7018,7 @@ static int napi_thread_wait(struct napi_
@@ -7021,6 +7021,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
@@ -2261,6 +2261,17 @@ static void mt753x_phylink_mac_link_up(s
mcr |= PMCR_RX_FC_EN;
}

Expand All @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}

@@ -2601,6 +2612,36 @@ mt753x_phy_write(struct dsa_switch *ds,
@@ -2491,6 +2502,36 @@ mt753x_phy_write(struct dsa_switch *ds,
return priv->info->phy_write(ds, port, regnum, val);
}

Expand Down Expand Up @@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <[email protected]>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
@@ -2629,6 +2670,8 @@ static const struct dsa_switch_ops mt753
@@ -2519,6 +2560,8 @@ static const struct dsa_switch_ops mt753
.phylink_mac_an_restart = mt753x_phylink_mac_an_restart,
.phylink_mac_link_down = mt753x_phylink_mac_link_down,
.phylink_mac_link_up = mt753x_phylink_mac_link_up,
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/220-gc_sections.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
---
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -113,6 +113,7 @@ config ARM
@@ -114,6 +114,7 @@ config ARM
select HAVE_UID16
select HAVE_VIRT_CPU_ACCOUNTING_GEN
select IRQ_FORCED_THREADING
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1170,6 +1170,10 @@ config MIPS_MSC
@@ -1168,6 +1168,10 @@ config MIPS_MSC
config SYNC_R4K
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ Signed-off-by: Zhi Chen <[email protected]>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3788,9 +3795,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3786,9 +3793,15 @@ static int ctnetlink_stat_exp_cpu(struct
}

#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3641,8 +3641,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3643,8 +3643,17 @@ static int xmit_one(struct sk_buff *skb,
unsigned int len;
int rc;

Expand All @@ -98,7 +98,7 @@

len = skb->len;
PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
@@ -5184,6 +5193,11 @@ void netdev_rx_handler_unregister(struct
@@ -5190,6 +5199,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);

Expand All @@ -110,7 +110,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5232,6 +5246,10 @@ static int __netif_receive_skb_core(stru
@@ -5238,6 +5252,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;

Expand All @@ -121,7 +121,7 @@
net_timestamp_check(!netdev_tstamp_prequeue, skb);

trace_netif_receive_skb(skb);
@@ -5271,6 +5289,16 @@ another_round:
@@ -5277,6 +5295,16 @@ another_round:
goto out;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1085,9 +1085,6 @@ config FW_ARC
@@ -1083,9 +1083,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

Expand All @@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
config CEVT_BCM1480
bool

@@ -3178,6 +3175,18 @@ choice
@@ -3176,6 +3173,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6059,6 +6059,9 @@ static enum gro_result dev_gro_receive(s
@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (netif_elide_gro(skb->dev))
goto normal;

@@ -8036,6 +8039,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8039,6 +8042,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}

Expand Down Expand Up @@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8087,6 +8132,7 @@ static int __netdev_upper_dev_link(struc
@@ -8090,6 +8135,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;

+ netdev_update_addr_mask(dev);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8183,6 +8229,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8186,6 +8232,7 @@ static void __netdev_upper_dev_unlink(st

__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);

+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);

@@ -8969,6 +9016,7 @@ int dev_set_mac_address(struct net_devic
@@ -8972,6 +9019,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ Cc: [email protected]
ret = pm_runtime_get_sync(dev);
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -341,12 +341,6 @@ static int uniphier_add_pcie_port(struct
@@ -335,12 +335,6 @@ static int uniphier_add_pcie_port(struct

pp->ops = &uniphier_pcie_host_ops;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ Cc: [email protected]
}

static void uniphier_pcie_stop_link(struct dw_pcie *pci)
@@ -318,10 +315,6 @@ static int uniphier_pcie_host_init(struc
@@ -312,10 +309,6 @@ static int uniphier_pcie_host_init(struc
uniphier_pcie_irq_enable(priv);

dw_pcie_setup_rc(pp);
Expand All @@ -592,7 +592,7 @@ Cc: [email protected]
dw_pcie_msi_init(pp);

return 0;
@@ -385,7 +378,7 @@ out_clk_disable:
@@ -379,7 +372,7 @@ out_clk_disable:
}

static const struct dw_pcie_ops dw_pcie_ops = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Cc: [email protected]
val |= APPL_INTR_EN_L0_0_SYS_MSI_INTR_EN;
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -315,7 +315,6 @@ static int uniphier_pcie_host_init(struc
@@ -309,7 +309,6 @@ static int uniphier_pcie_host_init(struc
uniphier_pcie_irq_enable(priv);

dw_pcie_setup_rc(pp);
Expand Down
Loading