Commit 4b3f6fb8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'dpaa_eth-conversion-to-ndo_hwtstamp_get-and-ndo_hwtstamp_set' 

Vladimir Oltean says:

====================
dpaa_eth conversion to ndo_hwtstamp_get() and ndo_hwtstamp_set()

This is part of the effort to finalize the conversion of drivers to the
dedicated hardware timestamping API.

In the case of the DPAA1 Ethernet driver, a bit more care is needed,
because dpaa_ioctl() looks a bit strange. It handles the "set" IOCTL but
not the "get", and even the phylink_mii_ioctl() portion could do with
some cleanup.
====================

Link: https://patch.msgid.link/20250508124753.1492742-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6c14058e c2d0b7da

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+21 −20
Original line number Diff line number Diff line
@@ -3089,15 +3089,25 @@ static int dpaa_xdp_xmit(struct net_device *net_dev, int n, 
	return nxmit;

}



static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

static int dpaa_hwtstamp_get(struct net_device *dev,

			     struct kernel_hwtstamp_config *config)

{

	struct dpaa_priv *priv = netdev_priv(dev);

	struct hwtstamp_config config;



	if (copy_from_user(&config, rq->ifr_data, sizeof(config)))

		return -EFAULT;

	config->tx_type = priv->tx_tstamp ? HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;

	config->rx_filter = priv->rx_tstamp ? HWTSTAMP_FILTER_ALL :

			    HWTSTAMP_FILTER_NONE;



	switch (config.tx_type) {

	return 0;

}



static int dpaa_hwtstamp_set(struct net_device *dev,

			     struct kernel_hwtstamp_config *config,

			     struct netlink_ext_ack *extack)

{

	struct dpaa_priv *priv = netdev_priv(dev);



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

		/* Couldn't disable rx/tx timestamping separately.

		 * Do nothing here.
@@ -3112,7 +3122,7 @@ static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		return -ERANGE;

	}



	if (config.rx_filter == HWTSTAMP_FILTER_NONE) {

	if (config->rx_filter == HWTSTAMP_FILTER_NONE) {

		/* Couldn't disable rx/tx timestamping separately.

		 * Do nothing here.

		 */
@@ -3121,28 +3131,17 @@ static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		priv->mac_dev->set_tstamp(priv->mac_dev->fman_mac, true);

		priv->rx_tstamp = true;

		/* TS is set for all frame types, not only those requested */

		config.rx_filter = HWTSTAMP_FILTER_ALL;

		config->rx_filter = HWTSTAMP_FILTER_ALL;

	}



	return copy_to_user(rq->ifr_data, &config, sizeof(config)) ?

			-EFAULT : 0;

	return 0;

}



static int dpaa_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd)

{

	int ret = -EINVAL;

	struct dpaa_priv *priv = netdev_priv(net_dev);



	if (cmd == SIOCGMIIREG) {

		if (net_dev->phydev)

			return phylink_mii_ioctl(priv->mac_dev->phylink, rq,

						 cmd);

	}



	if (cmd == SIOCSHWTSTAMP)

		return dpaa_ts_ioctl(net_dev, rq, cmd);



	return ret;

	return phylink_mii_ioctl(priv->mac_dev->phylink, rq, cmd);

}



static const struct net_device_ops dpaa_ops = {
@@ -3160,6 +3159,8 @@ static const struct net_device_ops dpaa_ops = { 
	.ndo_change_mtu = dpaa_change_mtu,

	.ndo_bpf = dpaa_xdp,

	.ndo_xdp_xmit = dpaa_xdp_xmit,

	.ndo_hwtstamp_get = dpaa_hwtstamp_get,

	.ndo_hwtstamp_set = dpaa_hwtstamp_set,

};



static int dpaa_napi_add(struct net_device *net_dev)