Commit 957b96e3 authored Jun 28, 2022 by Jakub Kicinski

Merge branch 'net-phylink-cleanup-pcs-code'

Russell King says:

====================
net: phylink: cleanup pcs code

These two patches were part of the larger series for the mv88e6xxx
phylink pcs conversion. As this is delayed, I've decided to send these
two patches now.
====================

Link: https://lore.kernel.org/r/YrmYEC2N9mVpg9g6@shell.armlinux.org.uk


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents af9784d0 bfac8c49

drivers/net/phy/phylink.c

+39 −30

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ struct phylink {
		/* private: */
		struct net_device *netdev;
		const struct phylink_mac_ops *mac_ops;
		const struct phylink_pcs_ops *pcs_ops;
		struct phylink_config *config;
		struct phylink_pcs *pcs;
		struct device *dev;
		@@ -759,6 +758,18 @@ static void phylink_resolve_flow(struct phylink_link_state *state)
		}
		}

		static void phylink_pcs_poll_stop(struct phylink *pl)
		{
		if (pl->cfg_link_an_mode == MLO_AN_INBAND)
		del_timer(&pl->link_poll);
		}

		static void phylink_pcs_poll_start(struct phylink *pl)
		{
		if (pl->pcs->poll && pl->cfg_link_an_mode == MLO_AN_INBAND)
		mod_timer(&pl->link_poll, jiffies + HZ);
		}

		static void phylink_mac_config(struct phylink *pl,
		const struct phylink_link_state *state)
		{
		@@ -779,8 +790,8 @@ static void phylink_mac_pcs_an_restart(struct phylink *pl)
		if (pl->link_config.an_enabled &&
		phy_interface_mode_is_8023z(pl->link_config.interface) &&
		phylink_autoneg_inband(pl->cur_link_an_mode)) {
		if (pl->pcs_ops)
		pl->pcs_ops->pcs_an_restart(pl->pcs);
		if (pl->pcs)
		pl->pcs->ops->pcs_an_restart(pl->pcs);
		else if (pl->config->legacy_pre_march2020)
		pl->mac_ops->mac_an_restart(pl->config);
		}
		@@ -790,6 +801,7 @@ static void phylink_major_config(struct phylink *pl, bool restart,
		const struct phylink_link_state *state)
		{
		struct phylink_pcs *pcs = NULL;
		bool pcs_changed = false;
		int err;

		phylink_dbg(pl, "major config %s\n", phy_modes(state->interface));
		@@ -802,8 +814,12 @@ static void phylink_major_config(struct phylink *pl, bool restart,
		pcs);
		return;
		}

		pcs_changed = pcs && pl->pcs != pcs;
		}

		phylink_pcs_poll_stop(pl);

		if (pl->mac_ops->mac_prepare) {
		err = pl->mac_ops->mac_prepare(pl->config, pl->cur_link_an_mode,
		state->interface);
		@@ -817,23 +833,13 @@ static void phylink_major_config(struct phylink *pl, bool restart,
		/* If we have a new PCS, switch to the new PCS after preparing the MAC
		* for the change.
		*/
		if (pcs) {
		if (pcs_changed)
		pl->pcs = pcs;
		pl->pcs_ops = pcs->ops;

		if (!pl->phylink_disable_state &&
		pl->cfg_link_an_mode == MLO_AN_INBAND) {
		if (pcs->poll)
		mod_timer(&pl->link_poll, jiffies + HZ);
		else
		del_timer(&pl->link_poll);
		}
		}

		phylink_mac_config(pl, state);

		if (pl->pcs_ops) {
		err = pl->pcs_ops->pcs_config(pl->pcs, pl->cur_link_an_mode,
		if (pl->pcs) {
		err = pl->pcs->ops->pcs_config(pl->pcs, pl->cur_link_an_mode,
		state->interface,
		state->advertising,
		!!(pl->link_config.pause &
		@@ -854,6 +860,8 @@ static void phylink_major_config(struct phylink *pl, bool restart,
		phylink_err(pl, "mac_finish failed: %pe\n",
		ERR_PTR(err));
		}

		phylink_pcs_poll_start(pl);
		}

		/*
		@@ -869,7 +877,7 @@ static int phylink_change_inband_advert(struct phylink *pl)
		if (test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state))
		return 0;

		if (!pl->pcs_ops && pl->config->legacy_pre_march2020) {
		if (!pl->pcs && pl->config->legacy_pre_march2020) {
		/* Legacy method */
		phylink_mac_config(pl, &pl->link_config);
		phylink_mac_pcs_an_restart(pl);
		@@ -886,10 +894,11 @@ static int phylink_change_inband_advert(struct phylink *pl)
		* restart negotiation if the pcs_config() helper indicates that
		* the programmed advertisement has changed.
		*/
		ret = pl->pcs_ops->pcs_config(pl->pcs, pl->cur_link_an_mode,
		ret = pl->pcs->ops->pcs_config(pl->pcs, pl->cur_link_an_mode,
		pl->link_config.interface,
		pl->link_config.advertising,
		!!(pl->link_config.pause & MLO_PAUSE_AN));
		!!(pl->link_config.pause &
		MLO_PAUSE_AN));
		if (ret < 0)
		return ret;

		@@ -918,8 +927,8 @@ static void phylink_mac_pcs_get_state(struct phylink *pl,
		state->an_complete = 0;
		state->link = 1;

		if (pl->pcs_ops)
		pl->pcs_ops->pcs_get_state(pl->pcs, state);
		if (pl->pcs)
		pl->pcs->ops->pcs_get_state(pl->pcs, state);
		else if (pl->mac_ops->mac_pcs_get_state &&
		pl->config->legacy_pre_march2020)
		pl->mac_ops->mac_pcs_get_state(pl->config, state);
		@@ -992,8 +1001,8 @@ static void phylink_link_up(struct phylink *pl,

		pl->cur_interface = link_state.interface;

		if (pl->pcs_ops && pl->pcs_ops->pcs_link_up)
		pl->pcs_ops->pcs_link_up(pl->pcs, pl->cur_link_an_mode,
		if (pl->pcs && pl->pcs->ops->pcs_link_up)
		pl->pcs->ops->pcs_link_up(pl->pcs, pl->cur_link_an_mode,
		pl->cur_interface,
		link_state.speed, link_state.duplex);

		@@ -1115,7 +1124,7 @@ static void phylink_resolve(struct work_struct *w)
		}
		phylink_major_config(pl, false, &link_state);
		pl->link_config.interface = link_state.interface;
		} else if (!pl->pcs_ops && pl->config->legacy_pre_march2020) {
		} else if (!pl->pcs && pl->config->legacy_pre_march2020) {
		/* The interface remains unchanged, only the speed,
		* duplex or pause settings have changed. Call the
		* old mac_config() method to configure the MAC/PCS