From ed1536e0b6b7f2aeea6881632b89b269d27ff7ce Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 18 May 2022 15:32:03 +0100 Subject: kernel: bump 5.15 to 5.15.41 Deleted (upstreamed): generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch [1] Other patches automatically rebased. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.41&id=99858114a3b2c8f5f8707d9bbd46c50f547c87c0 Signed-off-by: Rui Salvaterra --- ...ools-resolve_btfids-Build-with-host-flags.patch | 7 +-- ...ault-workaround-for-Huawei-MA5671A-SFP-ON.patch | 57 ---------------------- .../613-netfilter_optional_tcp_window_check.patch | 18 +++---- ...aardvark-Fix-initialization-with-old-Marv.patch | 2 +- 4 files changed, 11 insertions(+), 73 deletions(-) delete mode 100644 target/linux/generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch (limited to 'target/linux/generic') diff --git a/target/linux/generic/backport-5.15/200-v5.18-tools-resolve_btfids-Build-with-host-flags.patch b/target/linux/generic/backport-5.15/200-v5.18-tools-resolve_btfids-Build-with-host-flags.patch index 489575fb35..caec8db5d6 100644 --- a/target/linux/generic/backport-5.15/200-v5.18-tools-resolve_btfids-Build-with-host-flags.patch +++ b/target/linux/generic/backport-5.15/200-v5.18-tools-resolve_btfids-Build-with-host-flags.patch @@ -24,8 +24,6 @@ Signed-off-by: Stijn Tintel tools/bpf/resolve_btfids/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile -index af9f9d3534c9..e727058bfe15 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -23,6 +23,8 @@ CC = $(HOSTCC) @@ -37,7 +35,7 @@ index af9f9d3534c9..e727058bfe15 100644 OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/ -@@ -45,9 +47,9 @@ $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd +@@ -45,9 +47,9 @@ $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/l $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(abspath $(dir $@))/ $(abspath $@) $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(OUTPUT)/libbpf @@ -49,6 +47,3 @@ index af9f9d3534c9..e727058bfe15 100644 -I$(srctree)/tools/include \ -I$(srctree)/tools/include/uapi \ -I$(LIBBPF_SRC) \ --- -2.35.1 - diff --git a/target/linux/generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch b/target/linux/generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch deleted file mode 100644 index bcada79fb2..0000000000 --- a/target/linux/generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f81d97cb646ab8b90fb181d66fccaf9589990de6 Mon Sep 17 00:00:00 2001 -From: Matthew Hagan -Date: Sat, 30 Apr 2022 11:00:49 +0100 -Subject: [PATCH v2] net: sfp: Add tx-fault workaround for Huawei MA5671A SFP - ONT - -As noted elsewhere, various GPON SFP modules exhibit non-standard -TX-fault behaviour. In the tested case, the Huawei MA5671A, when used -in combination with a Marvell mv88e6085 switch, was found to -persistently assert TX-fault, resulting in the module being disabled. - -This patch adds a quirk to ignore the SFP_F_TX_FAULT state, allowing the -module to function. - -Change from v1: removal of erroneous return statment (Andrew Lunn) - -Signed-off-by: Matthew Hagan -Reviewed-by: Andrew Lunn ---- - drivers/net/phy/sfp.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -250,6 +250,7 @@ struct sfp { - struct sfp_eeprom_id id; - unsigned int module_power_mW; - unsigned int module_t_start_up; -+ bool tx_fault_ignore; - - #if IS_ENABLED(CONFIG_HWMON) - struct sfp_diag diag; -@@ -1945,6 +1946,12 @@ static int sfp_sm_mod_probe(struct sfp * - else - sfp->module_t_start_up = T_START_UP; - -+ if (!memcmp(id.base.vendor_name, "HUAWEI ", 16) && -+ !memcmp(id.base.vendor_pn, "MA5671A ", 16)) -+ sfp->tx_fault_ignore = true; -+ else -+ sfp->tx_fault_ignore = false; -+ - return 0; - } - -@@ -2397,7 +2404,10 @@ static void sfp_check_state(struct sfp * - mutex_lock(&sfp->st_mutex); - state = sfp_get_state(sfp); - changed = state ^ sfp->state; -- changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT; -+ if (sfp->tx_fault_ignore) -+ changed &= SFP_F_PRESENT | SFP_F_LOS; -+ else -+ changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT; - - for (i = 0; i < GPIO_MAX; i++) - if (changed & BIT(i)) diff --git a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch index 1ddfc8e014..fd9e63a613 100644 --- a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch @@ -19,7 +19,7 @@ Signed-off-by: Christian 'Ansuel' Marangi /* * Get the required data from the packet. */ -@@ -1151,7 +1154,7 @@ int nf_conntrack_tcp_packet(struct nf_co +@@ -1160,7 +1163,7 @@ int nf_conntrack_tcp_packet(struct nf_co IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeout = timeouts[TCP_CONNTRACK_UNACK]; @@ -28,19 +28,19 @@ Signed-off-by: Christian 'Ansuel' Marangi timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; else -@@ -1451,6 +1454,9 @@ int nf_conntrack_tcp_packet(struct nf_co - * If it's non-zero, we mark only out of window RST segments as INVALID. +@@ -1476,6 +1479,9 @@ void nf_conntrack_tcp_init_net(struct ne */ tn->tcp_be_liberal = 0; -+ + + /* Skip Windows Check */ + tn->tcp_no_window_check = 0; - ++ /* If it's non-zero, we turn off RST sequence number check */ tn->tcp_ignore_invalid_rst = 0; + --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -671,6 +671,7 @@ enum nf_ct_sysctl_index { +@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index { #endif NF_SYSCTL_CT_PROTO_TCP_LOOSE, NF_SYSCTL_CT_PROTO_TCP_LIBERAL, @@ -48,7 +48,7 @@ Signed-off-by: Christian 'Ansuel' Marangi NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST, NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS, NF_SYSCTL_CT_PROTO_TIMEOUT_UDP, -@@ -800,6 +800,14 @@ static struct ctl_table nf_ct_sysctl_tab +@@ -849,6 +850,14 @@ static struct ctl_table nf_ct_sysctl_tab .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, @@ -63,7 +63,7 @@ Signed-off-by: Christian 'Ansuel' Marangi [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = { .procname = "nf_conntrack_tcp_ignore_invalid_rst", .maxlen = sizeof(u8), -@@ -900,6 +900,7 @@ static int nf_conntrack_standalone_init_ +@@ -1065,6 +1074,7 @@ static void nf_conntrack_standalone_init XASSIGN(LOOSE, &tn->tcp_loose); XASSIGN(LIBERAL, &tn->tcp_be_liberal); @@ -73,7 +73,7 @@ Signed-off-by: Christian 'Ansuel' Marangi #undef XASSIGN --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h -@@ -109,6 +109,7 @@ struct netns_ct { +@@ -26,6 +26,7 @@ struct nf_tcp_net { unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX]; u8 tcp_loose; u8 tcp_be_liberal; diff --git a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch index 4d3bc62bad..8fee4d49de 100644 --- a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch +++ b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch @@ -23,7 +23,7 @@ Acked-by: Miquel Raynal --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c -@@ -1633,9 +1633,7 @@ static int advk_pcie_enable_phy(struct a +@@ -1622,9 +1622,7 @@ static int advk_pcie_enable_phy(struct a } ret = phy_power_on(pcie->phy); -- cgit v1.2.3