Commit 39aa687a authored by Piotr Wejman's avatar Piotr Wejman Committed by Tony Nguyen
Browse files

net: e1000e: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 



Update the driver to use the new hardware timestamping API added in commit
66f72230 ("net: add NDOs for configuring hardware timestamping").
Use Netlink extack for error reporting in e1000e_config_hwtstamp.
Align the indentation of net_device_ops.

Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarVitaly Lifshits <vitaly.lifshits@intel.com>
Signed-off-by: default avatarPiotr Wejman <wejmanpm@gmail.com>
Tested-by: default avatarAvigail Dahan <avigailx.dahan@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f9c961ef

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ struct e1000_adapter { 
	u16 tx_ring_count;

	u16 rx_ring_count;



	struct hwtstamp_config hwtstamp_config;

	struct kernel_hwtstamp_config hwtstamp_config;

	struct delayed_work systim_overflow_work;

	struct sk_buff *tx_hwtstamp_skb;

	unsigned long tx_hwtstamp_start;

drivers/net/ethernet/intel/e1000e/netdev.c

+37 −38
Original line number Diff line number Diff line
@@ -3574,6 +3574,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) 
 * e1000e_config_hwtstamp - configure the hwtstamp registers and enable/disable

 * @adapter: board private structure

 * @config: timestamp configuration

 * @extack: netlink extended ACK for error report

 *

 * Outgoing time stamping can be enabled and disabled. Play nice and

 * disable it when requested, although it shouldn't cause any overhead
@@ -3587,7 +3588,8 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) 
 * exception of "all V2 events regardless of level 2 or 4".

 **/

static int e1000e_config_hwtstamp(struct e1000_adapter *adapter,

				  struct hwtstamp_config *config)

				  struct kernel_hwtstamp_config *config,

				  struct netlink_ext_ack *extack)

{

	struct e1000_hw *hw = &adapter->hw;

	u32 tsync_tx_ctl = E1000_TSYNCTXCTL_ENABLED;
@@ -3598,8 +3600,10 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter, 
	bool is_l2 = false;

	u32 regval;



	if (!(adapter->flags & FLAG_HAS_HW_TIMESTAMP))

	if (!(adapter->flags & FLAG_HAS_HW_TIMESTAMP)) {

		NL_SET_ERR_MSG(extack, "No HW timestamp support");

		return -EINVAL;

	}



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:
@@ -3608,6 +3612,7 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter, 
	case HWTSTAMP_TX_ON:

		break;

	default:

		NL_SET_ERR_MSG(extack, "Unsupported TX HW timestamp type");

		return -ERANGE;

	}
@@ -3681,6 +3686,7 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter, 
		config->rx_filter = HWTSTAMP_FILTER_ALL;

		break;

	default:

		NL_SET_ERR_MSG(extack, "Unsupported RX HW timestamp filter");

		return -ERANGE;

	}
@@ -3693,7 +3699,8 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter, 
	ew32(TSYNCTXCTL, regval);

	if ((er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_ENABLED) !=

	    (regval & E1000_TSYNCTXCTL_ENABLED)) {

		e_err("Timesync Tx Control register not set as expected\n");

		NL_SET_ERR_MSG(extack,

			       "Timesync Tx Control register not set as expected");

		return -EAGAIN;

	}
@@ -3706,7 +3713,8 @@ static int e1000e_config_hwtstamp(struct e1000_adapter *adapter, 
				 E1000_TSYNCRXCTL_TYPE_MASK)) !=

	    (regval & (E1000_TSYNCRXCTL_ENABLED |

		       E1000_TSYNCRXCTL_TYPE_MASK))) {

		e_err("Timesync Rx Control register not set as expected\n");

		NL_SET_ERR_MSG(extack,

			       "Timesync Rx Control register not set as expected");

		return -EAGAIN;

	}
