Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.121
Browse files Browse the repository at this point in the history 
Manually rebased:
    oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Jun 26, 2022
1 parent d075bb3 commit 706a4ec
Show file tree
Hide file tree
Showing 35 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
View file
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .120
LINUX_KERNEL_HASH-5.10.120 = 5b7a756004158ece2f5e41795ba523ec201743a736e34ce41cbe09177f7d0e8b
LINUX_VERSION-5.10 = .121
LINUX_KERNEL_HASH-5.10.121 = 9044e7b4084afc636ccd7a7fe06439d8941b28613df79f16ce603ccca35292c6
2 changes: 1 addition & 1 deletion target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
View file
Expand Up @@ -13,7 +13,7 @@ produce a noisy warning.

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -281,6 +281,7 @@ static void xhci_pci_quirks(struct devic
@@ -283,6 +283,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS;
Expand Down
2 changes: 1 addition & 1 deletion target/linux/at91/patches-5.10/121-ASoC-pcm5102a-Make-codec-selectable.patch
View file
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>

--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1008,7 +1008,7 @@ config SND_SOC_PCM3168A_SPI
@@ -1007,7 +1007,7 @@ config SND_SOC_PCM3168A_SPI
select REGMAP_SPI

config SND_SOC_PCM5102A
Expand Down
6 changes: 3 additions & 3 deletions ...et/linux/at91/patches-5.10/127-regulator-core-validate-selector-against-linear_min_.patch
View file
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>

--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2984,7 +2984,8 @@ static int _regulator_list_voltage(struc
@@ -2987,7 +2987,8 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV;

if (ops->list_voltage) {
Expand All @@ -30,7 +30,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL;
if (lock)
regulator_lock(rdev);
@@ -3135,7 +3136,8 @@ int regulator_list_hardware_vsel(struct
@@ -3138,7 +3139,8 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops;

Expand All @@ -40,7 +40,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL;
if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)
return -EOPNOTSUPP;
@@ -4058,6 +4060,9 @@ int regulator_set_voltage_time(struct re
@@ -4061,6 +4063,9 @@ int regulator_set_voltage_time(struct re

for (i = 0; i < rdev->desc->n_voltages; i++) {
/* We only look for exact voltage matches here */
Expand Down
2 changes: 1 addition & 1 deletion target/linux/at91/patches-5.10/128-regulator-core-do-not-continue-if-selector-match.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>

--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4063,6 +4063,9 @@ int regulator_set_voltage_time(struct re
@@ -4066,6 +4066,9 @@ int regulator_set_voltage_time(struct re
if (i < rdev->desc->linear_min_sel)
continue;

Expand Down
4 changes: 2 additions & 2 deletions ...et/linux/at91/patches-5.10/129-regulator-core-return-zero-for-selectors-lower-than-.patch
View file
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>

--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2984,9 +2984,10 @@ static int _regulator_list_voltage(struc
@@ -2987,9 +2987,10 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV;

if (ops->list_voltage) {
Expand All @@ -34,7 +34,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
if (lock)
regulator_lock(rdev);
ret = ops->list_voltage(rdev, selector);
@@ -3136,9 +3137,10 @@ int regulator_list_hardware_vsel(struct
@@ -3139,9 +3140,10 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops;

Expand Down
4 changes: 2 additions & 2 deletions target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
View file
Expand Up @@ -10,15 +10,15 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>

--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -3147,6 +3147,7 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
+ const char __maybe_unused *of_mtd_name = NULL;
int ret;
int i;

@@ -3201,7 +3202,12 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion ...linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
View file
Expand Up @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
if (ret < 0) {
pr_err("%s: failed to add hogs for %pOF\n", __func__,
rd->dn);
@@ -1030,9 +1040,11 @@ int of_gpiochip_add(struct gpio_chip *ch
@@ -1035,9 +1045,11 @@ int of_gpiochip_add(struct gpio_chip *ch

of_node_get(chip->of_node);

Expand Down
2 changes: 1 addition & 1 deletion ...generic/backport-5.10/408-v5.13-mtd-cfi_cmdset_0002-Disable-buffered-writes-for-AMD.patch
View file
Expand Up @@ -41,7 +41,7 @@ Link: https://lore.kernel.org/r/20210309174859.362060-1-sandberg@mailfence.com

--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -272,6 +272,10 @@ static void fixup_use_write_buffers(stru
@@ -276,6 +276,10 @@ static void fixup_use_write_buffers(stru
{
struct map_info *map = mtd->priv;
struct cfi_private *cfi = map->fldrv_priv;
Expand Down
8 changes: 4 additions & 4 deletions .../generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch
View file
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6805,15 +6805,10 @@ void __netif_napi_del(struct napi_struct
@@ -6809,15 +6809,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 <davem@davemloft.net>
weight = n->weight;

/* This NAPI_STATE_SCHED test is for avoiding a race
@@ -6833,7 +6828,7 @@ static int napi_poll(struct napi_struct
@@ -6837,7 +6832,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 <davem@davemloft.net>

/* Drivers must not modify the NAPI state if they
* consume the entire weight. In such cases this code
@@ -6842,7 +6837,7 @@ static int napi_poll(struct napi_struct
@@ -6846,7 +6841,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 <davem@davemloft.net>
}

if (n->gro_bitmask) {
@@ -6860,12 +6855,29 @@ static int napi_poll(struct napi_struct
@@ -6864,12 +6859,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
10 changes: 5 additions & 5 deletions .../generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch
View file
Expand Up @@ -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;
@@ -4267,6 +4289,21 @@ int gro_normal_batch __read_mostly = 8;
@@ -4271,6 +4293,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 <davem@davemloft.net>
list_add_tail(&napi->poll_list, &sd->poll_list);
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
}
@@ -6758,6 +6795,12 @@ void netif_napi_add(struct net_device *d
@@ -6762,6 +6799,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 <davem@davemloft.net>
}
EXPORT_SYMBOL(netif_napi_add);

@@ -6774,9 +6817,28 @@ void napi_disable(struct napi_struct *n)
@@ -6778,9 +6821,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 <davem@davemloft.net>
static void flush_gro_hash(struct napi_struct *napi)
{
int i;
@@ -6802,6 +6864,11 @@ void __netif_napi_del(struct napi_struct
@@ -6806,6 +6868,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 <davem@davemloft.net>
}
EXPORT_SYMBOL(__netif_napi_del);

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

Expand Down
4 changes: 2 additions & 2 deletions ...eneric/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
View file
Expand Up @@ -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
@@ -4293,8 +4293,9 @@ static inline void ____napi_schedule(str
@@ -4297,8 +4297,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 <davem@davemloft.net>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
@@ -6768,6 +6769,49 @@ static void init_gro_hash(struct napi_st
@@ -6772,6 +6773,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}

Expand Down
6 changes: 3 additions & 3 deletions ...eneric/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
View file
Expand Up @@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4300,6 +4300,8 @@ static inline void ____napi_schedule(str
@@ -4304,6 +4304,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
Expand All @@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
wake_up_process(thread);
return;
}
@@ -6560,7 +6562,8 @@ bool napi_complete_done(struct napi_stru
@@ -6564,7 +6566,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 <hannes@stressinduktion.org>

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

static int napi_thread_wait(struct napi_struct *napi)
{
Expand Down
4 changes: 2 additions & 2 deletions ...ux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
View file
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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

set_current_state(TASK_INTERRUPTIBLE);

Expand All @@ -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
@@ -7021,6 +7021,7 @@ static int napi_thread_wait(struct napi_
@@ -7025,6 +7025,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);
Expand Down
6 changes: 3 additions & 3 deletions ...t/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
View file
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2372,6 +2372,17 @@ static void mt753x_phylink_mac_link_up(s
@@ -2366,6 +2366,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 <davem@davemloft.net>
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}

@@ -2602,6 +2613,36 @@ mt753x_phy_write(struct dsa_switch *ds,
@@ -2596,6 +2607,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 <davem@davemloft.net>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
@@ -2630,6 +2671,8 @@ static const struct dsa_switch_ops mt753
@@ -2624,6 +2665,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/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch
View file
Expand Up @@ -73,7 +73,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static void
mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)
{
@@ -2653,6 +2700,8 @@ static const struct dsa_switch_ops mt753
@@ -2647,6 +2694,8 @@ static const struct dsa_switch_ops mt753
.get_sset_count = mt7530_get_sset_count,
.port_enable = mt7530_port_enable,
.port_disable = mt7530_port_disable,
Expand Down
2 changes: 1 addition & 1 deletion ...et/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch
View file
Expand Up @@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
{
struct mt7530_priv *priv = ds->priv;
@@ -2700,6 +2740,7 @@ static const struct dsa_switch_ops mt753
@@ -2694,6 +2734,7 @@ static const struct dsa_switch_ops mt753
.phy_write = mt753x_phy_write,
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch
View file
Expand Up @@ -109,7 +109,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)
{
struct mt7530_dummy_poll p;
@@ -2746,11 +2814,15 @@ static const struct dsa_switch_ops mt753
@@ -2740,11 +2808,15 @@ static const struct dsa_switch_ops mt753
.port_change_mtu = mt7530_port_change_mtu,
.port_max_mtu = mt7530_port_max_mtu,
.port_stp_state_set = mt7530_stp_state_set,
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch
View file
Expand Up @@ -305,7 +305,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int
mt7530_setup(struct dsa_switch *ds)
{
@@ -2750,24 +2965,20 @@ static int
@@ -2744,24 +2959,20 @@ static int
mt753x_setup(struct dsa_switch *ds)
{
struct mt7530_priv *priv = ds->priv;
Expand Down Expand Up @@ -340,7 +340,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}

static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
@@ -2804,8 +3015,6 @@ static const struct dsa_switch_ops mt753
@@ -2798,8 +3009,6 @@ static const struct dsa_switch_ops mt753
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
.get_strings = mt7530_get_strings,
Expand All @@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
.set_ageing_time = mt7530_set_ageing_time,
@@ -2988,6 +3197,9 @@ mt7530_remove(struct mdio_device *mdiode
@@ -2982,6 +3191,9 @@ mt7530_remove(struct mdio_device *mdiode
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/204-module_strip.patch
View file
Expand Up @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2347,6 +2347,13 @@ config UNUSED_KSYMS_WHITELIST
@@ -2352,6 +2352,13 @@ config UNUSED_KSYMS_WHITELIST
one per line. The path can be absolute, or relative to the kernel
source tree.

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/253-ksmbd-config.patch
View file
@@ -1,6 +1,6 @@
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2379,7 +2379,7 @@ config PADATA
@@ -2384,7 +2384,7 @@ config PADATA
bool

config ASN1
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
View file
Expand Up @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3650,6 +3650,11 @@ static int xmit_one(struct sk_buff *skb,
@@ -3654,6 +3654,11 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/800-GPIO-add-named-gpio-exports.patch
View file
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>

#include "gpiolib.h"
#include "gpiolib-of.h"
@@ -1039,3 +1041,72 @@ void of_gpiochip_remove(struct gpio_chip
@@ -1044,3 +1046,72 @@ void of_gpiochip_remove(struct gpio_chip
{
of_node_put(chip->of_node);
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch
View file
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1384,6 +1384,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
@@ -1389,6 +1389,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference

Expand Down

0 comments on commit 706a4ec

Please sign in to comment.