From: Christian Marangi <ansuelsmth@gmail.com>
To: Maxime Chevallier <maxime.chevallier@bootlin.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Simon Horman <horms@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>,
Christian Marangi <ansuelsmth@gmail.com>,
Lorenzo Bianconi <lorenzo@kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Philipp Zabel <p.zabel@pengutronix.de>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, llvm@lists.linux.dev
Subject: [PATCH net-next v21 07/15] net: phylink: add capabilities helper and track modified advertising
Date: Mon, 16 Nov 2026 17:33:50 +0100 [thread overview]
Message-ID: <20261116163412.551438-8-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20261116163412.551438-1-ansuelsmth@gmail.com>
In preparation for PCS release/late attach, it's needed to introduce an
helper to calculate the capabilities after a PCS is removed/added and it's
needed to track the advertising in link_config changed by the user compared
to the originally one calculated in phylink_create().
To archieve this, introduce dedicated advertising variables in phylink
struct and update it when the new phylink_update_capabilities() is called
or advertise is updated in link_config.
In phylink struct the new advertising will contain the full advertising
bits right after a phylink_validate and the new user_disabled_advertising
will be the mask of modes that were disabled from an ethtool ksettings
(with the parsing done in phylink_update_user_disabled_advertising()).
This double reference is needed to account case when a PCS gets removed and
attached again to preserve user-defined advertising rules.
phylink_update_capabilities() will calculate the new supported modes and
the new capabilities, update the full advertising in phylink and restore
the user-disabled modes.
phylink_create() is also updated to init the phylink advertising and
link_config advertising.
phylink_update_mac_pause_capabilities() is updated to use the new
phylink_update_capabilities() to account for user-disabled advertising
modes and update the full advertising in phylink.
phylink_sfp_set_config() and phylink_choose_sfp_interface() are updated to
account for the user-disabled modes, first in the
phylink_sfp_interface_preference loop and then on updating the link_config
advertising.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
drivers/net/phy/phylink.c | 93 ++++++++++++++++++++++++++++++++++-----
1 file changed, 81 insertions(+), 12 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 2af665790564..6dcd0d1f960a 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -61,6 +61,8 @@ struct phylink {
u8 link_port; /* The current non-phy ethtool port */
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported);
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_lpi);
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(user_disabled_advertising);
/* The link configuration settings */
struct phylink_link_state link_config;
@@ -717,6 +719,41 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,
return ret;
}
+static void phylink_update_capabilities(struct phylink *pl,
+ struct phylink_link_state *config)
+{
+ lockdep_assert_held(&pl->state_mutex);
+
+ /* Calculate the full supported advertisement */
+ linkmode_copy(config->advertising, pl->supported);
+ __phylink_validate(pl, pl->supported, config);
+
+ /* Save the newly calculated full advertisement */
+ linkmode_copy(pl->advertising, config->advertising);
+
+ /* Keep user-disabled modes out of the active advertisement. */
+ linkmode_andnot(config->advertising,
+ pl->advertising, pl->user_disabled_advertising);
+}
+
+static void phylink_update_user_disabled_advertising(struct phylink *pl,
+ const unsigned long *advertising)
+{
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(disabled);
+
+ /* Preserve restrictions for modes absent from the current full mask. */
+ linkmode_andnot(disabled, pl->user_disabled_advertising,
+ pl->advertising);
+
+ /* Update restrictions for modes in the current full advertisement. */
+ linkmode_andnot(pl->user_disabled_advertising, pl->advertising,
+ advertising);
+
+ /* Combine the updated restrictions with those preserved above. */
+ linkmode_or(pl->user_disabled_advertising,
+ pl->user_disabled_advertising, disabled);
+}
+
static void phylink_fill_fixedlink_supported(unsigned long *supported)
{
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);
@@ -815,6 +852,7 @@ static int phylink_parse_fixedlink(struct phylink *pl,
linkmode_copy(pl->link_config.advertising, pl->supported);
phylink_validate(pl, pl->supported, &pl->link_config);
+ linkmode_copy(pl->advertising, pl->link_config.advertising);
c = phy_caps_lookup(pl->link_config.speed, pl->link_config.duplex,
pl->supported, true);
@@ -840,6 +878,7 @@ static int phylink_parse_fixedlink(struct phylink *pl,
linkmode_and(pl->link_config.advertising, pl->link_config.advertising,
pl->supported);
+ linkmode_copy(pl->advertising, pl->link_config.advertising);
pl->link_config.link = 1;
pl->link_config.an_complete = 1;
@@ -922,6 +961,8 @@ static int phylink_parse_mode(struct phylink *pl,
"failed to validate link configuration for in-band status\n");
return -EINVAL;
}
+
+ linkmode_copy(pl->advertising, pl->link_config.advertising);
}
return 0;
@@ -2152,7 +2193,7 @@ void phylink_update_mac_pause_capabilities(struct phylink *pl, unsigned long mac
else if (pl->sfp_bus)
linkmode_and(pl->supported, pl->supported, pl->sfp_support);
- __phylink_validate(pl, pl->supported, config);
+ phylink_update_capabilities(pl, config);
pause_state = config->pause;
@@ -2252,6 +2293,8 @@ struct phylink *phylink_create(struct phylink_config *config,
pl->link_config.pause = MLO_PAUSE_AN;
pl->link_config.speed = SPEED_UNKNOWN;
pl->link_config.duplex = DUPLEX_UNKNOWN;
+ linkmode_fill(pl->advertising);
+ linkmode_fill(pl->link_config.advertising);
pl->pcs_state = PCS_STATE_DOWN;
pl->mac_ops = mac_ops;
__set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
@@ -2275,9 +2318,10 @@ struct phylink *phylink_create(struct phylink_config *config,
pl->supported_interfaces,
pcs->supported_interfaces);
+ mutex_lock(&pl->state_mutex);
linkmode_fill(pl->supported);
- linkmode_copy(pl->link_config.advertising, pl->supported);
- phylink_validate(pl, pl->supported, &pl->link_config);
+ phylink_update_capabilities(pl, &pl->link_config);
+ mutex_unlock(&pl->state_mutex);
ret = phylink_parse_mode(pl, fwnode);
if (ret < 0)
@@ -2534,6 +2578,7 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
pl->phy_state.rate_matching = RATE_MATCH_NONE;
linkmode_copy(pl->supported, supported);
linkmode_copy(pl->link_config.advertising, config.advertising);
+ linkmode_copy(pl->advertising, pl->link_config.advertising);
/* Restrict the phy advertisement according to the MAC support. */
linkmode_copy(phy->advertising, config.advertising);
@@ -3396,6 +3441,7 @@ static bool phylink_validate_pcs_inband_autoneg(struct phylink *pl,
int phylink_ethtool_ksettings_set(struct phylink *pl,
const struct ethtool_link_ksettings *kset)
{
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(requested_advertising);
__ETHTOOL_DECLARE_LINK_MODE_MASK(support);
const struct link_capabilities *c;
struct phylink_link_state config;
@@ -3485,6 +3531,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
*/
linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising,
kset->base.autoneg == AUTONEG_ENABLE);
+ linkmode_copy(requested_advertising, config.advertising);
/* If this link is with an SFP, ensure that changes to advertised modes
* also cause the associated interface to be selected such that the
@@ -3532,6 +3579,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
return -EINVAL;
mutex_lock(&pl->state_mutex);
+ phylink_update_user_disabled_advertising(pl, requested_advertising);
pl->link_config.speed = config.speed;
pl->link_config.duplex = config.duplex;
@@ -4015,19 +4063,34 @@ static void phylink_sfp_detach(void *upstream, struct sfp_bus *bus)
}
static phy_interface_t phylink_choose_sfp_interface(struct phylink *pl,
- const unsigned long *intf)
+ const unsigned long *intf,
+ const unsigned long *supported,
+ const struct phylink_link_state *state)
{
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(tmp_supported);
+ struct phylink_link_state tmp_state;
phy_interface_t interface;
size_t i;
- interface = PHY_INTERFACE_MODE_NA;
- for (i = 0; i < ARRAY_SIZE(phylink_sfp_interface_preference); i++)
- if (test_bit(phylink_sfp_interface_preference[i], intf)) {
- interface = phylink_sfp_interface_preference[i];
- break;
- }
+ for (i = 0; i < ARRAY_SIZE(phylink_sfp_interface_preference); i++) {
+ interface = phylink_sfp_interface_preference[i];
+ if (!test_bit(interface, intf))
+ continue;
- return interface;
+ tmp_state = *state;
+ tmp_state.interface = interface;
+ linkmode_copy(tmp_supported, supported);
+ if (phylink_validate(pl, tmp_supported, &tmp_state))
+ continue;
+
+ /* Skip this preferred interface if user-disabled in advertising */
+ linkmode_andnot(tmp_state.advertising, tmp_state.advertising,
+ pl->user_disabled_advertising);
+ if (!phylink_is_empty_linkmode(tmp_state.advertising))
+ return interface;
+ }
+
+ return PHY_INTERFACE_MODE_NA;
}
static void phylink_sfp_set_config(struct phylink *pl, unsigned long *supported,
@@ -4045,6 +4108,11 @@ static void phylink_sfp_set_config(struct phylink *pl, unsigned long *supported,
changed = true;
}
+ linkmode_copy(pl->advertising, state->advertising);
+ if (!pl->phydev)
+ linkmode_andnot(state->advertising, pl->advertising,
+ pl->user_disabled_advertising);
+
if (!linkmode_equal(pl->link_config.advertising, state->advertising)) {
linkmode_copy(pl->link_config.advertising, state->advertising);
changed = true;
@@ -4160,7 +4228,8 @@ static int phylink_sfp_config_optical(struct phylink *pl)
return ret;
}
- interface = phylink_choose_sfp_interface(pl, pl->sfp_interfaces);
+ interface = phylink_choose_sfp_interface(pl, pl->sfp_interfaces,
+ pl->sfp_support, &config);
if (interface == PHY_INTERFACE_MODE_NA) {
phylink_err(pl, "failed to select SFP interface\n");
return -EINVAL;
--
2.55.0
next prev parent reply other threads:[~2026-11-16 16:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 16:33 [PATCH net-next v21 00/15] net: pcs: Introduce support for fwnode PCS Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 01/15] net: phylink: make PCS phylink instance access RCU protected Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 02/15] net: phylink: keep and use MAC supported_interfaces in phylink struct Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 03/15] net: phylink: introduce internal phylink PCS handling Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 04/15] net: pcs: implement Firmware node support for PCS driver Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 05/15] net: phylink: save phylink instance fwnode on phylink_create Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 06/15] net: phylink: make phylink_validate state locked Christian Marangi
2026-11-16 16:33 ` Christian Marangi [this message]
2026-11-16 16:37 ` [PATCH net-next v21 07/15] net: phylink: add capabilities helper and track modified advertising Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 07/15] net: phylink: add capabilities helpers " Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 08/15] net: phylink: support PCS provider release Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 09/15] net: phylink: support late PCS provider attach Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 10/15] net: Document PCS subsystem Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 11/15] MAINTAINERS: add myself as PCS subsystem maintainer Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 12/15] net: phylink: add .pcs_link_down PCS OP Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 13/15] dt-bindings: net: pcs: Document support for Airoha Ethernet PCS Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 14/15] net: pcs: airoha: add PCS driver for Airoha AN7581 SoC Christian Marangi
2026-11-16 16:33 ` [PATCH net-next v21 15/15] net: airoha: add phylink support Christian Marangi
2026-11-16 16:38 ` [PATCH net-next v21 00/15] net: pcs: Introduce support for fwnode PCS netdev-bot+sinfo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116163412.551438-8-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=conor+dt@kernel.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=horms@kernel.org \
--cc=justinstitt@google.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=llvm@lists.linux.dev \
--cc=lorenzo@kernel.org \
--cc=maxime.chevallier@bootlin.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh@kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox