mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
4e0c54bc5b
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>
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From 38b62a12231be4b86fc5ca5477579d29831c02a5 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 18 Oct 2019 10:31:07 +0100
|
|
Subject: [PATCH 629/660] net: sfp: ensure TX_FAULT has deasserted before
|
|
probing the PHY
|
|
|
|
TX_FAULT should be deasserted to indicate that the module has completed
|
|
its initialisation. This may include the on-board PHY, so wait until
|
|
the module has deasserted TX_FAULT before probing the PHY.
|
|
|
|
This means that we need an extra state to handle a TX_FAULT that
|
|
remains set for longer than t_init, since using the existing handling
|
|
state would bypass the PHY probe.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/sfp.c | 31 +++++++++++++++++++++++++------
|
|
1 file changed, 25 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp.c
|
|
+++ b/drivers/net/phy/sfp.c
|
|
@@ -56,6 +56,7 @@ enum {
|
|
SFP_S_DOWN = 0,
|
|
SFP_S_WAIT,
|
|
SFP_S_INIT,
|
|
+ SFP_S_INIT_TX_FAULT,
|
|
SFP_S_WAIT_LOS,
|
|
SFP_S_LINK_UP,
|
|
SFP_S_TX_FAULT,
|
|
@@ -113,6 +114,7 @@ static const char * const sm_state_strin
|
|
[SFP_S_DOWN] = "down",
|
|
[SFP_S_WAIT] = "wait",
|
|
[SFP_S_INIT] = "init",
|
|
+ [SFP_S_INIT_TX_FAULT] = "init_tx_fault",
|
|
[SFP_S_WAIT_LOS] = "wait_los",
|
|
[SFP_S_LINK_UP] = "link_up",
|
|
[SFP_S_TX_FAULT] = "tx_fault",
|
|
@@ -1660,8 +1662,6 @@ static void sfp_sm_main(struct sfp *sfp,
|
|
if (event != SFP_E_TIMEOUT)
|
|
break;
|
|
|
|
- sfp_sm_probe_for_phy(sfp);
|
|
-
|
|
if (sfp->state & SFP_F_TX_FAULT) {
|
|
/* Wait t_init before indicating that the link is up,
|
|
* provided the current state indicates no TX_FAULT. If
|
|
@@ -1683,10 +1683,29 @@ static void sfp_sm_main(struct sfp *sfp,
|
|
break;
|
|
|
|
case SFP_S_INIT:
|
|
- if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT)
|
|
- sfp_sm_fault(sfp, SFP_S_TX_FAULT, true);
|
|
- else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR)
|
|
- init_done: sfp_sm_link_check_los(sfp);
|
|
+ if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) {
|
|
+ /* TX_FAULT is still asserted after t_init, so assume
|
|
+ * there is a fault.
|
|
+ */
|
|
+ sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
|
|
+ sfp->sm_retries == 5);
|
|
+ } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
|
|
+ init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT
|
|
+ * clear. Probe for the PHY and check the LOS state.
|
|
+ */
|
|
+ sfp_sm_probe_for_phy(sfp);
|
|
+ sfp_sm_link_check_los(sfp);
|
|
+
|
|
+ /* Reset the fault retry count */
|
|
+ sfp->sm_retries = 5;
|
|
+ }
|
|
+ break;
|
|
+
|
|
+ case SFP_S_INIT_TX_FAULT:
|
|
+ if (event == SFP_E_TIMEOUT) {
|
|
+ sfp_module_tx_fault_reset(sfp);
|
|
+ sfp_sm_next(sfp, SFP_S_INIT, T_INIT_JIFFIES);
|
|
+ }
|
|
break;
|
|
|
|
case SFP_S_WAIT_LOS:
|