[PATCH net-next 0/3] net: axienet: Fix random driver issues.

[PATCH net-next 0/3] net: axienet: Fix random driver issues.

[Richard Cochran]

While working on the PTP P2P 1-step series, my hardware under test
just happened to be connected with an axienet MAC.  This series
address three unrelated issues in the driver.

Thanks,
Richard

Richard Cochran (3):
  net: axienet: Propagate registration errors during probe.
  net: axienet: Support software transmit time stamping.
  net: axienet: Pass ioctls to the phy.

 .../net/ethernet/xilinx/xilinx_axienet_main.c | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

-- 
2.20.1

[PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Richard Cochran]

The function, axienet_mdio_setup(), calls of_mdiobus_register() which
might return EDEFER_PROBE.  However, this error is not propagated to
the driver's probe method, and so deferred registration cannot happen.
This patch fixes the issue by handling the error code properly.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 20746b801959..53644abe52da 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1835,9 +1835,10 @@ static int axienet_probe(struct platform_device *pdev)
 		}
 
 		ret = axienet_mdio_setup(lp);
-		if (ret)
-			dev_warn(&pdev->dev,
-				 "error registering MDIO bus: %d\n", ret);
+		if (ret) {
+			dev_err(&pdev->dev, "error registering MDIO bus\n");
+			goto free_netdev;
+		}
 	}
 
 	lp->phylink_config.dev = &ndev->dev;
-- 
2.20.1

RE: [PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Radhey Shyam Pandey]

> -----Original Message-----
> From: Richard Cochran <richardcochran@gmail.com>
> Sent: Tuesday, December 17, 2019 12:03 AM
> To: netdev@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org; David Miller
> <davem@davemloft.net>; Michal Simek <michals@xilinx.com>; Radhey
> Shyam Pandey <radheys@xilinx.com>
> Subject: [PATCH net-next 1/3] net: axienet: Propagate registration errors
> during probe.
> 
> The function, axienet_mdio_setup(), calls of_mdiobus_register() which
> might return EDEFER_PROBE.  However, this error is not propagated to
EPROBE_DEFER.  In which scenario we are hitting probe_defer?

> the driver's probe method, and so deferred registration cannot happen.
> This patch fixes the issue by handling the error code properly.
> 
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
>  drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 20746b801959..53644abe52da 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -1835,9 +1835,10 @@ static int axienet_probe(struct platform_device
> *pdev)
>  		}
> 
>  		ret = axienet_mdio_setup(lp);
> -		if (ret)
> -			dev_warn(&pdev->dev,
> -				 "error registering MDIO bus: %d\n", ret);
> +		if (ret) {
> +			dev_err(&pdev->dev, "error registering MDIO
> bus\n");
Error handling for _mdio_setup failure seems ok. Minor nit- skip printing 
message " error registering MDIO bus" for defer case.

> +			goto free_netdev;
> +		}
>  	}
> 
>  	lp->phylink_config.dev = &ndev->dev;
> --
> 2.20.1

Re: [PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Richard Cochran]

On Tue, Dec 17, 2019 at 06:19:47AM +0000, Radhey Shyam Pandey wrote:
> > -----Original Message-----
> > From: Richard Cochran <richardcochran@gmail.com>
> > Sent: Tuesday, December 17, 2019 12:03 AM
> > To: netdev@vger.kernel.org
> > Cc: linux-arm-kernel@lists.infradead.org; David Miller
> > <davem@davemloft.net>; Michal Simek <michals@xilinx.com>; Radhey
> > Shyam Pandey <radheys@xilinx.com>
> > Subject: [PATCH net-next 1/3] net: axienet: Propagate registration errors
> > during probe.
> > 
> > The function, axienet_mdio_setup(), calls of_mdiobus_register() which
> > might return EDEFER_PROBE.  However, this error is not propagated to
> EPROBE_DEFER.  In which scenario we are hitting probe_defer?

Did you see the cover letter?  I am referring to this series:

 16.Dec'19  [PATCH V6 net-next 00/11] Peer to Peer One-Step time stamping

Thanks,
Richard

RE: [PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Radhey Shyam Pandey]

