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>
202 lines
6.5 KiB
Diff
202 lines
6.5 KiB
Diff
From 52c956003a9d5bcae1f445f9dfd42b624adb6e87 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 11 Dec 2019 10:56:45 +0000
|
|
Subject: [PATCH] net: phylink: delay MAC configuration for copper SFP modules
|
|
|
|
Knowing whether we need to delay the MAC configuration because a module
|
|
may have a PHY is useful to phylink to allow NBASE-T modules to work on
|
|
systems supporting no more than 2.5G speeds.
|
|
|
|
This commit allows us to delay such configuration until after the PHY
|
|
has been probed by recording the parsed capabilities, and if the module
|
|
may have a PHY, doing no more until the module_start() notification is
|
|
called. At that point, we either have a PHY, or we don't.
|
|
|
|
We move the PHY-based setup a little later, and use the PHYs support
|
|
capabilities rather than the EEPROM parsed capabilities to determine
|
|
whether we can support the PHY.
|
|
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/phylink.c | 53 +++++++++++++++++++++++++++++++--------
|
|
drivers/net/phy/sfp-bus.c | 28 +++++++++++++++++++++
|
|
include/linux/sfp.h | 7 ++++++
|
|
3 files changed, 78 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -72,6 +72,9 @@ struct phylink {
|
|
bool mac_link_dropped;
|
|
|
|
struct sfp_bus *sfp_bus;
|
|
+ bool sfp_may_have_phy;
|
|
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support);
|
|
+ u8 sfp_port;
|
|
};
|
|
|
|
#define phylink_printk(level, pl, fmt, ...) \
|
|
@@ -1688,7 +1691,7 @@ static void phylink_sfp_detach(void *ups
|
|
pl->netdev->sfp_bus = NULL;
|
|
}
|
|
|
|
-static int phylink_sfp_config(struct phylink *pl, u8 mode, u8 port,
|
|
+static int phylink_sfp_config(struct phylink *pl, u8 mode,
|
|
const unsigned long *supported,
|
|
const unsigned long *advertising)
|
|
{
|
|
@@ -1762,7 +1765,7 @@ static int phylink_sfp_config(struct phy
|
|
phy_modes(config.interface));
|
|
}
|
|
|
|
- pl->link_port = port;
|
|
+ pl->link_port = pl->sfp_port;
|
|
|
|
if (changed && !test_bit(PHYLINK_DISABLE_STOPPED,
|
|
&pl->phylink_disable_state))
|
|
@@ -1775,15 +1778,20 @@ static int phylink_sfp_module_insert(voi
|
|
const struct sfp_eeprom_id *id)
|
|
{
|
|
struct phylink *pl = upstream;
|
|
- __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };
|
|
- u8 port;
|
|
+ unsigned long *support = pl->sfp_support;
|
|
|
|
ASSERT_RTNL();
|
|
|
|
+ linkmode_zero(support);
|
|
sfp_parse_support(pl->sfp_bus, id, support);
|
|
- port = sfp_parse_port(pl->sfp_bus, id, support);
|
|
+ pl->sfp_port = sfp_parse_port(pl->sfp_bus, id, support);
|
|
|
|
- return phylink_sfp_config(pl, MLO_AN_INBAND, port, support, support);
|
|
+ /* If this module may have a PHY connecting later, defer until later */
|
|
+ pl->sfp_may_have_phy = sfp_may_have_phy(pl->sfp_bus, id);
|
|
+ if (pl->sfp_may_have_phy)
|
|
+ return 0;
|
|
+
|
|
+ return phylink_sfp_config(pl, MLO_AN_INBAND, support, support);
|
|
}
|
|
|
|
static int phylink_sfp_module_start(void *upstream)
|
|
@@ -1791,10 +1799,19 @@ static int phylink_sfp_module_start(void
|
|
struct phylink *pl = upstream;
|
|
|
|
/* If this SFP module has a PHY, start the PHY now. */
|
|
- if (pl->phydev)
|
|
+ if (pl->phydev) {
|
|
phy_start(pl->phydev);
|
|
-
|
|
- return 0;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ /* If the module may have a PHY but we didn't detect one we
|
|
+ * need to configure the MAC here.
|
|
+ */
|
|
+ if (!pl->sfp_may_have_phy)
|
|
+ return 0;
|
|
+
|
|
+ return phylink_sfp_config(pl, MLO_AN_INBAND,
|
|
+ pl->sfp_support, pl->sfp_support);
|
|
}
|
|
|
|
static void phylink_sfp_module_stop(void *upstream)
|
|
@@ -1828,10 +1845,26 @@ static void phylink_sfp_link_up(void *up
|
|
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
|
|
{
|
|
struct phylink *pl = upstream;
|
|
- phy_interface_t interface = pl->link_config.interface;
|
|
+ phy_interface_t interface;
|
|
int ret;
|
|
|
|
- ret = phylink_attach_phy(pl, phy, pl->link_config.interface);
|
|
+ /*
|
|
+ * This is the new way of dealing with flow control for PHYs,
|
|
+ * as described by Timur Tabi in commit 529ed1275263 ("net: phy:
|
|
+ * phy drivers should not set SUPPORTED_[Asym_]Pause") except
|
|
+ * using our validate call to the MAC, we rely upon the MAC
|
|
+ * clearing the bits from both supported and advertising fields.
|
|
+ */
|
|
+ phy_support_asym_pause(phy);
|
|
+
|
|
+ /* Do the initial configuration */
|
|
+ ret = phylink_sfp_config(pl, MLO_AN_INBAND, phy->supported,
|
|
+ phy->advertising);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ interface = pl->link_config.interface;
|
|
+ ret = phylink_attach_phy(pl, phy, interface);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
--- a/drivers/net/phy/sfp-bus.c
|
|
+++ b/drivers/net/phy/sfp-bus.c
|
|
@@ -103,6 +103,7 @@ static const struct sfp_quirk *sfp_looku
|
|
|
|
return NULL;
|
|
}
|
|
+
|
|
/**
|
|
* sfp_parse_port() - Parse the EEPROM base ID, setting the port type
|
|
* @bus: a pointer to the &struct sfp_bus structure for the sfp module
|
|
@@ -179,6 +180,33 @@ int sfp_parse_port(struct sfp_bus *bus,
|
|
EXPORT_SYMBOL_GPL(sfp_parse_port);
|
|
|
|
/**
|
|
+ * sfp_may_have_phy() - indicate whether the module may have a PHY
|
|
+ * @bus: a pointer to the &struct sfp_bus structure for the sfp module
|
|
+ * @id: a pointer to the module's &struct sfp_eeprom_id
|
|
+ *
|
|
+ * Parse the EEPROM identification given in @id, and return whether
|
|
+ * this module may have a PHY.
|
|
+ */
|
|
+bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id)
|
|
+{
|
|
+ if (id->base.e1000_base_t)
|
|
+ return true;
|
|
+
|
|
+ if (id->base.phys_id != SFF8024_ID_DWDM_SFP) {
|
|
+ switch (id->base.extended_cc) {
|
|
+ case SFF8024_ECC_10GBASE_T_SFI:
|
|
+ case SFF8024_ECC_10GBASE_T_SR:
|
|
+ case SFF8024_ECC_5GBASE_T:
|
|
+ case SFF8024_ECC_2_5GBASE_T:
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(sfp_may_have_phy);
|
|
+
|
|
+/**
|
|
* sfp_parse_support() - Parse the eeprom id for supported link modes
|
|
* @bus: a pointer to the &struct sfp_bus structure for the sfp module
|
|
* @id: a pointer to the module's &struct sfp_eeprom_id
|
|
--- a/include/linux/sfp.h
|
|
+++ b/include/linux/sfp.h
|
|
@@ -533,6 +533,7 @@ struct sfp_upstream_ops {
|
|
#if IS_ENABLED(CONFIG_SFP)
|
|
int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
|
|
unsigned long *support);
|
|
+bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id);
|
|
void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
|
|
unsigned long *support);
|
|
phy_interface_t sfp_select_interface(struct sfp_bus *bus,
|
|
@@ -556,6 +557,12 @@ static inline int sfp_parse_port(struct
|
|
return PORT_OTHER;
|
|
}
|
|
|
|
+static inline bool sfp_may_have_phy(struct sfp_bus *bus,
|
|
+ const struct sfp_eeprom_id *id)
|
|
+{
|
|
+ return false;
|
|
+}
|
|
+
|
|
static inline void sfp_parse_support(struct sfp_bus *bus,
|
|
const struct sfp_eeprom_id *id,
|
|
unsigned long *support)
|