aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-25 16:08:31 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-28 17:50:45 +0100
commit4e0c54bc5bc8381e031af5147b66b4dadeecc626 (patch)
tree2e1774d4cabb704881094118350d43cc1fa6ff4b /target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
parentc16517d26de30c90dabce1e456615fd7fbdce07c (diff)
downloadupstream-4e0c54bc5bc8381e031af5147b66b4dadeecc626.tar.gz
upstream-4e0c54bc5bc8381e031af5147b66b4dadeecc626.tar.bz2
upstream-4e0c54bc5bc8381e031af5147b66b4dadeecc626.zip
kernel: add support for kernel 5.4
The following patches were removed because they are integrated in the upstream kernel 5.4: * backport-5.4/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch * backport-5.4/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch * backport-5.4/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch * backport-5.4/080-v5.1-0002-bcma-use-dev_-printing-functions.patch * backport-5.4/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch * backport-5.4/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch * backport-5.4/200-v5.2-usb-dwc2-Set-lpm-mode-parameters-depend-on-HW-configuration.patch * backport-5.4/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch * backport-5.4/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch * backport-5.4/450-v5.0-mtd-spinand-winbond-Add-support-for-W25N01GV.patch * backport-5.4/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch * backport-5.4/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch * backport-5.4/455-v5.1-mtd-spinand-Add-support-for-all-Toshiba-Memory-produ.patch * backport-5.4/456-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch * backport-5.4/460-v5.0-mtd-spi-nor-Add-support-for-mx25u12835f.patch * backport-5.4/460-v5.3-mtd-spinand-Define-macros-for-page-read-ops-with-thr.patch * backport-5.4/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch * backport-5.4/462-v5.3-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UFxxG.patch * backport-5.4/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch * backport-5.4/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch * backport-5.4/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch * backport-5.4/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch * backport-5.4/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch * backport-5.4/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch * backport-5.4/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch * backport-5.4/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch * backport-5.4/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch * backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch * backport-5.4/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch * backport-5.4/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch * backport-5.4/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch * backport-5.4/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch * backport-5.4/713-v5.2-net-phylink-avoid-reducing-support-mask.patch * backport-5.4/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch * backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch * backport-5.4/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch * backport-5.4/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch * pending-5.4/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch * pending-5.4/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch * pending-5.4/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch * pending-5.4/220-optimize_inlining.patch * pending-5.4/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch * pending-5.4/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch * pending-5.4/477-mtd-add-spi-nor-add-mx25u3235f.patch * pending-5.4/479-mtd-spi-nor-add-eon-en25qh64.patch Some bigger changes were done to this feature and we did not port this patch yet: * hack-5.4/207-disable-modorder.patch This depends on BOOTMEM which was removed from the kernel, this needs some bigger changes: * hack-5.4/930-crashlog.patch A different version of the FPU disable patch was merged upstream, OpenWrt needs some adaptations. * pending-5.4/304-mips_disable_fpu.patch - no crashlog support yet as a required file got deleted upstream - Removed patch below, which is now seen as a recursive dependency [1] - Removed patch below due to build error [2] - fix still required to avoid identical function def [3] - Fixes included from Blocktrron - Fixes included from Chunkeey - Fix included from nbd regarding "dst leak in Flow Offload" [1] target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch [2] target/linux/generic/hack-5.4/207-disable-modorder.patch [3] target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch')
-rw-r--r--target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch141
1 files changed, 0 insertions, 141 deletions
diff --git a/target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch b/target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
deleted file mode 100644
index 94fb2fb3e4..0000000000
--- a/target/linux/generic/backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From b8803113537a1c1f457eba6270d46e3af305031f Mon Sep 17 00:00:00 2001
-From: Arseny Solokha <asolokha@kb.kras.ru>
-Date: Wed, 24 Jul 2019 20:31:39 +0700
-Subject: [PATCH 613/660] net: phylink: don't start and stop SGMII PHYs in SFP
- modules twice
-
-SFP modules connected using the SGMII interface have their own PHYs which
-are handled by the struct phylink's phydev field. On the other hand, for
-the modules connected using 1000Base-X interface that field is not set.
-
-Since commit ce0aa27ff3f6 ("sfp: add sfp-bus to bridge between network
-devices and sfp cages") phylink_start() ends up setting the phydev field
-using the sfp-bus infrastructure, which eventually calls phy_start() on it,
-and then calling phy_start() again on the same phydev from phylink_start()
-itself. Similar call sequence holds for phylink_stop(), only in the reverse
-order. This results in WARNs during network interface bringup and shutdown
-when a copper SFP module is connected, as phy_start() and phy_stop() are
-called twice in a row for the same phy_device:
-
- % ip link set up dev eth0
- ------------[ cut here ]------------
- called from state UP
- WARNING: CPU: 1 PID: 155 at drivers/net/phy/phy.c:895 phy_start+0x74/0xc0
- Modules linked in:
- CPU: 1 PID: 155 Comm: backend Not tainted 5.2.0+ #1
- NIP: c0227bf0 LR: c0227bf0 CTR: c004d224
- REGS: df547720 TRAP: 0700 Not tainted (5.2.0+)
- MSR: 00029000 <CE,EE,ME> CR: 24002822 XER: 00000000
-
- GPR00: c0227bf0 df5477d8 df5d7080 00000014 df9d2370 df9d5ac4 1f4eb000 00000001
- GPR08: c061fe58 00000000 00000000 df5477d8 0000003c 100c8768 00000000 00000000
- GPR16: df486a00 c046f1c8 c046eea0 00000000 c046e904 c0239604 db68449c 00000000
- GPR24: e9083204 00000000 00000001 db684460 e9083404 00000000 db6dce00 db6dcc00
- NIP [c0227bf0] phy_start+0x74/0xc0
- LR [c0227bf0] phy_start+0x74/0xc0
- Call Trace:
- [df5477d8] [c0227bf0] phy_start+0x74/0xc0 (unreliable)
- [df5477e8] [c023cad0] startup_gfar+0x398/0x3f4
- [df547828] [c023cf08] gfar_enet_open+0x364/0x374
- [df547898] [c029d870] __dev_open+0xe4/0x140
- [df5478c8] [c029db70] __dev_change_flags+0xf0/0x188
- [df5478f8] [c029dc28] dev_change_flags+0x20/0x54
- [df547918] [c02ae304] do_setlink+0x310/0x818
- [df547a08] [c02b1eb8] __rtnl_newlink+0x384/0x6b0
- [df547c28] [c02b222c] rtnl_newlink+0x48/0x68
- [df547c48] [c02ad7c8] rtnetlink_rcv_msg+0x240/0x27c
- [df547c98] [c02cc068] netlink_rcv_skb+0x8c/0xf0
- [df547cd8] [c02cba3c] netlink_unicast+0x114/0x19c
- [df547d08] [c02cbd74] netlink_sendmsg+0x2b0/0x2c0
- [df547d58] [c027b668] sock_sendmsg_nosec+0x20/0x40
- [df547d68] [c027d080] ___sys_sendmsg+0x17c/0x1dc
- [df547e98] [c027df7c] __sys_sendmsg+0x68/0x84
- [df547ef8] [c027e430] sys_socketcall+0x1a0/0x204
- [df547f38] [c000d1d8] ret_from_syscall+0x0/0x38
- --- interrupt: c01 at 0xfd4e030
- LR = 0xfd4e010
- Instruction dump:
- 813f0188 38800000 2b890005 419d0014 3d40c046 5529103a 394aa208 7c8a482e
- 3c60c046 3863a1b8 4cc63182 4be009a1 <0fe00000> 48000030 3c60c046 3863a1d0
- ---[ end trace d4c095aeaf6ea998 ]---
-
-and
-
- % ip link set down dev eth0
- ------------[ cut here ]------------
- called from state HALTED
- WARNING: CPU: 1 PID: 184 at drivers/net/phy/phy.c:858 phy_stop+0x3c/0x88
-
- <...>
-
- Call Trace:
- [df581788] [c0228450] phy_stop+0x3c/0x88 (unreliable)
- [df581798] [c022d548] sfp_sm_phy_detach+0x1c/0x44
- [df5817a8] [c022e8cc] sfp_sm_event+0x4b0/0x87c
- [df581848] [c022f04c] sfp_upstream_stop+0x34/0x44
- [df581858] [c0225608] phylink_stop+0x7c/0xe4
- [df581868] [c023c57c] stop_gfar+0x7c/0x94
- [df581888] [c023c5b8] gfar_close+0x24/0x94
- [df5818a8] [c0298688] __dev_close_many+0xdc/0xf8
- [df5818c8] [c029db58] __dev_change_flags+0xd8/0x188
- [df5818f8] [c029dc28] dev_change_flags+0x20/0x54
- [df581918] [c02ae304] do_setlink+0x310/0x818
- [df581a08] [c02b1eb8] __rtnl_newlink+0x384/0x6b0
- [df581c28] [c02b222c] rtnl_newlink+0x48/0x68
- [df581c48] [c02ad7c8] rtnetlink_rcv_msg+0x240/0x27c
- [df581c98] [c02cc068] netlink_rcv_skb+0x8c/0xf0
- [df581cd8] [c02cba3c] netlink_unicast+0x114/0x19c
- [df581d08] [c02cbd74] netlink_sendmsg+0x2b0/0x2c0
- [df581d58] [c027b668] sock_sendmsg_nosec+0x20/0x40
- [df581d68] [c027d080] ___sys_sendmsg+0x17c/0x1dc
- [df581e98] [c027df7c] __sys_sendmsg+0x68/0x84
- [df581ef8] [c027e430] sys_socketcall+0x1a0/0x204
- [df581f38] [c000d1d8] ret_from_syscall+0x0/0x38
-
- <...>
-
- ---[ end trace d4c095aeaf6ea999 ]---
-
-SFP modules with the 1000Base-X interface are not affected.
-
-Place explicit calls to phy_start() and phy_stop() before enabling or after
-disabling an attached SFP module, where phydev is not yet set (or is
-already unset), so they will be made only from the inside of sfp-bus, if
-needed.
-
-Fixes: 217962615662 ("net: phy: warn if phy_start is called from invalid state")
-Signed-off-by: Arseny Solokha <asolokha@kb.kras.ru>
-Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/phy/phylink.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/net/phy/phylink.c
-+++ b/drivers/net/phy/phylink.c
-@@ -973,10 +973,10 @@ void phylink_start(struct phylink *pl)
- }
- if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state)
- mod_timer(&pl->link_poll, jiffies + HZ);
-- if (pl->sfp_bus)
-- sfp_upstream_start(pl->sfp_bus);
- if (pl->phydev)
- phy_start(pl->phydev);
-+ if (pl->sfp_bus)
-+ sfp_upstream_start(pl->sfp_bus);
- }
- EXPORT_SYMBOL_GPL(phylink_start);
-
-@@ -993,10 +993,10 @@ void phylink_stop(struct phylink *pl)
- {
- ASSERT_RTNL();
-
-- if (pl->phydev)
-- phy_stop(pl->phydev);
- if (pl->sfp_bus)
- sfp_upstream_stop(pl->sfp_bus);
-+ if (pl->phydev)
-+ phy_stop(pl->phydev);
- del_timer_sync(&pl->link_poll);
- if (pl->link_irq) {
- free_irq(pl->link_irq, pl);