> -----Original Message-----
> From: Richard Cochran <richardcochran@gmail.com>
> Sent: Tuesday, December 17, 2019 9:20 PM
> To: Radhey Shyam Pandey <radheys@xilinx.com>
> Cc: netdev@vger.kernel.org; linux-arm-kernel@lists.infradead.org; David
> Miller <davem@davemloft.net>; Michal Simek <michals@xilinx.com>
> Subject: Re: [PATCH net-next 1/3] net: axienet: Propagate registration errors
> during probe.
> 
> On Tue, Dec 17, 2019 at 06:19:47AM +0000, Radhey Shyam Pandey wrote:
> > > -----Original Message-----
> > > From: Richard Cochran <richardcochran@gmail.com>
> > > Sent: Tuesday, December 17, 2019 12:03 AM
> > > To: netdev@vger.kernel.org
> > > Cc: linux-arm-kernel@lists.infradead.org; David Miller
> > > <davem@davemloft.net>; Michal Simek <michals@xilinx.com>; Radhey
> > > Shyam Pandey <radheys@xilinx.com>
> > > Subject: [PATCH net-next 1/3] net: axienet: Propagate registration errors
> > > during probe.
> > >
> > > The function, axienet_mdio_setup(), calls of_mdiobus_register() which
> > > might return EDEFER_PROBE.  However, this error is not propagated to
> > EPROBE_DEFER.  In which scenario we are hitting probe_defer?
> 
> Did you see the cover letter?  I am referring to this series:

I mean in which scenario we are hitting of_mdiobus_register defer? 
The series you mentioned talks about one-step TS.
> 
>  16.Dec'19  [PATCH V6 net-next 00/11] Peer to Peer One-Step time stamping
> 
> Thanks,
> Richard

Re: [PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Richard Cochran]

On Thu, Dec 19, 2019 at 06:13:34PM +0000, Radhey Shyam Pandey wrote:
> I mean in which scenario we are hitting of_mdiobus_register defer? 

of_mdiobus_register_phy() returns EPROBE_DEFER.

Thanks,
Richard

RE: [PATCH net-next 1/3] net: axienet: Propagate registration errors during probe.

[Radhey Shyam Pandey]

> -----Original Message-----
> From: Richard Cochran <richardcochran@gmail.com>
> Sent: Friday, December 20, 2019 10:50 AM
> To: Radhey Shyam Pandey <radheys@xilinx.com>
> Cc: netdev@vger.kernel.org; linux-arm-kernel@lists.infradead.org; David
> Miller <davem@davemloft.net>; Michal Simek <michals@xilinx.com>
> Subject: Re: [PATCH net-next 1/3] net: axienet: Propagate registration errors
> during probe.
> 
> On Thu, Dec 19, 2019 at 06:13:34PM +0000, Radhey Shyam Pandey wrote:
> > I mean in which scenario we are hitting of_mdiobus_register defer?
> 
> of_mdiobus_register_phy() returns EPROBE_DEFER.
Thanks. For defer we can skip "error registering MDIO bus" reporting.
> 
> Thanks,
> Richard

[PATCH net-next 2/3] net: axienet: Support software transmit time stamping.

[Richard Cochran]

MAC drivers are expected to invoke the transmit time stamping hook in
order to support both software time stamping and PHY time stamping.
This patch adds the missing hook.  In addition, drivers calling
netif_rx() should first check for PHY time stamping by calling
skb_defer_rx_timestamp().

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 53644abe52da..05fa7371c39a 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -675,6 +675,9 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 	cur_p->skb = skb;
 
 	tail_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
+
+	skb_tx_timestamp(skb);
+
 	/* Start the transfer */
 	axienet_dma_out32(lp, XAXIDMA_TX_TDESC_OFFSET, tail_p);
 	if (++lp->tx_bd_tail >= lp->tx_bd_num)
@@ -736,7 +739,8 @@ static void axienet_recv(struct net_device *ndev)
 			skb->ip_summed = CHECKSUM_COMPLETE;
 		}
 
-		netif_rx(skb);
+		if (!skb_defer_rx_timestamp(skb))
+			netif_rx(skb);
 
 		size += length;
 		packets++;
@@ -1367,6 +1371,7 @@ static const struct ethtool_ops axienet_ethtool_ops = {
 	.set_pauseparam = axienet_ethtools_set_pauseparam,
 	.get_coalesce   = axienet_ethtools_get_coalesce,
 	.set_coalesce   = axienet_ethtools_set_coalesce,
+	.get_ts_info	= ethtool_op_get_ts_info,
 	.get_link_ksettings = axienet_ethtools_get_link_ksettings,
 	.set_link_ksettings = axienet_ethtools_set_link_ksettings,
 };
-- 
2.20.1

[PATCH net-next 3/3] net: axienet: Pass ioctls to the phy.

[Richard Cochran]

