RE: [PATCH v7 net-next 06/10] net: fec: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set()

[Wei Fang]

> -----Original Message-----
> From: Vladimir Oltean <vladimir.oltean@xxxxxxx>
> Sent: 2023年7月13日 20:19
> To: netdev@xxxxxxxxxxxxxxx
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>; Eric Dumazet
> <edumazet@xxxxxxxxxx>; Jakub Kicinski <kuba@xxxxxxxxxx>; Paolo Abeni
> <pabeni@xxxxxxxxxx>; Andrew Lunn <andrew@xxxxxxx>; Florian Fainelli
> <f.fainelli@xxxxxxxxx>; Maxim Georgiev <glipus@xxxxxxxxx>; Horatiu Vultur
> <horatiu.vultur@xxxxxxxxxxxxx>; Köry Maincent
> <kory.maincent@xxxxxxxxxxx>; Maxime Chevallier
> <maxime.chevallier@xxxxxxxxxxx>; Richard Cochran
> <richardcochran@xxxxxxxxx>; Vadim Fedorenko
> <vadim.fedorenko@xxxxxxxxx>; Gerhard Engleder
> <gerhard@xxxxxxxxxxxxxxxxxxxxx>; Hangbin Liu <liuhangbin@xxxxxxxxx>;
> Russell King <linux@xxxxxxxxxxxxxxx>; Heiner Kallweit
> <hkallweit1@xxxxxxxxx>; Jacob Keller <jacob.e.keller@xxxxxxxxx>; Jay
> Vosburgh <j.vosburgh@xxxxxxxxx>; Andy Gospodarek <andy@xxxxxxxxxxxxx>;
> Wei Fang <wei.fang@xxxxxxx>; Shenwei Wang <shenwei.wang@xxxxxxx>;
> Clark Wang <xiaoning.wang@xxxxxxx>; dl-linux-imx <linux-imx@xxxxxxx>;
> UNGLinuxDriver@xxxxxxxxxxxxx; Lars Povlsen <lars.povlsen@xxxxxxxxxxxxx>;
> Steen Hegelund <Steen.Hegelund@xxxxxxxxxxxxx>; Daniel Machon
> <daniel.machon@xxxxxxxxxxxxx>; Simon Horman
> <simon.horman@xxxxxxxxxxxx>; Casper Andersson
> <casper.casan@xxxxxxxxx>; Sergey Organov <sorganov@xxxxxxxxx>;
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: [PATCH v7 net-next 06/10] net: fec: convert to ndo_hwtstamp_get()
> and ndo_hwtstamp_set()
> 
> The hardware timestamping through ndo_eth_ioctl() is going away.
> Convert the FEC driver to the new API before that can be removed.
> 
> Signed-off-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>
> ---
> Changes in v7:
> - Patch is new
> 
>  drivers/net/ethernet/freescale/fec.h      |  5 ++-
>  drivers/net/ethernet/freescale/fec_main.c | 52 +++++++++++++++++------
> drivers/net/ethernet/freescale/fec_ptp.c  | 31 +++++---------
>  3 files changed, 52 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/fec.h
> b/drivers/net/ethernet/freescale/fec.h
> index 9939ccafb556..d4ae0e7c0a44 100644
> --- a/drivers/net/ethernet/freescale/fec.h
> +++ b/drivers/net/ethernet/freescale/fec.h
> @@ -691,8 +691,9 @@ void fec_ptp_init(struct platform_device *pdev, int
> irq_idx);  void fec_ptp_stop(struct platform_device *pdev);  void
> fec_ptp_start_cyclecounter(struct net_device *ndev);  void
> fec_ptp_disable_hwts(struct net_device *ndev); -int fec_ptp_set(struct
> net_device *ndev, struct ifreq *ifr); -int fec_ptp_get(struct net_device *ndev,
> struct ifreq *ifr);
> +int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config
> *config,
> +		struct netlink_ext_ack *extack);
> +void fec_ptp_get(struct net_device *ndev, struct kernel_hwtstamp_config
> +*config);
> 
> 
> /******************************************************************
> **********/
>  #endif /* FEC_H */
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index 1280da699fa3..c0b68fc3ec8b 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -3196,7 +3196,6 @@ static const struct ethtool_ops
> fec_enet_ethtool_ops = {
> 
>  static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)  {
> -	struct fec_enet_private *fep = netdev_priv(ndev);
>  	struct phy_device *phydev = ndev->phydev;
> 
>  	if (!netif_running(ndev))
> @@ -3205,19 +3204,6 @@ static int fec_enet_ioctl(struct net_device *ndev,
> struct ifreq *rq, int cmd)
>  	if (!phydev)
>  		return -ENODEV;
> 
> -	if (fep->bufdesc_ex) {
> -		bool use_fec_hwts = !phy_has_hwtstamp(phydev);
> -
> -		if (cmd == SIOCSHWTSTAMP) {
> -			if (use_fec_hwts)
> -				return fec_ptp_set(ndev, rq);
> -			fec_ptp_disable_hwts(ndev);
> -		} else if (cmd == SIOCGHWTSTAMP) {
> -			if (use_fec_hwts)
> -				return fec_ptp_get(ndev, rq);
> -		}
> -	}
> -
>  	return phy_mii_ioctl(phydev, rq, cmd);  }
> 
> @@ -3868,6 +3854,42 @@ static int fec_enet_xdp_xmit(struct net_device
> *dev,
>  	return sent_frames;
>  }
> 
> +static int fec_hwtstamp_get(struct net_device *ndev,
> +			    struct kernel_hwtstamp_config *config) {
> +	struct fec_enet_private *fep = netdev_priv(ndev);
> +	struct phy_device *phydev = ndev->phydev;
> +
> +	if (phy_has_hwtstamp(phydev))
> +		return phy_mii_ioctl(phydev, config->ifr, SIOCGHWTSTAMP);
> +
> +	if (!fep->bufdesc_ex)
> +		return -EOPNOTSUPP;
> +
> +	fec_ptp_get(ndev, config);
> +
> +	return 0;
> +}
> +
> +static int fec_hwtstamp_set(struct net_device *ndev,
> +			    struct kernel_hwtstamp_config *config,
> +			    struct netlink_ext_ack *extack)
> +{
> +	struct fec_enet_private *fep = netdev_priv(ndev);
> +	struct phy_device *phydev = ndev->phydev;
> +
> +	if (phy_has_hwtstamp(phydev)) {
> +		fec_ptp_disable_hwts(ndev);
> +
> +		return phy_mii_ioctl(phydev, config->ifr, SIOCSHWTSTAMP);
> +	}
> +
> +	if (!fep->bufdesc_ex)
> +		return -EOPNOTSUPP;
> +
> +	return fec_ptp_set(ndev, config, extack); }
> +
>  static const struct net_device_ops fec_netdev_ops = {
>  	.ndo_open		= fec_enet_open,
>  	.ndo_stop		= fec_enet_close,
> @@ -3884,6 +3906,8 @@ static const struct net_device_ops fec_netdev_ops =
> {
>  	.ndo_set_features	= fec_set_features,
>  	.ndo_bpf		= fec_enet_bpf,
>  	.ndo_xdp_xmit		= fec_enet_xdp_xmit,
> +	.ndo_hwtstamp_get	= fec_hwtstamp_get,
> +	.ndo_hwtstamp_set	= fec_hwtstamp_set,
>  };
> 
>  static const unsigned short offset_des_active_rxq[] = { diff --git
> a/drivers/net/ethernet/freescale/fec_ptp.c
> b/drivers/net/ethernet/freescale/fec_ptp.c
> index ab86bb8562ef..3f53b8ae57dd 100644
> --- a/drivers/net/ethernet/freescale/fec_ptp.c
> +++ b/drivers/net/ethernet/freescale/fec_ptp.c
> @@ -618,16 +618,12 @@ void fec_ptp_disable_hwts(struct net_device *ndev)
>  	fep->hwts_rx_en = 0;
>  }
> 
> -int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr)
> +int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config
> *config,
> +		struct netlink_ext_ack *extack)
>  {
>  	struct fec_enet_private *fep = netdev_priv(ndev);
> 
> -	struct hwtstamp_config config;
> -
> -	if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
> -		return -EFAULT;
> -
> -	switch (config.tx_type) {
> +	switch (config->tx_type) {
>  	case HWTSTAMP_TX_OFF:
>  		fep->hwts_tx_en = 0;
>  		break;
> @@ -638,33 +634,28 @@ int fec_ptp_set(struct net_device *ndev, struct ifreq
> *ifr)
>  		return -ERANGE;
>  	}
> 
> -	switch (config.rx_filter) {
> +	switch (config->rx_filter) {
>  	case HWTSTAMP_FILTER_NONE:
>  		fep->hwts_rx_en = 0;
>  		break;
> 
>  	default:
>  		fep->hwts_rx_en = 1;
> -		config.rx_filter = HWTSTAMP_FILTER_ALL;
> +		config->rx_filter = HWTSTAMP_FILTER_ALL;
>  		break;
>  	}
> 
> -	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
> -	    -EFAULT : 0;
> +	return 0;
>  }
> 
> -int fec_ptp_get(struct net_device *ndev, struct ifreq *ifr)
> +void fec_ptp_get(struct net_device *ndev, struct kernel_hwtstamp_config
> +*config)
>  {
>  	struct fec_enet_private *fep = netdev_priv(ndev);
> -	struct hwtstamp_config config;
> -
> -	config.flags = 0;
> -	config.tx_type = fep->hwts_tx_en ? HWTSTAMP_TX_ON :
> HWTSTAMP_TX_OFF;
> -	config.rx_filter = (fep->hwts_rx_en ?
> -			    HWTSTAMP_FILTER_ALL : HWTSTAMP_FILTER_NONE);
> 
> -	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
> -		-EFAULT : 0;
> +	config->flags = 0;
> +	config->tx_type = fep->hwts_tx_en ? HWTSTAMP_TX_ON :
> HWTSTAMP_TX_OFF;
> +	config->rx_filter = (fep->hwts_rx_en ?
> +			     HWTSTAMP_FILTER_ALL : HWTSTAMP_FILTER_NONE);
>  }
> 
>  /*
> --
> 2.34.1

Thanks!
Reviewed-by: Wei Fang < wei.fang@xxxxxxx >