split phylink PCS operations
Subsystems (4)
Russell King - ARM Linux admin
maintainerv3 cover split phylink PCS operations
This series splits the phylink_mac_ops structure so that PCS can be supported separately with their own PCS operations, separating them from the MAC layer. This may need adaption later as more users come along.
v2: change pcs_config() and associated called function prototypes to only pass the information that is required, and add some documention.
v3: change phylink_create() prototype
drivers/net/phy/phylink.c | 115 ++++++++++++++++++++++++++++++---------------- include/linux/phylink.h | 93 ++++++++++++++++++++++++++++++++++++- 2 files changed, 166 insertions(+), 42 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
PATCH v3 1/3 net: phylink: change phylink_mii_c22_pcs_set_advertisement() prototype
Change phylink_mii_c22_pcs_set_advertisement() to take only the PHY interface and advertisement mask, rather than the full phylink state.
--- drivers/net/phy/phylink.c | 12 +++++++----- include/linux/phylink.h | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/phy/phylink.c +7 -5
@@ -2184,7 +2184,8 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS * advertisement * @pcs: a pointer to a &struct mdio_device. -* @state: a pointer to the state being configured. +* @interface: the PHY interface mode being configured +* @advertising: the ethtool advertisement mask * * Helper for MAC PCS supporting the 802.3 clause 22 register set for * clause 37 negotiation and/or SGMII control.
@@ -2197,22 +2198,23 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);* zero if no change has been made, or one if the advertisement has changed. */ int phylink_mii_c22_pcs_set_advertisement (struct mdio_device *pcs, -const struct phylink_link_state *state) +phy_interface_t interface, +const unsigned long *advertising) {struct mii_bus *bus = pcs->bus;int addr = pcs->addr;int val, ret;u16 adv; -switch (state->interface) { +switch (interface) {case PHY_INTERFACE_MODE_1000BASEX :case PHY_INTERFACE_MODE_2500BASEX : adv =ADVERTISE_1000XFULL ;if (linkmode_test_bit (ETHTOOL_LINK_MODE_Pause_BIT, - state->advertising)) + advertising)) adv |=ADVERTISE_1000XPAUSE ;if (linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, - state->advertising)) + advertising)) adv |=ADVERTISE_1000XPSE_ASYM ; val =mdiobus_read (bus, addr,MII_ADVERTISE );
include/linux/phylink.h +2 -1
@@ -320,7 +320,8 @@ void phylink_helper_basex_speed(struct phylink_link_state *state);void phylink_mii_c22_pcs_get_state (struct mdio_device *pcs,struct phylink_link_state *state);int phylink_mii_c22_pcs_set_advertisement (struct mdio_device *pcs, -const struct phylink_link_state *state); +phy_interface_t interface, +const unsigned long *advertising);void phylink_mii_c22_pcs_an_restart (struct mdio_device *pcs); void phylink_mii_c45_pcs_get_state(struct mdio_device *pcs,
Signature · 1 line
2.20.1
PATCH v3 2/3 net: phylink: rename 'ops' to 'mac_ops'
In reply to Russell King - ARM Linux adminRename the bland 'ops' member of struct phylink to be a more descriptive 'mac_ops' - this is necessary as we're about to introduce another set of operations.
--- drivers/net/phy/phylink.c | 30 +++++++++++++++--------------- include/linux/phylink.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/phy/phylink.c +15 -15
@@ -40,7 +40,7 @@ enum {struct phylink {/* private: */ struct net_device *netdev; -const struct phylink_mac_ops *ops; +const struct phylink_mac_ops *mac_ops;struct phylink_config *config;struct device *dev;unsigned int old_link_state:1 ;
@@ -154,7 +154,7 @@ static const char *phylink_an_mode_str(unsigned int mode)static int phylink_validate (struct phylink *pl,unsigned long *supported,struct phylink_link_state *state) { - pl->ops->validate (pl->config, supported, state); + pl->mac_ops->validate (pl->config, supported, state);return phylink_is_empty_linkmode (supported) ? -EINVAL :0 ; }
@@ -415,7 +415,7 @@ static void phylink_mac_config(struct phylink *pl, __ETHTOOL_LINK_MODE_MASK_NBITS, state->advertising, state->pause, state->link, state->an_enabled); - pl->ops->mac_config (pl->config, pl->cur_link_an_mode, state); + pl->mac_ops->mac_config (pl->config, pl->cur_link_an_mode, state); } static void phylink_mac_config_up(struct phylink *pl,
@@ -429,7 +429,7 @@ static void phylink_mac_an_restart(struct phylink *pl) {if (pl->link_config.an_enabled &&phy_interface_mode_is_8023z (pl->link_config.interface)) - pl->ops->mac_an_restart (pl->config); + pl->mac_ops->mac_an_restart (pl->config); } static void phylink_mac_pcs_get_state(struct phylink *pl,
@@ -445,7 +445,7 @@ static void phylink_mac_pcs_get_state(struct phylink *pl, state->an_complete =0 ; state->link =1 ; - pl->ops->mac_pcs_get_state (pl->config, state); + pl->mac_ops->mac_pcs_get_state (pl->config, state); }/* The fixed state is... fixed except for the link state,
@@ -512,11 +512,11 @@ static void phylink_mac_link_up(struct phylink *pl,struct net_device *ndev = pl->netdev; pl->cur_interface = link_state.interface; - pl->ops->mac_link_up (pl->config, pl->phydev, - pl->cur_link_an_mode, pl->cur_interface, - link_state.speed, link_state.duplex, - !!(link_state.pause &MLO_PAUSE_TX ), - !!(link_state.pause &MLO_PAUSE_RX )); + pl->mac_ops->mac_link_up (pl->config, pl->phydev, + pl->cur_link_an_mode, pl->cur_interface, + link_state.speed, link_state.duplex, + !!(link_state.pause &MLO_PAUSE_TX ), + !!(link_state.pause &MLO_PAUSE_RX ));if (ndev)netif_carrier_on (ndev);
@@ -534,8 +534,8 @@ static void phylink_mac_link_down(struct phylink *pl)if (ndev)netif_carrier_off (ndev); - pl->ops->mac_link_down (pl->config, pl->cur_link_an_mode, - pl->cur_interface); + pl->mac_ops->mac_link_down (pl->config, pl->cur_link_an_mode, + pl->cur_interface);phylink_info (pl,"Link is Down\n" ); }
@@ -666,7 +666,7 @@ static int phylink_register_sfp(struct phylink *pl,* @fwnode: a pointer to a &struct fwnode_handle describing the network * interface * @iface: the desired link mode defined by &typedef phy_interface_t -* @ops: a pointer to a &struct phylink_mac_ops for the MAC. +* @mac_ops: a pointer to a &struct phylink_mac_ops for the MAC. * * Create a new phylink instance, and parse the link parameters found in @np. * This will parse in-band modes, fixed-link or SFP configuration.
@@ -679,7 +679,7 @@ static int phylink_register_sfp(struct phylink *pl,struct phylink *phylink_create (struct phylink_config *config,struct fwnode_handle *fwnode,phy_interface_t iface, -const struct phylink_mac_ops *ops) +const struct phylink_mac_ops *mac_ops) {struct phylink *pl;int ret;
@@ -712,7 +712,7 @@ struct phylink *phylink_create(struct phylink_config *config, pl->link_config.speed =SPEED_UNKNOWN ; pl->link_config.duplex =DUPLEX_UNKNOWN ; pl->link_config.an_enabled = true; - pl->ops = ops; + pl->mac_ops = mac_ops;__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);timer_setup (&pl->link_poll, phylink_fixed_poll,0 );
include/linux/phylink.h +1 -1
@@ -272,7 +272,7 @@ void mac_link_up(struct phylink_config *config, struct phy_device *phy,struct phylink *phylink_create (struct phylink_config *,struct fwnode_handle *,phy_interface_t iface, -const struct phylink_mac_ops *ops); +const struct phylink_mac_ops *mac_ops);void phylink_destroy (struct phylink *);int phylink_connect_phy (struct phylink *,struct phy_device *);
Signature · 1 line
2.20.1
PATCH v3 3/3 net: phylink: add separate pcs operations structure
In reply to Russell King - ARM Linux adminAdd a separate set of PCS operations, which MAC drivers can use to couple phylink with their associated MAC PCS layer. The PCS operations include:
- pcs_get_state() - reads the link up/down, resolved speed, duplex and pause from the PCS.
- pcs_config() - configures the PCS for the specified mode, PHY interface type, and setting the advertisement.
- pcs_an_restart() - restarts 802.3 in-band negotiation with the link partner
- pcs_link_up() - informs the PCS that link has come up, and the parameters of the link. Link parameters are used to program the PCS for fixed speed and non-inband modes.
--- drivers/net/phy/phylink.c | 77 ++++++++++++++++++++++++---------- include/linux/phylink.h | 88 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 22 deletions(-)
drivers/net/phy/phylink.c +55 -22
@@ -41,6 +41,7 @@ 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 device *dev; unsigned int old_link_state:1;
@@ -425,11 +426,32 @@ static void phylink_mac_config_up(struct phylink *pl,phylink_mac_config (pl, state); } -static void phylink_mac_an_restart (struct phylink *pl) +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)) - pl->mac_ops->mac_an_restart (pl->config); +phy_interface_mode_is_8023z (pl->link_config.interface)) { +if (pl->pcs_ops) + pl->pcs_ops->pcs_an_restart (pl->config); +else + pl->mac_ops->mac_an_restart (pl->config); + } +} + +static void phylink_pcs_config (struct phylink *pl,bool force_restart, +const struct phylink_link_state *state) +{ +bool restart = force_restart; + +if (pl->pcs_ops && pl->pcs_ops->pcs_config (pl->config, + pl->cur_link_an_mode, + state->interface, + state->advertising)) + restart = true; + +phylink_mac_config (pl, state); + +if (restart) +phylink_mac_pcs_an_restart (pl); } static void phylink_mac_pcs_get_state(struct phylink *pl,
@@ -445,7 +467,10 @@ static void phylink_mac_pcs_get_state(struct phylink *pl, state->an_complete =0 ; state->link =1 ; - pl->mac_ops->mac_pcs_get_state (pl->config, state); +if (pl->pcs_ops) + pl->pcs_ops->pcs_get_state (pl->config, state); +else + pl->mac_ops->mac_pcs_get_state (pl->config, state); }/* The fixed state is... fixed except for the link state,
@@ -463,7 +488,7 @@ static void phylink_get_fixed_state(struct phylink *pl,phylink_resolve_flow (state); } -static void phylink_mac_initial_config (struct phylink *pl) +static void phylink_mac_initial_config (struct phylink *pl,bool force_restart) {struct phylink_link_state link_state;
@@ -489,7 +514,7 @@ static void phylink_mac_initial_config(struct phylink *pl) link_state.link = false;phylink_apply_manual_flow (pl, &link_state); -phylink_mac_config (pl, &link_state); +phylink_pcs_config (pl, force_restart, &link_state); }static const char *phylink_pause_to_str (int pause)
@@ -506,12 +531,18 @@ static const char *phylink_pause_to_str(int pause) } } -static void phylink_mac_link_up (struct phylink *pl, -struct phylink_link_state link_state) +static void phylink_link_up (struct phylink *pl, +struct phylink_link_state link_state) {struct net_device *ndev = pl->netdev; pl->cur_interface = link_state.interface; + +if (pl->pcs_ops && pl->pcs_ops->pcs_link_up) + pl->pcs_ops->pcs_link_up (pl->config, pl->cur_link_an_mode, + pl->cur_interface, + link_state.speed, link_state.duplex); + pl->mac_ops->mac_link_up(pl->config, pl->phydev, pl->cur_link_an_mode, pl->cur_interface, link_state.speed, link_state.duplex,
@@ -528,7 +559,7 @@ static void phylink_mac_link_up(struct phylink *pl, phylink_pause_to_str(link_state.pause)); } -static void phylink_mac_link_down (struct phylink *pl) +static void phylink_link_down (struct phylink *pl) {struct net_device *ndev = pl->netdev;
@@ -597,9 +628,9 @@ static void phylink_resolve(struct work_struct *w)if (link_changed) { pl->old_link_state = link_state.link;if (!link_state.link) -phylink_mac_link_down (pl); +phylink_link_down (pl);else -phylink_mac_link_up (pl, link_state); +phylink_link_up (pl, link_state); }if (!link_state.link && pl->mac_link_dropped) { pl->mac_link_dropped = false;
@@ -746,6 +777,12 @@ struct phylink *phylink_create(struct phylink_config *config, }EXPORT_SYMBOL_GPL (phylink_create); +void phylink_add_pcs (struct phylink *pl,const struct phylink_pcs_ops *ops) +{ + pl->pcs_ops = ops; +} +EXPORT_SYMBOL_GPL (phylink_add_pcs); +/** * phylink_destroy() - cleanup and destroy the phylink instance * @pl: a pointer to a &struct phylink returned from phylink_create()
@@ -1082,14 +1119,12 @@ void phylink_start(struct phylink *pl)/* Apply the link configuration to the MAC when starting. This allows * a fixed-link to start with the correct parameters, and also * ensures that we set the appropriate advertisement for Serdes links. -*/ -phylink_mac_initial_config (pl); - -/* Restart autonegotiation if using 802.3z to ensure that the link +* +* Restart autonegotiation if using 802.3z to ensure that the link * parameters are properly negotiated. This is necessary for DSA * switches using 802.3z negotiation to ensure they see our modes. */ -phylink_mac_an_restart (pl); +phylink_mac_initial_config (pl, true);clear_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);phylink_run_resolve (pl);
@@ -1386,8 +1421,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,* advertisement; the only thing we have is the pause * modes which can only come from a PHY. */ -phylink_mac_config (pl, &pl->link_config); -phylink_mac_an_restart (pl); +phylink_pcs_config (pl, true, &pl->link_config); }mutex_unlock (&pl->state_mutex); }
@@ -1415,7 +1449,7 @@ int phylink_ethtool_nway_reset(struct phylink *pl)if (pl->phydev) ret =phy_restart_aneg (pl->phydev); -phylink_mac_an_restart (pl); +phylink_mac_pcs_an_restart (pl);return ret; }
@@ -1494,8 +1528,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, pause->tx_pause); }else if (!test_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state)) { -phylink_mac_config (pl, &pl->link_config); -phylink_mac_an_restart (pl); +phylink_pcs_config (pl, true, &pl->link_config); }mutex_unlock (&pl->state_mutex);
@@ -1901,7 +1934,7 @@ static int phylink_sfp_config(struct phylink *pl, u8 mode,if (changed && !test_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state)) -phylink_mac_initial_config (pl); +phylink_mac_initial_config (pl, false);return ret; }
include/linux/phylink.h +88 -0
97 lines not on this page · raw message
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Russell King - ARM Linux admin <[email protected]>
Date: Mon, 30 Mar 2020 18:43:30 +0100
Quoted 9 lines
This series splits the
phylink_mac_opsstructure so that PCS can be supported separately with their own PCS operations, separating them from the MAC layer. This may need adaption later as more users come along.v2: change
pcs_config()and associated called function prototypes to only pass the information that is required, and add some documention.v3: change
phylink_create()prototype
Series applied, thanks.