Re: [PATCH v2 1/5] net: ag71xx: port to phylink

From: Russell King - ARM Linux admin
Date: Fri Oct 18 2019 - 05:54:26 EST

Next message: Oleksandr Suvorov: "Re: [PATCH 5.3 112/112] ASoC: sgtl5000: add ADC mute control"
Previous message: Viresh Kumar: "Re: [v4, 7/8] cpufreq: mediatek: add opp notification for SVS support"
In reply to: Oleksij Rempel: "[PATCH v2 1/5] net: ag71xx: port to phylink"
Next in thread: Oleksij Rempel: "[PATCH v2 2/5] dt-bindings: net: dsa: qca,ar9331 switch documentation"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi,

On Fri, Oct 18, 2019 at 11:39:25AM +0200, Oleksij Rempel wrote:
> The port to phylink was done as close as possible to initial
> functionality.
> Theoretically this HW can support flow control, practically seems to be not
> enough to just enable it. So, more work should be done.
>
> Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
> ---
> drivers/net/ethernet/atheros/Kconfig | 2 +-
> drivers/net/ethernet/atheros/ag71xx.c | 146 +++++++++++++++-----------
> 2 files changed, 87 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
> index 0058051ba925..2720bde5034e 100644
> --- a/drivers/net/ethernet/atheros/Kconfig
> +++ b/drivers/net/ethernet/atheros/Kconfig
> @@ -20,7 +20,7 @@ if NET_VENDOR_ATHEROS
> config AG71XX
> tristate "Atheros AR7XXX/AR9XXX built-in ethernet mac support"
> depends on ATH79
> - select PHYLIB
> + select PHYLINK
> help
> If you wish to compile a kernel for AR7XXX/91XXX and enable
> ethernet support, then you should always answer Y to this.
> diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
> index 1b1a09095c0d..4ad587d6a8e8 100644
> --- a/drivers/net/ethernet/atheros/ag71xx.c
> +++ b/drivers/net/ethernet/atheros/ag71xx.c
> @@ -32,6 +32,7 @@
> #include <linux/of_mdio.h>
> #include <linux/of_net.h>
> #include <linux/of_platform.h>
> +#include <linux/phylink.h>
> #include <linux/regmap.h>
> #include <linux/reset.h>
> #include <linux/clk.h>
> @@ -314,6 +315,8 @@ struct ag71xx {
> dma_addr_t stop_desc_dma;
>
> int phy_if_mode;
> + struct phylink *phylink;
> + struct phylink_config phylink_config;
>
> struct delayed_work restart_work;
> struct timer_list oom_timer;
> @@ -845,24 +848,20 @@ static void ag71xx_hw_start(struct ag71xx *ag)
> netif_wake_queue(ag->ndev);
> }
>
> -static void ag71xx_link_adjust(struct ag71xx *ag, bool update)
> +static void ag71xx_mac_config(struct phylink_config *config, unsigned int mode,
> + const struct phylink_link_state *state)
> {
> - struct phy_device *phydev = ag->ndev->phydev;
> + struct ag71xx *ag = netdev_priv(to_net_dev(config->dev));
> u32 cfg2;
> u32 ifctl;
> u32 fifo5;
>
> - if (!phydev->link && update) {
> - ag71xx_hw_stop(ag);
> - return;
> - }
> -
> if (!ag71xx_is(ag, AR7100) && !ag71xx_is(ag, AR9130))
> ag71xx_fast_reset(ag);
>
> cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
> cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
> - cfg2 |= (phydev->duplex) ? MAC_CFG2_FDX : 0;
> + cfg2 |= (state->duplex) ? MAC_CFG2_FDX : 0;
>
> ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
> ifctl &= ~(MAC_IFCTL_SPEED);
> @@ -870,7 +869,7 @@ static void ag71xx_link_adjust(struct ag71xx *ag, bool update)
> fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
> fifo5 &= ~FIFO_CFG5_BM;
>
> - switch (phydev->speed) {
> + switch (state->speed) {

Please see the documentation for the mac_config() method in
include/linux/phylink.h wrt state->speed and state->duplex validity.

> case SPEED_1000:
> cfg2 |= MAC_CFG2_IF_1000;
> fifo5 |= FIFO_CFG5_BM;
> @@ -883,7 +882,6 @@ static void ag71xx_link_adjust(struct ag71xx *ag, bool update)
> cfg2 |= MAC_CFG2_IF_10_100;
> break;
> default:
> - WARN(1, "not supported speed %i\n", phydev->speed);
> return;
> }
>
> @@ -897,58 +895,78 @@ static void ag71xx_link_adjust(struct ag71xx *ag, bool update)
> ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
> ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
> ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
> -
> - ag71xx_hw_start(ag);
> -
> - if (update)
> - phy_print_status(phydev);
> }
>
> -static void ag71xx_phy_link_adjust(struct net_device *ndev)
> +static void ag71xx_mac_validate(struct phylink_config *config,
> + unsigned long *supported,
> + struct phylink_link_state *state)
> {
> - struct ag71xx *ag = netdev_priv(ndev);
> + __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
> +
> + if (state->interface != PHY_INTERFACE_MODE_NA &&
> + state->interface != PHY_INTERFACE_MODE_GMII &&
> + state->interface != PHY_INTERFACE_MODE_MII) {
> + bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
> + return;
> + }
> +
> + phylink_set(mask, MII);
> +
> + /* flow control is not supported */
>
> - ag71xx_link_adjust(ag, true);
> + phylink_set(mask, 10baseT_Half);
> + phylink_set(mask, 10baseT_Full);
> + phylink_set(mask, 100baseT_Half);
> + phylink_set(mask, 100baseT_Full);
> +
> + if (state->interface = PHY_INTERFACE_MODE_GMII) {

This is an assignment, is always true, and will produce a compiler
warning.

Please see the documentation for the validate() method in
include/linux/phylink.h wrt PHY_INTERFACE_MODE_NA handling.

Thanks.

> + phylink_set(mask, 1000baseT_Full);
> + phylink_set(mask, 1000baseX_Full);
> + }
> +
> + bitmap_and(supported, supported, mask,
> + __ETHTOOL_LINK_MODE_MASK_NBITS);
> + bitmap_and(state->advertising, state->advertising, mask,
> + __ETHTOOL_LINK_MODE_MASK_NBITS);
> }
>
> -static int ag71xx_phy_connect(struct ag71xx *ag)
> +static void ag71xx_mac_link_down(struct phylink_config *config,
> + unsigned int mode, phy_interface_t interface)
> {
> - struct device_node *np = ag->pdev->dev.of_node;
> - struct net_device *ndev = ag->ndev;
> - struct device_node *phy_node;
> - struct phy_device *phydev;
> - int ret;
> + struct ag71xx *ag = netdev_priv(to_net_dev(config->dev));
>
> - if (of_phy_is_fixed_link(np)) {
> - ret = of_phy_register_fixed_link(np);
> - if (ret < 0) {
> - netif_err(ag, probe, ndev, "Failed to register fixed PHY link: %d\n",
> - ret);
> - return ret;
> - }
> + ag71xx_hw_stop(ag);
> +}
>
> - phy_node = of_node_get(np);
> - } else {
> - phy_node = of_parse_phandle(np, "phy-handle", 0);
> - }
> +static void ag71xx_mac_link_up(struct phylink_config *config, unsigned int mode,
> + phy_interface_t interface,
> + struct phy_device *phy)
> +{
> + struct ag71xx *ag = netdev_priv(to_net_dev(config->dev));
>
> - if (!phy_node) {
> - netif_err(ag, probe, ndev, "Could not find valid phy node\n");
> - return -ENODEV;
> - }
> + ag71xx_hw_start(ag);
> +}
>
> - phydev = of_phy_connect(ag->ndev, phy_node, ag71xx_phy_link_adjust,
> - 0, ag->phy_if_mode);
> +static const struct phylink_mac_ops ag71xx_phylink_mac_ops = {
> + .validate = ag71xx_mac_validate,
> + .mac_config = ag71xx_mac_config,
> + .mac_link_down = ag71xx_mac_link_down,
> + .mac_link_up = ag71xx_mac_link_up,
> +};
>
> - of_node_put(phy_node);
> +static int ag71xx_phy_setup(struct ag71xx *ag)
> +{
> + struct phylink *phylink;
>
> - if (!phydev) {
> - netif_err(ag, probe, ndev, "Could not connect to PHY device\n");
> - return -ENODEV;
> - }
> + ag->phylink_config.dev = &ag->ndev->dev;
> + ag->phylink_config.type = PHYLINK_NETDEV;
>
> - phy_attached_info(phydev);
> + phylink = phylink_create(&ag->phylink_config, ag->pdev->dev.fwnode,
> + ag->phy_if_mode, &ag71xx_phylink_mac_ops);
> + if (IS_ERR(phylink))
> + return PTR_ERR(phylink);
>
> + ag->phylink = phylink;
> return 0;
> }
>
> @@ -1239,6 +1257,13 @@ static int ag71xx_open(struct net_device *ndev)
> unsigned int max_frame_len;
> int ret;
>
> + ret = phylink_of_phy_connect(ag->phylink, ag->pdev->dev.of_node, 0);
> + if (ret) {
> + netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n",
> + ret);
> + goto err;
> + }
> +
> max_frame_len = ag71xx_max_frame_len(ndev->mtu);
> ag->rx_buf_size =
> SKB_DATA_ALIGN(max_frame_len + NET_SKB_PAD + NET_IP_ALIGN);
> @@ -1251,11 +1276,7 @@ static int ag71xx_open(struct net_device *ndev)
> if (ret)
> goto err;
>
> - ret = ag71xx_phy_connect(ag);
> - if (ret)
> - goto err;
> -
> - phy_start(ndev->phydev);
> + phylink_start(ag->phylink);
>
> return 0;
>
> @@ -1268,8 +1289,7 @@ static int ag71xx_stop(struct net_device *ndev)
> {
> struct ag71xx *ag = netdev_priv(ndev);
>
> - phy_stop(ndev->phydev);
> - phy_disconnect(ndev->phydev);
> + phylink_stop(ag->phylink);
> ag71xx_hw_disable(ag);
>
> return 0;
> @@ -1396,10 +1416,9 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
>
> static int ag71xx_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
> {
> - if (!ndev->phydev)
> - return -EINVAL;
> + struct ag71xx *ag = netdev_priv(ndev);
>
> - return phy_mii_ioctl(ndev->phydev, ifr, cmd);
> + return phylink_mii_ioctl(ag->phylink, ifr, cmd);
> }
>
> static void ag71xx_oom_timer_handler(struct timer_list *t)
> @@ -1422,13 +1441,14 @@ static void ag71xx_restart_work_func(struct work_struct *work)
> {
> struct ag71xx *ag = container_of(work, struct ag71xx,
> restart_work.work);
> - struct net_device *ndev = ag->ndev;
>
> rtnl_lock();
> ag71xx_hw_disable(ag);
> ag71xx_hw_enable(ag);
> - if (ndev->phydev->link)
> - ag71xx_link_adjust(ag, false);
> +
> + phylink_stop(ag->phylink);
> + phylink_start(ag->phylink);
> +
> rtnl_unlock();
> }
>
> @@ -1769,6 +1789,12 @@ static int ag71xx_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, ndev);
>
> + err = ag71xx_phy_setup(ag);
> + if (err) {
> + netif_err(ag, probe, ndev, "failed to setup phy (%d)\n", err);
> + goto err_mdio_remove;
> + }
> +
> err = register_netdev(ndev);
> if (err) {
> netif_err(ag, probe, ndev, "unable to register net device\n");
> --
> 2.23.0
>
>

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up

Next message: Oleksandr Suvorov: "Re: [PATCH 5.3 112/112] ASoC: sgtl5000: add ADC mute control"
Previous message: Viresh Kumar: "Re: [v4, 7/8] cpufreq: mediatek: add opp notification for SVS support"
In reply to: Oleksij Rempel: "[PATCH v2 1/5] net: ag71xx: port to phylink"
Next in thread: Oleksij Rempel: "[PATCH v2 2/5] dt-bindings: net: dsa: qca,ar9331 switch documentation"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]