[openwrt/openwrt] kernel: bump 5.10 to 5.10.118
LEDE Commits
lede-commits at lists.infradead.org
Tue Jun 7 14:02:51 PDT 2022
hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/49f8a75031c8fb2efc4824166da75f1473cdab6b
commit 49f8a75031c8fb2efc4824166da75f1473cdab6b
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Wed May 25 13:09:23 2022 -0400
kernel: bump 5.10 to 5.10.118
Removed upstreamed:
generic-backport/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
generic-backport/774-v5.15-2-igc-remove-phy-type-checking.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky at proton.me>
(cherry picked from commit b789a588b1c55fe1df7e2d6ae1c4f84b96a03a95)
---
include/kernel-5.10 | 4 +-
...-clk-at91-re-factor-clocks-suspend-resume.patch | 6 +-
...774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch | 73 ----------------------
.../774-v5.15-2-igc-remove-phy-type-checking.patch | 43 -------------
.../linux/generic/hack-5.10/204-module_strip.patch | 4 +-
.../generic/hack-5.10/600-bridge_offload.patch | 4 +-
...-bridge_allow_receiption_on_disabled_port.patch | 4 +-
...ge-add-knob-for-filtering-rx-tx-BPDU-pack.patch | 2 +-
...51-MIPS-lantiq-improve-USB-initialization.patch | 2 +-
...x200-add-gphy-clk-src-device-tree-binding.patch | 4 +-
10 files changed, 15 insertions(+), 131 deletions(-)
diff --git a/include/kernel-5.10 b/include/kernel-5.10
index cfc5c92055..c05a5d8425 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .117
-LINUX_KERNEL_HASH-5.10.117 = 703ef7112cdf889950dd864ba482d04bd87d83d3df3a98ab8d4ba8a7ab1ddcc7
+LINUX_VERSION-5.10 = .118
+LINUX_KERNEL_HASH-5.10.118 = c5e020f187a195ab0924fe7e71b8ab8fb92936ab47bc9d15e78daabddefe0b4b
diff --git a/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch b/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
index fc08b1fce6..5d399f6535 100644
--- a/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
+++ b/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
@@ -93,7 +93,7 @@ Signed-off-by: Stephen Boyd <sboyd at kernel.org>
return 0;
}
-@@ -245,6 +256,23 @@ static int clk_generated_set_rate(struct
+@@ -249,6 +260,23 @@ static int clk_generated_set_rate(struct
return 0;
}
@@ -117,7 +117,7 @@ Signed-off-by: Stephen Boyd <sboyd at kernel.org>
static const struct clk_ops generated_ops = {
.enable = clk_generated_enable,
.disable = clk_generated_disable,
-@@ -254,6 +282,8 @@ static const struct clk_ops generated_op
+@@ -258,6 +286,8 @@ static const struct clk_ops generated_op
.get_parent = clk_generated_get_parent,
.set_parent = clk_generated_set_parent,
.set_rate = clk_generated_set_rate,
@@ -126,7 +126,7 @@ Signed-off-by: Stephen Boyd <sboyd at kernel.org>
};
/**
-@@ -320,8 +350,6 @@ at91_clk_register_generated(struct regma
+@@ -324,8 +354,6 @@ at91_clk_register_generated(struct regma
if (ret) {
kfree(gck);
hw = ERR_PTR(ret);
diff --git a/target/linux/generic/backport-5.10/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch b/target/linux/generic/backport-5.10/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
deleted file mode 100644
index d7df0685dd..0000000000
--- a/target/linux/generic/backport-5.10/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7c496de538eebd8212dc2a3c9a468386b264d0d4 Mon Sep 17 00:00:00 2001
-From: Sasha Neftin <sasha.neftin at intel.com>
-Date: Wed, 7 Jul 2021 08:14:40 +0300
-Subject: igc: Remove _I_PHY_ID checking
-
-i225 devices have only one PHY vendor. There is no point checking
-_I_PHY_ID during the link establishment and auto-negotiation process.
-This patch comes to clean up these pointless checkings.
-
-Signed-off-by: Sasha Neftin <sasha.neftin at intel.com>
-Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer at linux.intel.com>
-Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
----
- drivers/net/ethernet/intel/igc/igc_base.c | 10 +---------
- drivers/net/ethernet/intel/igc/igc_main.c | 3 +--
- drivers/net/ethernet/intel/igc/igc_phy.c | 6 ++----
- 3 files changed, 4 insertions(+), 15 deletions(-)
-
-(limited to 'drivers/net/ethernet/intel/igc')
-
---- a/drivers/net/ethernet/intel/igc/igc_base.c
-+++ b/drivers/net/ethernet/intel/igc/igc_base.c
-@@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(stru
-
- igc_check_for_copper_link(hw);
-
-- /* Verify phy id and set remaining function pointers */
-- switch (phy->id) {
-- case I225_I_PHY_ID:
-- phy->type = igc_phy_i225;
-- break;
-- default:
-- ret_val = -IGC_ERR_PHY;
-- goto out;
-- }
-+ phy->type = igc_phy_i225;
-
- out:
- return ret_val;
---- a/drivers/net/ethernet/intel/igc/igc_main.c
-+++ b/drivers/net/ethernet/intel/igc/igc_main.c
-@@ -4189,8 +4189,7 @@ bool igc_has_link(struct igc_adapter *ad
- break;
- }
-
-- if (hw->mac.type == igc_i225 &&
-- hw->phy.id == I225_I_PHY_ID) {
-+ if (hw->mac.type == igc_i225) {
- if (!netif_carrier_ok(adapter->netdev)) {
- adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE;
- } else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {
---- a/drivers/net/ethernet/intel/igc/igc_phy.c
-+++ b/drivers/net/ethernet/intel/igc/igc_phy.c
-@@ -249,8 +249,7 @@ static s32 igc_phy_setup_autoneg(struct
- return ret_val;
- }
-
-- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
-- hw->phy.id == I225_I_PHY_ID) {
-+ if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
- /* Read the MULTI GBT AN Control Register - reg 7.32 */
- ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
- MMD_DEVADDR_SHIFT) |
-@@ -390,8 +389,7 @@ static s32 igc_phy_setup_autoneg(struct
- ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
- mii_1000t_ctrl_reg);
-
-- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
-- hw->phy.id == I225_I_PHY_ID)
-+ if (phy->autoneg_mask & ADVERTISE_2500_FULL)
- ret_val = phy->ops.write_reg(hw,
- (STANDARD_AN_REG_MASK <<
- MMD_DEVADDR_SHIFT) |
diff --git a/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch b/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch
deleted file mode 100644
index ad4d1bb0dc..0000000000
--- a/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 47bca7de6a4fb8dcb564c7ca14d885c91ed19e03 Mon Sep 17 00:00:00 2001
-From: Sasha Neftin <sasha.neftin at intel.com>
-Date: Sat, 10 Jul 2021 20:57:50 +0300
-Subject: igc: Remove phy->type checking
-
-i225 devices have only one phy->type: copper. There is no point checking
-phy->type during the igc_has_link method from the watchdog that
-invoked every 2 seconds.
-This patch comes to clean up these pointless checkings.
-
-Signed-off-by: Sasha Neftin <sasha.neftin at intel.com>
-Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer at linux.intel.com>
-Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
----
- drivers/net/ethernet/intel/igc/igc_main.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-(limited to 'drivers/net/ethernet/intel/igc')
-
---- a/drivers/net/ethernet/intel/igc/igc_main.c
-+++ b/drivers/net/ethernet/intel/igc/igc_main.c
-@@ -4177,17 +4177,10 @@ bool igc_has_link(struct igc_adapter *ad
- * false until the igc_check_for_link establishes link
- * for copper adapters ONLY
- */
-- switch (hw->phy.media_type) {
-- case igc_media_type_copper:
-- if (!hw->mac.get_link_status)
-- return true;
-- hw->mac.ops.check_for_link(hw);
-- link_active = !hw->mac.get_link_status;
-- break;
-- default:
-- case igc_media_type_unknown:
-- break;
-- }
-+ if (!hw->mac.get_link_status)
-+ return true;
-+ hw->mac.ops.check_for_link(hw);
-+ link_active = !hw->mac.get_link_status;
-
- if (hw->mac.type == igc_i225) {
- if (!netif_carrier_ok(adapter->netdev)) {
diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch
index 645074821f..4c6b4454c6 100644
--- a/target/linux/generic/hack-5.10/204-module_strip.patch
+++ b/target/linux/generic/hack-5.10/204-module_strip.patch
@@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
#ifdef CONFIG_MODVERSIONS
-@@ -3247,9 +3249,11 @@ static int setup_load_info(struct load_i
+@@ -3251,9 +3253,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;
-@@ -3270,6 +3274,7 @@ static int check_modinfo(struct module *
+@@ -3274,6 +3278,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.10/600-bridge_offload.patch b/target/linux/generic/hack-5.10/600-bridge_offload.patch
index 7e1b852bf3..b704c98dc8 100644
--- a/target/linux/generic/hack-5.10/600-bridge_offload.patch
+++ b/target/linux/generic/hack-5.10/600-bridge_offload.patch
@@ -154,7 +154,7 @@
static int
br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)
-@@ -162,6 +163,7 @@ int br_handle_frame_finish(struct net *n
+@@ -169,6 +170,7 @@ int br_handle_frame_finish(struct net *n
dst->used = now;
br_forward(dst->dst, skb, local_rcv, false);
} else {
@@ -162,7 +162,7 @@
if (!mcast_hit)
br_flood(br, skb, pkt_type, local_rcv, false);
else
-@@ -280,6 +282,9 @@ static rx_handler_result_t br_handle_fra
+@@ -287,6 +289,9 @@ static rx_handler_result_t br_handle_fra
memset(skb->cb, 0, sizeof(struct br_input_skb_cb));
p = br_port_get_rcu(skb->dev);
diff --git a/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch
index 6de22b1c7d..8ab4b361f0 100644
--- a/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/pending-5.10/150-bridge_allow_receiption_on_disabled_port.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
-@@ -195,6 +195,9 @@ static void __br_handle_local_finish(str
+@@ -202,6 +202,9 @@ static void __br_handle_local_finish(str
/* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
__br_handle_local_finish(skb);
/* return 1 to signal the okfn() was called so it's ok to use the skb */
-@@ -348,6 +351,17 @@ static rx_handler_result_t br_handle_fra
+@@ -355,6 +358,17 @@ static rx_handler_result_t br_handle_fra
forward:
switch (p->state) {
diff --git a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index 106f7d3560..d907006fa4 100644
--- a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
-@@ -305,6 +305,8 @@ static rx_handler_result_t br_handle_fra
+@@ -312,6 +312,8 @@ static rx_handler_result_t br_handle_fra
fwd_mask |= p->group_fwd_mask;
switch (dest[5]) {
case 0x00: /* Bridge Group Address */
diff --git a/target/linux/lantiq/patches-5.10/0051-MIPS-lantiq-improve-USB-initialization.patch b/target/linux/lantiq/patches-5.10/0051-MIPS-lantiq-improve-USB-initialization.patch
index 17e07cd63a..9d62892b56 100644
--- a/target/linux/lantiq/patches-5.10/0051-MIPS-lantiq-improve-USB-initialization.patch
+++ b/target/linux/lantiq/patches-5.10/0051-MIPS-lantiq-improve-USB-initialization.patch
@@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
/* the pci enable helper */
static int pci_enable(struct clk *clk)
{
-@@ -571,4 +590,5 @@ void __init ltq_soc_init(void)
+@@ -585,4 +604,5 @@ void __init ltq_soc_init(void)
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0);
}
diff --git a/target/linux/lantiq/patches-5.10/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch b/target/linux/lantiq/patches-5.10/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch
index 01b87b9d5c..92c4b56493 100644
--- a/target/linux/lantiq/patches-5.10/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch
+++ b/target/linux/lantiq/patches-5.10/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
-@@ -426,6 +426,20 @@ static void clkdev_add_clkout(void)
+@@ -440,6 +440,20 @@ static void clkdev_add_clkout(void)
}
}
@@ -21,7 +21,7 @@
/* bring up all register ranges that we need for basic system control */
void __init ltq_soc_init(void)
{
-@@ -591,4 +605,6 @@ void __init ltq_soc_init(void)
+@@ -605,4 +619,6 @@ void __init ltq_soc_init(void)
clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0);
}
usb_set_clock();
More information about the lede-commits
mailing list