In order to allow PHY drivers to handle ioctls, the MAC driver must pass
the calls through.  However, the axienet driver does not support ioctls
at all.  This patch fixes the issue by handing off the invocations to the
PHY appropriately.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 .../net/ethernet/xilinx/xilinx_axienet_main.c  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 05fa7371c39a..d0b996f220f5 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1067,6 +1067,23 @@ static int axienet_change_mtu(struct net_device *ndev, int new_mtu)
 	return 0;
 }
 
+static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+	if (!netif_running(dev))
+		return -EINVAL;
+
+	switch (cmd) {
+	case SIOCGMIIPHY:
+	case SIOCGMIIREG:
+	case SIOCSMIIREG:
+	case SIOCSHWTSTAMP:
+	case SIOCGHWTSTAMP:
+		return phy_mii_ioctl(dev->phydev, rq, cmd);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /**
  * axienet_poll_controller - Axi Ethernet poll mechanism.
@@ -1095,6 +1112,7 @@ static const struct net_device_ops axienet_netdev_ops = {
 	.ndo_set_mac_address = netdev_set_mac_address,
 	.ndo_validate_addr = eth_validate_addr,
 	.ndo_set_rx_mode = axienet_set_multicast_list,
+	.ndo_do_ioctl = axienet_ioctl,
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller = axienet_poll_controller,
 #endif
-- 
2.20.1

RE: [PATCH net-next 3/3] net: axienet: Pass ioctls to the phy.

[Radhey Shyam Pandey]

> -----Original Message-----
> From: Richard Cochran <richardcochran@gmail.com>
> Sent: Tuesday, December 17, 2019 12:03 AM
> To: netdev@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org; David Miller
> <davem@davemloft.net>; Michal Simek <michals@xilinx.com>; Radhey
> Shyam Pandey <radheys@xilinx.com>
> Subject: [PATCH net-next 3/3] net: axienet: Pass ioctls to the phy.
> 
> In order to allow PHY drivers to handle ioctls, the MAC driver must pass
> the calls through.  However, the axienet driver does not support ioctls
> at all.  This patch fixes the issue by handing off the invocations to the
> PHY appropriately.
> 
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
>  .../net/ethernet/xilinx/xilinx_axienet_main.c  | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 05fa7371c39a..d0b996f220f5 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -1067,6 +1067,23 @@ static int axienet_change_mtu(struct net_device
> *ndev, int new_mtu)
>  	return 0;
>  }
> 
> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> +{
> +	if (!netif_running(dev))
> +		return -EINVAL;
> +
> +	switch (cmd) {
> +	case SIOCGMIIPHY:
> +	case SIOCGMIIREG:
> +	case SIOCSMIIREG:
> +	case SIOCSHWTSTAMP:
For hw timestamp we are passing the request to phy?

> +	case SIOCGHWTSTAMP:
> +		return phy_mii_ioctl(dev->phydev, rq, cmd);

Driver migrated to phylink so now we have to use phylink_mii_ioctl.

> +	default:
> +		return -EOPNOTSUPP;
> +	}
> +}
> +
>  #ifdef CONFIG_NET_POLL_CONTROLLER
>  /**
>   * axienet_poll_controller - Axi Ethernet poll mechanism.
> @@ -1095,6 +1112,7 @@ static const struct net_device_ops
> axienet_netdev_ops = {
>  	.ndo_set_mac_address = netdev_set_mac_address,
>  	.ndo_validate_addr = eth_validate_addr,
>  	.ndo_set_rx_mode = axienet_set_multicast_list,
> +	.ndo_do_ioctl = axienet_ioctl,
>  #ifdef CONFIG_NET_POLL_CONTROLLER
>  	.ndo_poll_controller = axienet_poll_controller,
>  #endif
> --
> 2.20.1

Re: [PATCH net-next 3/3] net: axienet: Pass ioctls to the phy.

[Andrew Lunn]

> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> +{
> +	if (!netif_running(dev))
> +		return -EINVAL;
> +
> +	switch (cmd) {
> +	case SIOCGMIIPHY:
> +	case SIOCGMIIREG:
> +	case SIOCSMIIREG:
> +	case SIOCSHWTSTAMP:
> +	case SIOCGHWTSTAMP:
> +		return phy_mii_ioctl(dev->phydev, rq, cmd);
> +	default:
> +		return -EOPNOTSUPP;
> +	}
> +}

Hi Richard

You don't need to be conditional. phy_mii_ioctl() and
phylink_mii_ioctl() will return -EOPNOTSUPP for anything it does not
support.

	Andrew