mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +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>
185 lines
4.8 KiB
Diff
185 lines
4.8 KiB
Diff
From fdff863a4ce3677907f64396e34c45025abb6600 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 5 Nov 2019 12:59:36 +0000
|
|
Subject: [PATCH 631/660] net: sfp: split power mode switching from probe
|
|
|
|
Switch the power mode switching from the probe, so that we don't
|
|
repeatedly re-probe the SFP device if there is a problem accessing
|
|
the registers at I2C address 0x51.
|
|
|
|
In splitting this out, we can also fix a bug where we leave the module
|
|
in high-power mode when the upstream device is detached but the module
|
|
is still inserted.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/sfp.c | 101 ++++++++++++++++++++++++++----------------
|
|
1 file changed, 64 insertions(+), 37 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp.c
|
|
+++ b/drivers/net/phy/sfp.c
|
|
@@ -49,6 +49,7 @@ enum {
|
|
SFP_MOD_EMPTY = 0,
|
|
SFP_MOD_PROBE,
|
|
SFP_MOD_HPOWER,
|
|
+ SFP_MOD_WAITPWR,
|
|
SFP_MOD_PRESENT,
|
|
SFP_MOD_ERROR,
|
|
|
|
@@ -71,6 +72,7 @@ static const char * const mod_state_str
|
|
[SFP_MOD_EMPTY] = "empty",
|
|
[SFP_MOD_PROBE] = "probe",
|
|
[SFP_MOD_HPOWER] = "hpower",
|
|
+ [SFP_MOD_WAITPWR] = "waitpwr",
|
|
[SFP_MOD_PRESENT] = "present",
|
|
[SFP_MOD_ERROR] = "error",
|
|
};
|
|
@@ -1423,37 +1425,34 @@ static int sfp_module_parse_power(struct
|
|
return 0;
|
|
}
|
|
|
|
-static int sfp_sm_mod_hpower(struct sfp *sfp)
|
|
+static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable)
|
|
{
|
|
u8 val;
|
|
int err;
|
|
|
|
- if (sfp->module_power_mW <= 1000)
|
|
- return 0;
|
|
-
|
|
err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
|
|
if (err != sizeof(val)) {
|
|
dev_err(sfp->dev, "Failed to read EEPROM: %d\n", err);
|
|
- err = -EAGAIN;
|
|
- goto err;
|
|
+ return -EAGAIN;
|
|
}
|
|
|
|
- val |= BIT(0);
|
|
+ if (enable)
|
|
+ val |= BIT(0);
|
|
+ else
|
|
+ val &= ~BIT(0);
|
|
|
|
err = sfp_write(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
|
|
if (err != sizeof(val)) {
|
|
dev_err(sfp->dev, "Failed to write EEPROM: %d\n", err);
|
|
- err = -EAGAIN;
|
|
- goto err;
|
|
+ return -EAGAIN;
|
|
}
|
|
|
|
- dev_info(sfp->dev, "Module switched to %u.%uW power level\n",
|
|
- sfp->module_power_mW / 1000,
|
|
- (sfp->module_power_mW / 100) % 10);
|
|
- return T_HPOWER_LEVEL;
|
|
+ if (enable)
|
|
+ dev_info(sfp->dev, "Module switched to %u.%uW power level\n",
|
|
+ sfp->module_power_mW / 1000,
|
|
+ (sfp->module_power_mW / 100) % 10);
|
|
|
|
-err:
|
|
- return err;
|
|
+ return 0;
|
|
}
|
|
|
|
static int sfp_sm_mod_probe(struct sfp *sfp)
|
|
@@ -1549,7 +1548,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- return sfp_sm_mod_hpower(sfp);
|
|
+ return 0;
|
|
}
|
|
|
|
static void sfp_sm_mod_remove(struct sfp *sfp)
|
|
@@ -1594,13 +1593,22 @@ static void sfp_sm_device(struct sfp *sf
|
|
*/
|
|
static void sfp_sm_module(struct sfp *sfp, unsigned int event)
|
|
{
|
|
- /* Handle remove event globally, it resets this state machine.
|
|
- * Also deal with upstream detachment.
|
|
- */
|
|
- if (event == SFP_E_REMOVE || sfp->sm_dev_state < SFP_DEV_DOWN) {
|
|
+ int err;
|
|
+
|
|
+ /* Handle remove event globally, it resets this state machine */
|
|
+ if (event == SFP_E_REMOVE) {
|
|
if (sfp->sm_mod_state > SFP_MOD_PROBE)
|
|
sfp_sm_mod_remove(sfp);
|
|
- if (sfp->sm_mod_state != SFP_MOD_EMPTY)
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* Handle device detach globally */
|
|
+ if (sfp->sm_dev_state < SFP_DEV_DOWN) {
|
|
+ if (sfp->module_power_mW > 1000 &&
|
|
+ sfp->sm_mod_state > SFP_MOD_HPOWER)
|
|
+ sfp_sm_mod_hpower(sfp, false);
|
|
+ if (sfp->sm_mod_state > SFP_MOD_EMPTY)
|
|
sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
|
|
return;
|
|
}
|
|
@@ -1612,26 +1620,45 @@ static void sfp_sm_module(struct sfp *sf
|
|
break;
|
|
|
|
case SFP_MOD_PROBE:
|
|
- if (event == SFP_E_TIMEOUT) {
|
|
- int val = sfp_sm_mod_probe(sfp);
|
|
+ if (event != SFP_E_TIMEOUT)
|
|
+ break;
|
|
|
|
- if (val == 0)
|
|
- sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);
|
|
- else if (val > 0)
|
|
- sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, val);
|
|
- else if (val != -EAGAIN)
|
|
- sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);
|
|
- else
|
|
- sfp_sm_set_timer(sfp, T_PROBE_RETRY);
|
|
+ err = sfp_sm_mod_probe(sfp);
|
|
+ if (err == -EAGAIN) {
|
|
+ sfp_sm_set_timer(sfp, T_PROBE_RETRY);
|
|
+ break;
|
|
}
|
|
- break;
|
|
+ if (err < 0) {
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ /* If this is a power level 1 module, we are done */
|
|
+ if (sfp->module_power_mW <= 1000)
|
|
+ goto insert;
|
|
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, 0);
|
|
+ /* fall through */
|
|
case SFP_MOD_HPOWER:
|
|
- if (event == SFP_E_TIMEOUT) {
|
|
- sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);
|
|
+ /* Enable high power mode */
|
|
+ err = sfp_sm_mod_hpower(sfp, true);
|
|
+ if (err == 0)
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_WAITPWR, T_HPOWER_LEVEL);
|
|
+ else if (err != -EAGAIN)
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);
|
|
+ else
|
|
+ sfp_sm_set_timer(sfp, T_PROBE_RETRY);
|
|
+ break;
|
|
+
|
|
+ case SFP_MOD_WAITPWR:
|
|
+ /* Wait for T_HPOWER_LEVEL to time out */
|
|
+ if (event != SFP_E_TIMEOUT)
|
|
break;
|
|
- }
|
|
- /* fallthrough */
|
|
+
|
|
+ insert:
|
|
+ sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);
|
|
+ break;
|
|
+
|
|
case SFP_MOD_PRESENT:
|
|
case SFP_MOD_ERROR:
|
|
break;
|