forked from Openwrt/openwrt
f04e377a50
QCA808x does not currently fill in the possible_interfaces. This leads to Phylink not being aware that it supports 2500Base-X as well so in cases where it is connected to a DSA switch like MV88E6393 it will limit that port to phy-mode set in the DTS. That means that if SGMII is used you are limited to 1G only while if 2500Base-X was set you are limited to 2.5G only. Populating the possible_interfaces fixes this, so lets backport the patches from kernel 6.9. This also includes a backport of the Phylink PHY validation series from kernel 6.8 that allows the use of possible_interfaces. Link: https://github.com/openwrt/openwrt/pull/15765 Signed-off-by: Robert Marko <robimarko@gmail.com>
96 lines
4.1 KiB
Diff
96 lines
4.1 KiB
Diff
From ee0e0ddb910e7e989b65a19d72b6435baa641fc7 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 24 Nov 2023 12:28:34 +0000
|
|
Subject: [PATCH 6/7] net: phylink: split out PHY validation from
|
|
phylink_bringup_phy()
|
|
|
|
When bringing up a PHY, we need to work out which ethtool link modes it
|
|
should support and advertise. Clause 22 PHYs operate in a single
|
|
interface mode, which can be easily dealt with. However, clause 45 PHYs
|
|
tend to switch interface mode depending on the media. We need more
|
|
flexible validation at this point, so this patch splits out that code
|
|
in preparation to changing it.
|
|
|
|
Tested-by: Luo Jie <quic_luoj@quicinc.com>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://lore.kernel.org/r/E1r6VIQ-00DDM9-LK@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/phylink.c | 56 ++++++++++++++++++++++-----------------
|
|
1 file changed, 31 insertions(+), 25 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -1738,6 +1738,35 @@ static void phylink_phy_change(struct ph
|
|
phylink_pause_to_str(pl->phy_state.pause));
|
|
}
|
|
|
|
+static int phylink_validate_phy(struct phylink *pl, struct phy_device *phy,
|
|
+ unsigned long *supported,
|
|
+ struct phylink_link_state *state)
|
|
+{
|
|
+ /* Check whether we would use rate matching for the proposed interface
|
|
+ * mode.
|
|
+ */
|
|
+ state->rate_matching = phy_get_rate_matching(phy, state->interface);
|
|
+
|
|
+ /* Clause 45 PHYs may switch their Serdes lane between, e.g. 10GBASE-R,
|
|
+ * 5GBASE-R, 2500BASE-X and SGMII if they are not using rate matching.
|
|
+ * For some interface modes (e.g. RXAUI, XAUI and USXGMII) switching
|
|
+ * their Serdes is either unnecessary or not reasonable.
|
|
+ *
|
|
+ * For these which switch interface modes, we really need to know which
|
|
+ * interface modes the PHY supports to properly work out which ethtool
|
|
+ * linkmodes can be supported. For now, as a work-around, we validate
|
|
+ * against all interface modes, which may lead to more ethtool link
|
|
+ * modes being advertised than are actually supported.
|
|
+ */
|
|
+ if (phy->is_c45 && state->rate_matching == RATE_MATCH_NONE &&
|
|
+ state->interface != PHY_INTERFACE_MODE_RXAUI &&
|
|
+ state->interface != PHY_INTERFACE_MODE_XAUI &&
|
|
+ state->interface != PHY_INTERFACE_MODE_USXGMII)
|
|
+ state->interface = PHY_INTERFACE_MODE_NA;
|
|
+
|
|
+ return phylink_validate(pl, supported, state);
|
|
+}
|
|
+
|
|
static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
|
|
phy_interface_t interface)
|
|
{
|
|
@@ -1758,32 +1787,9 @@ static int phylink_bringup_phy(struct ph
|
|
memset(&config, 0, sizeof(config));
|
|
linkmode_copy(supported, phy->supported);
|
|
linkmode_copy(config.advertising, phy->advertising);
|
|
+ config.interface = interface;
|
|
|
|
- /* Check whether we would use rate matching for the proposed interface
|
|
- * mode.
|
|
- */
|
|
- config.rate_matching = phy_get_rate_matching(phy, interface);
|
|
-
|
|
- /* Clause 45 PHYs may switch their Serdes lane between, e.g. 10GBASE-R,
|
|
- * 5GBASE-R, 2500BASE-X and SGMII if they are not using rate matching.
|
|
- * For some interface modes (e.g. RXAUI, XAUI and USXGMII) switching
|
|
- * their Serdes is either unnecessary or not reasonable.
|
|
- *
|
|
- * For these which switch interface modes, we really need to know which
|
|
- * interface modes the PHY supports to properly work out which ethtool
|
|
- * linkmodes can be supported. For now, as a work-around, we validate
|
|
- * against all interface modes, which may lead to more ethtool link
|
|
- * modes being advertised than are actually supported.
|
|
- */
|
|
- if (phy->is_c45 && config.rate_matching == RATE_MATCH_NONE &&
|
|
- interface != PHY_INTERFACE_MODE_RXAUI &&
|
|
- interface != PHY_INTERFACE_MODE_XAUI &&
|
|
- interface != PHY_INTERFACE_MODE_USXGMII)
|
|
- config.interface = PHY_INTERFACE_MODE_NA;
|
|
- else
|
|
- config.interface = interface;
|
|
-
|
|
- ret = phylink_validate(pl, supported, &config);
|
|
+ ret = phylink_validate_phy(pl, phy, supported, &config);
|
|
if (ret) {
|
|
phylink_warn(pl, "validation of %s with support %*pb and advertisement %*pb failed: %pe\n",
|
|
phy_modes(config.interface),
|