| Message ID | 20220304075812.1723-1-s-vadapalli@ti.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [RESEND] net: ethernet: ti: am65-cpsw: Convert to PHYLINK | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply, async |
Hi, On Fri, Mar 04, 2022 at 01:28:12PM +0530, Siddharth Vadapalli wrote: > Convert am65-cpsw driver and am65-cpsw ethtool to use Phylink APIs > as described at Documentation/networking/sfp-phylink.rst. All calls > to Phy APIs are replaced with their equivalent Phylink APIs. Okay, that's what you're doing, but please mention what the reason for the change is. > @@ -1494,6 +1409,87 @@ static const struct net_device_ops am65_cpsw_nuss_netdev_ops = { > .ndo_get_devlink_port = am65_cpsw_ndo_get_devlink_port, > }; > > +static void am65_cpsw_nuss_validate(struct phylink_config *config, unsigned long *supported, > + struct phylink_link_state *state) > +{ > + phylink_generic_validate(config, supported, state); > +} If you don't need anything special, please just initialise the member directly: .validate = phylink_generic_validate, > + > +static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned int mode, > + const struct phylink_link_state *state) > +{ > + /* Currently not used */ > +} > + > +static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned int mode, > + phy_interface_t interface) > +{ > + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, > + phylink_config); > + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); > + struct am65_cpsw_common *common = port->common; > + struct net_device *ndev = port->ndev; > + int tmo; > + > + /* disable forwarding */ > + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_DISABLE); > + > + cpsw_sl_ctl_set(port->slave.mac_sl, CPSW_SL_CTL_CMD_IDLE); > + > + tmo = cpsw_sl_wait_for_idle(port->slave.mac_sl, 100); > + dev_dbg(common->dev, "down msc_sl %08x tmo %d\n", > + cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_MACSTATUS), tmo); > + > + cpsw_sl_ctl_reset(port->slave.mac_sl); > + > + am65_cpsw_qos_link_down(ndev); > + netif_tx_disable(ndev); You didn't call netif_tx_disable() in your adjust_link afaics, so why is it added here? > +} > + > +static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy_device *phy, > + unsigned int mode, phy_interface_t interface, int speed, > + int duplex, bool tx_pause, bool rx_pause) > +{ > + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, > + phylink_config); > + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); > + struct am65_cpsw_common *common = port->common; > + struct net_device *ndev = port->ndev; > + u32 mac_control = CPSW_SL_CTL_GMII_EN; > + > + if (speed == SPEED_1000) > + mac_control |= CPSW_SL_CTL_GIG; > + if (speed == SPEED_10 && interface == PHY_INTERFACE_MODE_RGMII) > + /* Can be used with in band mode only */ > + mac_control |= CPSW_SL_CTL_EXT_EN; > + if (speed == SPEED_100 && interface == PHY_INTERFACE_MODE_RMII) > + mac_control |= CPSW_SL_CTL_IFCTL_A; > + if (duplex) > + mac_control |= CPSW_SL_CTL_FULLDUPLEX; > + > + /* rx_pause/tx_pause */ > + if (rx_pause) > + mac_control |= CPSW_SL_CTL_RX_FLOW_EN; > + > + if (tx_pause) > + mac_control |= CPSW_SL_CTL_TX_FLOW_EN; > + > + cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); > + > + /* enable forwarding */ > + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); > + > + am65_cpsw_qos_link_up(ndev, speed); > + netif_tx_wake_all_queues(ndev); > +} > + > +static const struct phylink_mac_ops am65_cpsw_phylink_mac_ops = { > + .validate = am65_cpsw_nuss_validate, > + .mac_config = am65_cpsw_nuss_mac_config, > + .mac_link_down = am65_cpsw_nuss_mac_link_down, > + .mac_link_up = am65_cpsw_nuss_mac_link_up, > +}; > + > static void am65_cpsw_nuss_slave_disable_unused(struct am65_cpsw_port *port) > { > struct am65_cpsw_common *common = port->common; > @@ -1887,24 +1883,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) > of_property_read_bool(port_np, "ti,mac-only"); > > /* get phy/link info */ > - if (of_phy_is_fixed_link(port_np)) { > - ret = of_phy_register_fixed_link(port_np); > - if (ret) > - return dev_err_probe(dev, ret, > - "failed to register fixed-link phy %pOF\n", > - port_np); > - port->slave.phy_node = of_node_get(port_np); > - } else { > - port->slave.phy_node = > - of_parse_phandle(port_np, "phy-handle", 0); > - } > - > - if (!port->slave.phy_node) { > - dev_err(dev, > - "slave[%d] no phy found\n", port_id); > - return -ENODEV; > - } > - > + port->slave.phy_node = port_np; > ret = of_get_phy_mode(port_np, &port->slave.phy_if); > if (ret) { > dev_err(dev, "%pOF read phy-mode err %d\n", > @@ -1947,6 +1926,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) > struct am65_cpsw_ndev_priv *ndev_priv; > struct device *dev = common->dev; > struct am65_cpsw_port *port; > + struct phylink *phylink; > int ret; > > port = &common->ports[port_idx]; > @@ -1984,6 +1964,26 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) > port->ndev->netdev_ops = &am65_cpsw_nuss_netdev_ops; > port->ndev->ethtool_ops = &am65_cpsw_ethtool_ops_slave; > > + /* Configuring Phylink */ > + port->slave.phylink_config.dev = &port->ndev->dev; > + port->slave.phylink_config.type = PHYLINK_NETDEV; > + port->slave.phylink_config.pcs_poll = true; Does this compile? This member was removed, so you probably get a compile error today. > + port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | > + MAC_100 | MAC_1000FD | MAC_2500FD; > + > + phy_interface_set_rgmii(port->slave.phylink_config.supported_interfaces); > + __set_bit(PHY_INTERFACE_MODE_SGMII, port->slave.phylink_config.supported_interfaces); > + __set_bit(PHY_INTERFACE_MODE_1000BASEX, port->slave.phylink_config.supported_interfaces); If you support SGMII and 1000BASE-X with inband signalling, I strongly recommend that you implement phylink_pcs support as well, so you are able to provide phylink with the inband results. > + > + phylink = phylink_create(&port->slave.phylink_config, dev->fwnode, port->slave.phy_if, > + &am65_cpsw_phylink_mac_ops); > + if (IS_ERR(phylink)) { > + phylink_destroy(port->slave.phylink); This is wrong and will cause a NULL pointer dereference - please remove the call to phylink_destroy() here. However, I could not find another call to phylink_destroy() in your patch which means you will leak memory when the driver is unbound. Thanks.
Hi Russell, On 04/03/22 14:55, Russell King (Oracle) wrote: > Hi, > > On Fri, Mar 04, 2022 at 01:28:12PM +0530, Siddharth Vadapalli wrote: >> Convert am65-cpsw driver and am65-cpsw ethtool to use Phylink APIs >> as described at Documentation/networking/sfp-phylink.rst. All calls >> to Phy APIs are replaced with their equivalent Phylink APIs. Thank you for reviewing the patch. > > Okay, that's what you're doing, but please mention what the reason for > the change is. This patch does not intend to make any functional change. The aim is just to update the existing driver to use the Phylink framework. Though the same functionality can be achieved by using the Phylib framework, we would like to add Phylink support before adding support for SGMII/QSGMII modes in am65-cpsw driver. The patches for SGMII/QSGMII support in am65-cpsw driver will be sent later. > >> @@ -1494,6 +1409,87 @@ static const struct net_device_ops am65_cpsw_nuss_netdev_ops = { >> .ndo_get_devlink_port = am65_cpsw_ndo_get_devlink_port, >> }; >> >> +static void am65_cpsw_nuss_validate(struct phylink_config *config, unsigned long *supported, >> + struct phylink_link_state *state) >> +{ >> + phylink_generic_validate(config, supported, state); >> +} > > If you don't need anything special, please just initialise the member > directly: > > .validate = phylink_generic_validate, Sure, I will fix this in v2. > >> + >> +static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned int mode, >> + const struct phylink_link_state *state) >> +{ >> + /* Currently not used */ >> +} >> + >> +static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned int mode, >> + phy_interface_t interface) >> +{ >> + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, >> + phylink_config); >> + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); >> + struct am65_cpsw_common *common = port->common; >> + struct net_device *ndev = port->ndev; >> + int tmo; >> + >> + /* disable forwarding */ >> + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_DISABLE); >> + >> + cpsw_sl_ctl_set(port->slave.mac_sl, CPSW_SL_CTL_CMD_IDLE); >> + >> + tmo = cpsw_sl_wait_for_idle(port->slave.mac_sl, 100); >> + dev_dbg(common->dev, "down msc_sl %08x tmo %d\n", >> + cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_MACSTATUS), tmo); >> + >> + cpsw_sl_ctl_reset(port->slave.mac_sl); >> + >> + am65_cpsw_qos_link_down(ndev); >> + netif_tx_disable(ndev); > > You didn't call netif_tx_disable() in your adjust_link afaics, so why > is it added here? When I was working on the conversion, I had added the phylink_create() and related initialization in the wrong section of the driver. This had caused "NETDEV WATCHDOG: transmit queue timed out" errors on calls to netif_tx_stop_all_queues(ndev). To fix this, I had used netif_tx_disable() as a temporary workaround then. Now, after fixing the calls to phylink_create() and related code, I realize that it works even with netif_tx_stop_all_queues(ndev), so I will revert to it in v2. > >> +} >> + >> +static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy_device *phy, >> + unsigned int mode, phy_interface_t interface, int speed, >> + int duplex, bool tx_pause, bool rx_pause) >> +{ >> + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, >> + phylink_config); >> + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); >> + struct am65_cpsw_common *common = port->common; >> + struct net_device *ndev = port->ndev; >> + u32 mac_control = CPSW_SL_CTL_GMII_EN; >> + >> + if (speed == SPEED_1000) >> + mac_control |= CPSW_SL_CTL_GIG; >> + if (speed == SPEED_10 && interface == PHY_INTERFACE_MODE_RGMII) >> + /* Can be used with in band mode only */ >> + mac_control |= CPSW_SL_CTL_EXT_EN; >> + if (speed == SPEED_100 && interface == PHY_INTERFACE_MODE_RMII) >> + mac_control |= CPSW_SL_CTL_IFCTL_A; >> + if (duplex) >> + mac_control |= CPSW_SL_CTL_FULLDUPLEX; >> + >> + /* rx_pause/tx_pause */ >> + if (rx_pause) >> + mac_control |= CPSW_SL_CTL_RX_FLOW_EN; >> + >> + if (tx_pause) >> + mac_control |= CPSW_SL_CTL_TX_FLOW_EN; >> + >> + cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); >> + >> + /* enable forwarding */ >> + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); >> + >> + am65_cpsw_qos_link_up(ndev, speed); >> + netif_tx_wake_all_queues(ndev); >> +} >> + >> +static const struct phylink_mac_ops am65_cpsw_phylink_mac_ops = { >> + .validate = am65_cpsw_nuss_validate, >> + .mac_config = am65_cpsw_nuss_mac_config, >> + .mac_link_down = am65_cpsw_nuss_mac_link_down, >> + .mac_link_up = am65_cpsw_nuss_mac_link_up, >> +}; >> + >> static void am65_cpsw_nuss_slave_disable_unused(struct am65_cpsw_port *port) >> { >> struct am65_cpsw_common *common = port->common; >> @@ -1887,24 +1883,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) >> of_property_read_bool(port_np, "ti,mac-only"); >> >> /* get phy/link info */ >> - if (of_phy_is_fixed_link(port_np)) { >> - ret = of_phy_register_fixed_link(port_np); >> - if (ret) >> - return dev_err_probe(dev, ret, >> - "failed to register fixed-link phy %pOF\n", >> - port_np); >> - port->slave.phy_node = of_node_get(port_np); >> - } else { >> - port->slave.phy_node = >> - of_parse_phandle(port_np, "phy-handle", 0); >> - } >> - >> - if (!port->slave.phy_node) { >> - dev_err(dev, >> - "slave[%d] no phy found\n", port_id); >> - return -ENODEV; >> - } >> - >> + port->slave.phy_node = port_np; >> ret = of_get_phy_mode(port_np, &port->slave.phy_if); >> if (ret) { >> dev_err(dev, "%pOF read phy-mode err %d\n", >> @@ -1947,6 +1926,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) >> struct am65_cpsw_ndev_priv *ndev_priv; >> struct device *dev = common->dev; >> struct am65_cpsw_port *port; >> + struct phylink *phylink; >> int ret; >> >> port = &common->ports[port_idx]; >> @@ -1984,6 +1964,26 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) >> port->ndev->netdev_ops = &am65_cpsw_nuss_netdev_ops; >> port->ndev->ethtool_ops = &am65_cpsw_ethtool_ops_slave; >> >> + /* Configuring Phylink */ >> + port->slave.phylink_config.dev = &port->ndev->dev; >> + port->slave.phylink_config.type = PHYLINK_NETDEV; >> + port->slave.phylink_config.pcs_poll = true; > > Does this compile? This member was removed, so you probably get a > compile error today. Sorry for not updating to the latest kernel before posting. I was working with 5.16 when I was creating the patch. > >> + port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | >> + MAC_100 | MAC_1000FD | MAC_2500FD; >> + >> + phy_interface_set_rgmii(port->slave.phylink_config.supported_interfaces); >> + __set_bit(PHY_INTERFACE_MODE_SGMII, port->slave.phylink_config.supported_interfaces); >> + __set_bit(PHY_INTERFACE_MODE_1000BASEX, port->slave.phylink_config.supported_interfaces); > > If you support SGMII and 1000BASE-X with inband signalling, I strongly > recommend that you implement phylink_pcs support as well, so you are > able to provide phylink with the inband results. Currently, SGMII and 1000BASE-X are not supported by the driver. I had added these as supported modes accidentally. I will be working on supporting SGMII and QSGMII modes in the near future and will add these along with phylink_pcs support as well in the patch for the same. I will remove these from the v2 patch. > >> + >> + phylink = phylink_create(&port->slave.phylink_config, dev->fwnode, port->slave.phy_if, >> + &am65_cpsw_phylink_mac_ops); >> + if (IS_ERR(phylink)) { >> + phylink_destroy(port->slave.phylink); > > This is wrong and will cause a NULL pointer dereference - please remove > the call to phylink_destroy() here. > > However, I could not find another call to phylink_destroy() in your > patch which means you will leak memory when the driver is unbound. I added this in the wrong section due to a misunderstanding on my part. I will fix this in v2. Regards, Siddharth.
diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c index d45b6bb86f0b..72acdf802258 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c +++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c @@ -6,7 +6,7 @@ */ #include <linux/net_tstamp.h> -#include <linux/phy.h> +#include <linux/phylink.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -471,9 +471,7 @@ static void am65_cpsw_get_pauseparam(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - pause->autoneg = AUTONEG_DISABLE; - pause->rx_pause = salve->rx_pause ? true : false; - pause->tx_pause = salve->tx_pause ? true : false; + phylink_ethtool_get_pauseparam(salve->phylink, pause); } static int am65_cpsw_set_pauseparam(struct net_device *ndev, @@ -481,18 +479,7 @@ static int am65_cpsw_set_pauseparam(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy) - return -EINVAL; - - if (!phy_validate_pause(salve->phy, pause)) - return -EINVAL; - - salve->rx_pause = pause->rx_pause ? true : false; - salve->tx_pause = pause->tx_pause ? true : false; - - phy_set_asym_pause(salve->phy, salve->rx_pause, salve->tx_pause); - - return 0; + return phylink_ethtool_set_pauseparam(salve->phylink, pause); } static void am65_cpsw_get_wol(struct net_device *ndev, @@ -500,11 +487,7 @@ static void am65_cpsw_get_wol(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - wol->supported = 0; - wol->wolopts = 0; - - if (salve->phy) - phy_ethtool_get_wol(salve->phy, wol); + phylink_ethtool_get_wol(salve->phylink, wol); } static int am65_cpsw_set_wol(struct net_device *ndev, @@ -512,10 +495,7 @@ static int am65_cpsw_set_wol(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy) - return -EOPNOTSUPP; - - return phy_ethtool_set_wol(salve->phy, wol); + return phylink_ethtool_set_wol(salve->phylink, wol); } static int am65_cpsw_get_link_ksettings(struct net_device *ndev, @@ -523,11 +503,7 @@ static int am65_cpsw_get_link_ksettings(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy) - return -EOPNOTSUPP; - - phy_ethtool_ksettings_get(salve->phy, ecmd); - return 0; + return phylink_ethtool_ksettings_get(salve->phylink, ecmd); } static int @@ -536,40 +512,28 @@ am65_cpsw_set_link_ksettings(struct net_device *ndev, { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy || phy_is_pseudo_fixed_link(salve->phy)) - return -EOPNOTSUPP; - - return phy_ethtool_ksettings_set(salve->phy, ecmd); + return phylink_ethtool_ksettings_set(salve->phylink, ecmd); } static int am65_cpsw_get_eee(struct net_device *ndev, struct ethtool_eee *edata) { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy || phy_is_pseudo_fixed_link(salve->phy)) - return -EOPNOTSUPP; - - return phy_ethtool_get_eee(salve->phy, edata); + return phylink_ethtool_get_eee(salve->phylink, edata); } static int am65_cpsw_set_eee(struct net_device *ndev, struct ethtool_eee *edata) { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy || phy_is_pseudo_fixed_link(salve->phy)) - return -EOPNOTSUPP; - - return phy_ethtool_set_eee(salve->phy, edata); + return phylink_ethtool_set_eee(salve->phylink, edata); } static int am65_cpsw_nway_reset(struct net_device *ndev) { struct am65_cpsw_slave_data *salve = am65_ndev_to_slave(ndev); - if (!salve->phy || phy_is_pseudo_fixed_link(salve->phy)) - return -EOPNOTSUPP; - - return phy_restart_aneg(salve->phy); + return phylink_ethtool_nway_reset(salve->phylink); } static int am65_cpsw_get_regs_len(struct net_device *ndev) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 750cea23e9cd..f8d50689c5f4 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -18,7 +18,7 @@ #include <linux/of_mdio.h> #include <linux/of_net.h> #include <linux/of_device.h> -#include <linux/phy.h> +#include <linux/phylink.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -159,69 +159,6 @@ static void am65_cpsw_nuss_get_ver(struct am65_cpsw_common *common) common->pdata.quirks); } -void am65_cpsw_nuss_adjust_link(struct net_device *ndev) -{ - struct am65_cpsw_common *common = am65_ndev_to_common(ndev); - struct am65_cpsw_port *port = am65_ndev_to_port(ndev); - struct phy_device *phy = port->slave.phy; - u32 mac_control = 0; - - if (!phy) - return; - - if (phy->link) { - mac_control = CPSW_SL_CTL_GMII_EN; - - if (phy->speed == 1000) - mac_control |= CPSW_SL_CTL_GIG; - if (phy->speed == 10 && phy_interface_is_rgmii(phy)) - /* Can be used with in band mode only */ - mac_control |= CPSW_SL_CTL_EXT_EN; - if (phy->speed == 100 && phy->interface == PHY_INTERFACE_MODE_RMII) - mac_control |= CPSW_SL_CTL_IFCTL_A; - if (phy->duplex) - mac_control |= CPSW_SL_CTL_FULLDUPLEX; - - /* RGMII speed is 100M if !CPSW_SL_CTL_GIG*/ - - /* rx_pause/tx_pause */ - if (port->slave.rx_pause) - mac_control |= CPSW_SL_CTL_RX_FLOW_EN; - - if (port->slave.tx_pause) - mac_control |= CPSW_SL_CTL_TX_FLOW_EN; - - cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); - - /* enable forwarding */ - cpsw_ale_control_set(common->ale, port->port_id, - ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); - - am65_cpsw_qos_link_up(ndev, phy->speed); - netif_tx_wake_all_queues(ndev); - } else { - int tmo; - - /* disable forwarding */ - cpsw_ale_control_set(common->ale, port->port_id, - ALE_PORT_STATE, ALE_PORT_STATE_DISABLE); - - cpsw_sl_ctl_set(port->slave.mac_sl, CPSW_SL_CTL_CMD_IDLE); - - tmo = cpsw_sl_wait_for_idle(port->slave.mac_sl, 100); - dev_dbg(common->dev, "donw msc_sl %08x tmo %d\n", - cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_MACSTATUS), - tmo); - - cpsw_sl_ctl_reset(port->slave.mac_sl); - - am65_cpsw_qos_link_down(ndev); - netif_tx_stop_all_queues(ndev); - } - - phy_print_status(phy); -} - static int am65_cpsw_nuss_ndo_slave_add_vid(struct net_device *ndev, __be16 proto, u16 vid) { @@ -589,16 +526,9 @@ static int am65_cpsw_nuss_ndo_slave_stop(struct net_device *ndev) struct am65_cpsw_port *port = am65_ndev_to_port(ndev); int ret; - if (port->slave.phy) - phy_stop(port->slave.phy); - + phylink_stop(port->slave.phylink); netif_tx_stop_all_queues(ndev); - - if (port->slave.phy) { - phy_disconnect(port->slave.phy); - port->slave.phy = NULL; - } - + phylink_disconnect_phy(port->slave.phylink); ret = am65_cpsw_nuss_common_stop(common); if (ret) return ret; @@ -667,25 +597,13 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) if (ret) goto error_cleanup; - if (port->slave.phy_node) { - port->slave.phy = of_phy_connect(ndev, - port->slave.phy_node, - &am65_cpsw_nuss_adjust_link, - 0, port->slave.phy_if); - if (!port->slave.phy) { - dev_err(common->dev, "phy %pOF not found on slave %d\n", - port->slave.phy_node, - port->port_id); - ret = -ENODEV; - goto error_cleanup; - } - } + ret = phylink_of_phy_connect(port->slave.phylink, port->slave.phy_node, 0); + if (ret) + goto error_cleanup; /* restore vlan configurations */ vlan_for_each(ndev, cpsw_restore_vlans, port); - - phy_attached_info(port->slave.phy); - phy_start(port->slave.phy); + phylink_start(port->slave.phylink); return 0; @@ -1431,10 +1349,7 @@ static int am65_cpsw_nuss_ndo_slave_ioctl(struct net_device *ndev, return am65_cpsw_nuss_hwtstamp_get(ndev, req); } - if (!port->slave.phy) - return -EOPNOTSUPP; - - return phy_mii_ioctl(port->slave.phy, req, cmd); + return phylink_mii_ioctl(port->slave.phylink, req, cmd); } static void am65_cpsw_nuss_ndo_get_stats(struct net_device *dev, @@ -1494,6 +1409,87 @@ static const struct net_device_ops am65_cpsw_nuss_netdev_ops = { .ndo_get_devlink_port = am65_cpsw_ndo_get_devlink_port, }; +static void am65_cpsw_nuss_validate(struct phylink_config *config, unsigned long *supported, + struct phylink_link_state *state) +{ + phylink_generic_validate(config, supported, state); +} + +static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned int mode, + const struct phylink_link_state *state) +{ + /* Currently not used */ +} + +static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned int mode, + phy_interface_t interface) +{ + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, + phylink_config); + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); + struct am65_cpsw_common *common = port->common; + struct net_device *ndev = port->ndev; + int tmo; + + /* disable forwarding */ + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_DISABLE); + + cpsw_sl_ctl_set(port->slave.mac_sl, CPSW_SL_CTL_CMD_IDLE); + + tmo = cpsw_sl_wait_for_idle(port->slave.mac_sl, 100); + dev_dbg(common->dev, "down msc_sl %08x tmo %d\n", + cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_MACSTATUS), tmo); + + cpsw_sl_ctl_reset(port->slave.mac_sl); + + am65_cpsw_qos_link_down(ndev); + netif_tx_disable(ndev); +} + +static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy_device *phy, + unsigned int mode, phy_interface_t interface, int speed, + int duplex, bool tx_pause, bool rx_pause) +{ + struct am65_cpsw_slave_data *slave = container_of(config, struct am65_cpsw_slave_data, + phylink_config); + struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); + struct am65_cpsw_common *common = port->common; + struct net_device *ndev = port->ndev; + u32 mac_control = CPSW_SL_CTL_GMII_EN; + + if (speed == SPEED_1000) + mac_control |= CPSW_SL_CTL_GIG; + if (speed == SPEED_10 && interface == PHY_INTERFACE_MODE_RGMII) + /* Can be used with in band mode only */ + mac_control |= CPSW_SL_CTL_EXT_EN; + if (speed == SPEED_100 && interface == PHY_INTERFACE_MODE_RMII) + mac_control |= CPSW_SL_CTL_IFCTL_A; + if (duplex) + mac_control |= CPSW_SL_CTL_FULLDUPLEX; + + /* rx_pause/tx_pause */ + if (rx_pause) + mac_control |= CPSW_SL_CTL_RX_FLOW_EN; + + if (tx_pause) + mac_control |= CPSW_SL_CTL_TX_FLOW_EN; + + cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); + + /* enable forwarding */ + cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); + + am65_cpsw_qos_link_up(ndev, speed); + netif_tx_wake_all_queues(ndev); +} + +static const struct phylink_mac_ops am65_cpsw_phylink_mac_ops = { + .validate = am65_cpsw_nuss_validate, + .mac_config = am65_cpsw_nuss_mac_config, + .mac_link_down = am65_cpsw_nuss_mac_link_down, + .mac_link_up = am65_cpsw_nuss_mac_link_up, +}; + static void am65_cpsw_nuss_slave_disable_unused(struct am65_cpsw_port *port) { struct am65_cpsw_common *common = port->common; @@ -1887,24 +1883,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) of_property_read_bool(port_np, "ti,mac-only"); /* get phy/link info */ - if (of_phy_is_fixed_link(port_np)) { - ret = of_phy_register_fixed_link(port_np); - if (ret) - return dev_err_probe(dev, ret, - "failed to register fixed-link phy %pOF\n", - port_np); - port->slave.phy_node = of_node_get(port_np); - } else { - port->slave.phy_node = - of_parse_phandle(port_np, "phy-handle", 0); - } - - if (!port->slave.phy_node) { - dev_err(dev, - "slave[%d] no phy found\n", port_id); - return -ENODEV; - } - + port->slave.phy_node = port_np; ret = of_get_phy_mode(port_np, &port->slave.phy_if); if (ret) { dev_err(dev, "%pOF read phy-mode err %d\n", @@ -1947,6 +1926,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) struct am65_cpsw_ndev_priv *ndev_priv; struct device *dev = common->dev; struct am65_cpsw_port *port; + struct phylink *phylink; int ret; port = &common->ports[port_idx]; @@ -1984,6 +1964,26 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) port->ndev->netdev_ops = &am65_cpsw_nuss_netdev_ops; port->ndev->ethtool_ops = &am65_cpsw_ethtool_ops_slave; + /* Configuring Phylink */ + port->slave.phylink_config.dev = &port->ndev->dev; + port->slave.phylink_config.type = PHYLINK_NETDEV; + port->slave.phylink_config.pcs_poll = true; + port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | + MAC_100 | MAC_1000FD | MAC_2500FD; + + phy_interface_set_rgmii(port->slave.phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_SGMII, port->slave.phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_1000BASEX, port->slave.phylink_config.supported_interfaces); + + phylink = phylink_create(&port->slave.phylink_config, dev->fwnode, port->slave.phy_if, + &am65_cpsw_phylink_mac_ops); + if (IS_ERR(phylink)) { + phylink_destroy(port->slave.phylink); + return PTR_ERR(phylink); + } + + port->slave.phylink = phylink; + /* Disable TX checksum offload by default due to HW bug */ if (common->pdata.quirks & AM65_CPSW_QUIRK_I2027_NO_TX_CSUM) port->ndev->features &= ~NETIF_F_HW_CSUM; diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h index 048ed10143c1..ac945631bf2f 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -10,7 +10,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> -#include <linux/phy.h> +#include <linux/phylink.h> #include <linux/platform_device.h> #include <linux/soc/ti/k3-ringacc.h> #include <net/devlink.h> @@ -30,13 +30,14 @@ struct am65_cpsw_slave_data { bool mac_only; struct cpsw_sl *mac_sl; struct device_node *phy_node; - struct phy_device *phy; phy_interface_t phy_if; struct phy *ifphy; bool rx_pause; bool tx_pause; u8 mac_addr[ETH_ALEN]; int port_vlan; + struct phylink *phylink; + struct phylink_config phylink_config; }; struct am65_cpsw_port {
Convert am65-cpsw driver and am65-cpsw ethtool to use Phylink APIs as described at Documentation/networking/sfp-phylink.rst. All calls to Phy APIs are replaced with their equivalent Phylink APIs. Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> --- Tested on Texas Instruments AM64, AM65, J7200 and J721e devices. Resending patch since I did not find it in the mailing list. drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 56 +---- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 222 ++++++++++---------- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 5 +- 3 files changed, 124 insertions(+), 159 deletions(-)