| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <2c13d157-c8da-4cf4-b8a1-668ab34b803f@gmail.com>
Date: Sun, 7 Jan 2024 20:41:36 +0100
From: Eric Woudstra <ericwouds@...il.com>
To: "Russell King (Oracle)" <linux@...linux.org.uk>
Cc: Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Daniel Golle <daniel@...rotopia.org>,
Frank Wunderlich <frank-w@...lic-files.de>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH RFC net-next] net: phylink: add quirk for disabling
in-band-status for mediatek pcs at 2500base-x
On 1/2/24 13:36, Russell King (Oracle) wrote:
> As 6.6 was declared LTS, I think we can now move phylink_pcs_neg_mode()
> into phylink.c, and thus think about what we should do with:
In the other rfc patch Russell King (Oracle) wrote:
> Since Autoneg is clear, phylink_mii_c22_pcs_decode_state() won't
> change state->speed and state->duplex, which should already be
> correctly set.
So the rfc patch now I have changed it to the following. Sure still
not ready for the real patch, but a few steps closer. The rtl8221b
can now be used as optical sfp (even without disabling autoneg in the
sfp-quirk). Also it can be used with marek's rtl8221b rollball patch,
that changes interface between 2500base-x and sgmii. This is tested
on the BananaPi R3. The speed and duplex get are set from phylink. I'm
not sure what to do with pl->link_config.pause. For now I set it to
MLO_PAUSE_NONE.
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 298dfd6982a5..3f03af290fa3 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1074,6 +1055,108 @@ static void phylink_pcs_an_restart(struct phylink *pl)
pl->pcs->ops->pcs_an_restart(pl->pcs);
}
+/* This function needs to be changed, not using compatible */
+static bool phylink_basex_no_inband(struct phylink *pl)
+{
+ struct device_node *node = pl->config->dev->of_node;
+
+ if (!node)
+ return false;
+
+ if (!of_device_is_compatible(node, "mediatek,eth-mac"))
+ return false;
+
+ return true;
+}
+
+static void phylink_pcs_neg_mode(struct phylink *pl,
+ phy_interface_t interface,
+ const unsigned long *advertising){
+ if ((!!pl->phydev) && phylink_basex_no_inband(pl)) {
+ switch (interface) {
+ case PHY_INTERFACE_MODE_1000BASEX:
+ case PHY_INTERFACE_MODE_2500BASEX:
+ if (pl->cur_link_an_mode == MLO_AN_INBAND)
+ pl->cur_link_an_mode = MLO_AN_PHY;
+ break;
+ default:
+ /* restore mode if it was changed before */
+ if ((pl->cur_link_an_mode == MLO_AN_PHY) &&
+ (pl->cfg_link_an_mode == MLO_AN_INBAND))
+ pl->cur_link_an_mode = pl->cfg_link_an_mode;
+ }
+ }
+
+ switch (interface) {
+ case PHY_INTERFACE_MODE_SGMII:
+ case PHY_INTERFACE_MODE_QSGMII:
+ case PHY_INTERFACE_MODE_QUSGMII:
+ case PHY_INTERFACE_MODE_USXGMII:
+ /* These protocols are designed for use with a PHY which
+ * communicates its negotiation result back to the MAC via
+ * inband communication. Note: there exist PHYs that run
+ * with SGMII but do not send the inband data.
+ */
+ if (!phylink_autoneg_inband(pl->cur_link_an_mode))
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_OUTBAND;
+ else
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_INBAND_ENABLED;
+ break;
+
+ case PHY_INTERFACE_MODE_1000BASEX:
+ case PHY_INTERFACE_MODE_2500BASEX:
+ /* 1000base-X is designed for use media-side for Fibre
+ * connections, and thus the Autoneg bit needs to be
+ * taken into account. We also do this for 2500base-X
+ * as well, but drivers may not support this, so may
+ * need to override this.
+ */
+ if (!phylink_autoneg_inband(pl->cur_link_an_mode))
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_OUTBAND;
+ else if (linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+ advertising) &&
+ !phylink_basex_no_inband(pl))
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_INBAND_ENABLED;
+ else {
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_INBAND_DISABLED;
+ linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+ pl->link_config.advertising);
+ pl->link_config.speed = (interface ==
+ PHY_INTERFACE_MODE_1000BASEX) ?
+ SPEED_1000 : SPEED_2500;
+ pl->link_config.duplex = DUPLEX_FULL;
+ pl->link_config.pause = MLO_PAUSE_NONE; /* ????? */
+
+ }
+ break;
+
+ default:
+ pl->pcs_neg_mode = PHYLINK_PCS_NEG_NONE;
+ break;
+ }
+
+ return;
+}
+
static void phylink_major_config(struct phylink *pl, bool restart,
const struct phylink_link_state *state)
{
@@ -1085,9 +1187,7 @@ static void phylink_major_config(struct phylink *pl, bool restart,
phylink_dbg(pl, "major config %s\n", phy_modes(state->interface));
- pl->pcs_neg_mode = phylink_pcs_neg_mode(pl->cur_link_an_mode,
- state->interface,
- state->advertising);
+ phylink_pcs_neg_mode(pl, state->interface, state->advertising);
if (pl->using_mac_select_pcs) {
pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);
@@ -1191,9 +1291,9 @@ static int phylink_change_inband_advert(struct phylink *pl)
pl->link_config.pause);
/* Recompute the PCS neg mode */
- pl->pcs_neg_mode = phylink_pcs_neg_mode(pl->cur_link_an_mode,
- pl->link_config.interface,
- pl->link_config.advertising);
+ phylink_pcs_neg_mode(pl, pl->link_config.interface,
+ pl->link_config.advertising);
+
neg_mode = pl->cur_link_an_mode;
if (pl->pcs->neg_mode)
@@ -1222,7 +1322,8 @@ static void phylink_mac_pcs_get_state(struct phylink *pl,
state->interface = pl->link_config.interface;
state->rate_matching = pl->link_config.rate_matching;
if (linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
- state->advertising)) {
+ state->advertising) &&
+ (pl->pcs_neg_mode != PHYLINK_PCS_NEG_INBAND_DISABLED)) {
state->speed = SPEED_UNKNOWN;
state->duplex = DUPLEX_UNKNOWN;
state->pause = MLO_PAUSE_NONE;
Powered by blists - more mailing lists