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 a dedicated advertising in phylink struct and
update it when the new phylink_calculate_capabilities() is called.
phylink_calculate_capabilities() will then compare the advertising saved in
phylink instance with the one in link_config (that can be modified by the
user to disable modes), compose the modes that are user-disabled, 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.
linkmode_xor() is added in addition to other logic operation to parse the
user-disabled advertised modes.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
drivers/net/phy/phylink.c | 28 +++++++++++++++++++++++++---
include/linux/linkmode.h | 6 ++++++
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index a7ec4feb950a..957241652525 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -61,6 +61,7 @@ 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);
/* The link configuration settings */
struct phylink_link_state link_config;@@ -717,6 +718,27 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,
return ret;
}
+static void phylink_calculate_capabilities(struct phylink *pl)
+{
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(disabled_advertising);
+
+ /* Get user-disabled advertising modes */
+ linkmode_xor(disabled_advertising, pl->advertising,
+ pl->link_config.advertising);
+
+ /* Calculate the full supported advertisement */
+ linkmode_fill(pl->supported);
+ linkmode_copy(pl->link_config.advertising, pl->supported);
+ phylink_validate(pl, pl->supported, &pl->link_config);
+
+ /* Save the newly calculated full advertisement */
+ linkmode_copy(pl->advertising, pl->link_config.advertising);
+
+ /* Keep user-disabled modes out of the active advertisement. */
+ linkmode_andnot(pl->link_config.advertising,
+ pl->link_config.advertising, disabled_advertising);
+}
+
static void phylink_fill_fixedlink_supported(unsigned long *supported)
{
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);@@ -2252,6 +2274,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 +2299,7 @@ struct phylink *phylink_create(struct phylink_config *config,
pl->supported_interfaces,
pcs->supported_interfaces);
- linkmode_fill(pl->supported);
- linkmode_copy(pl->link_config.advertising, pl->supported);
- phylink_validate(pl, pl->supported, &pl->link_config);
+ phylink_calculate_capabilities(pl);
ret = phylink_parse_mode(pl, fwnode);
if (ret < 0)
diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h
index 3b9de09871f6..a8290d021994 100644
--- a/include/linux/linkmode.h
+++ b/include/linux/linkmode.h
@@ -32,6 +32,12 @@ static inline void linkmode_or(unsigned long *dst, const unsigned long *a,
bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
}
+static inline void linkmode_xor(unsigned long *dst, const unsigned long *a,
+ const unsigned long *b)
+{
+ bitmap_xor(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS);
+}
+
static inline bool linkmode_empty(const unsigned long *src)
{
return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);--
2.55.0