@@ -3901,6 +3909,7 @@ static void e1000e_systim_reset(struct e1000_adapter *adapter) 
{

	struct ptp_clock_info *info = &adapter->ptp_clock_info;

	struct e1000_hw *hw = &adapter->hw;

	struct netlink_ext_ack extack = {};

	unsigned long flags;

	u32 timinca;

	s32 ret_val;
@@ -3932,7 +3941,12 @@ static void e1000e_systim_reset(struct e1000_adapter *adapter) 
	spin_unlock_irqrestore(&adapter->systim_lock, flags);



	/* restore the previous hwtstamp configuration settings */

	e1000e_config_hwtstamp(adapter, &adapter->hwtstamp_config);

	ret_val = e1000e_config_hwtstamp(adapter, &adapter->hwtstamp_config,

					 &extack);

	if (ret_val) {

		if (extack._msg)

			e_err("%s\n", extack._msg);

	}

}



/**
@@ -6079,8 +6093,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
	return 0;

}



static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,

			   int cmd)

static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct mii_ioctl_data *data = if_mii(ifr);
@@ -6140,7 +6153,8 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, 
/**

 * e1000e_hwtstamp_set - control hardware time stamping

 * @netdev: network interface device structure

 * @ifr: interface request

 * @config: timestamp configuration

 * @extack: netlink extended ACK report

 *

 * Outgoing time stamping can be enabled and disabled. Play nice and

 * disable it when requested, although it shouldn't cause any overhead
@@ -6153,20 +6167,18 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, 
 * specified. Matching the kind of event packet is not supported, with the

 * exception of "all V2 events regardless of level 2 or 4".

 **/

static int e1000e_hwtstamp_set(struct net_device *netdev, struct ifreq *ifr)

static int e1000e_hwtstamp_set(struct net_device *netdev,

			       struct kernel_hwtstamp_config *config,

			       struct netlink_ext_ack *extack)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct hwtstamp_config config;

	int ret_val;



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

		return -EFAULT;



	ret_val = e1000e_config_hwtstamp(adapter, &config);

	ret_val = e1000e_config_hwtstamp(adapter, config, extack);

	if (ret_val)

		return ret_val;



	switch (config.rx_filter) {

	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:
@@ -6178,38 +6190,23 @@ static int e1000e_hwtstamp_set(struct net_device *netdev, struct ifreq *ifr) 
		 * by hardware so notify the caller the requested packets plus

		 * some others are time stamped.

		 */

		config.rx_filter = HWTSTAMP_FILTER_SOME;

		config->rx_filter = HWTSTAMP_FILTER_SOME;

		break;

	default:

		break;

	}



	return copy_to_user(ifr->ifr_data, &config,

			    sizeof(config)) ? -EFAULT : 0;

	return 0;

}



static int e1000e_hwtstamp_get(struct net_device *netdev, struct ifreq *ifr)

static int e1000e_hwtstamp_get(struct net_device *netdev,

			       struct kernel_hwtstamp_config *kernel_config)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);



	return copy_to_user(ifr->ifr_data, &adapter->hwtstamp_config,

			    sizeof(adapter->hwtstamp_config)) ? -EFAULT : 0;

}

	*kernel_config = adapter->hwtstamp_config;



static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)

{

	switch (cmd) {

	case SIOCGMIIPHY:

	case SIOCGMIIREG:

	case SIOCSMIIREG:

		return e1000_mii_ioctl(netdev, ifr, cmd);

	case SIOCSHWTSTAMP:

		return e1000e_hwtstamp_set(netdev, ifr);

	case SIOCGHWTSTAMP:

		return e1000e_hwtstamp_get(netdev, ifr);

	default:

		return -EOPNOTSUPP;

	}

	return 0;

}



static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
@@ -7349,6 +7346,8 @@ static const struct net_device_ops e1000e_netdev_ops = { 
	.ndo_set_features	= e1000_set_features,

	.ndo_fix_features	= e1000_fix_features,

	.ndo_features_check	= passthru_features_check,

	.ndo_hwtstamp_get	= e1000e_hwtstamp_get,

	.ndo_hwtstamp_set	= e1000e_hwtstamp_set,

};



/**