Commit 6ae022f8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'convert-net-drivers-to-ndo_hwtstamp-api-part-1' 

Vadim Fedorenko says:

====================
convert net drivers to ndo_hwtstamp API part 1

This is part 1 of patchset to convert drivers which support HW
timestamping to use .ndo_hwtstamp_get()/.ndo_hwtstamp_set() callbacks.
The new API uses netlink to communicate with user-space and have some
test coverage. Part 2 will contain another 6 patches from v1 of the
series.
There are some drivers left with old ioctl interface after this series:
- mlx5 driver be shortly converted by nVidia folks
- TI netcp ethss driver which needs separate series which I'll post
  after this one.
====================

Link: https://patch.msgid.link/20251016152515.3510991-1-vadim.fedorenko@linux.dev


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6117dc5c dc340406

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+2 −22
Original line number Diff line number Diff line
@@ -1754,27 +1754,6 @@ static int xgbe_set_mac_address(struct net_device *netdev, void *addr) 
	return 0;

}



static int xgbe_ioctl(struct net_device *netdev, struct ifreq *ifreq, int cmd)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	int ret;



	switch (cmd) {

	case SIOCGHWTSTAMP:

		ret = xgbe_get_hwtstamp_settings(pdata, ifreq);

		break;



	case SIOCSHWTSTAMP:

		ret = xgbe_set_hwtstamp_settings(pdata, ifreq);

		break;



	default:

		ret = -EOPNOTSUPP;

	}



	return ret;

}



static int xgbe_change_mtu(struct net_device *netdev, int mtu)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -2020,7 +1999,6 @@ static const struct net_device_ops xgbe_netdev_ops = { 
	.ndo_set_rx_mode	= xgbe_set_rx_mode,

	.ndo_set_mac_address	= xgbe_set_mac_address,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_eth_ioctl		= xgbe_ioctl,

	.ndo_change_mtu		= xgbe_change_mtu,

	.ndo_tx_timeout		= xgbe_tx_timeout,

	.ndo_get_stats64	= xgbe_get_stats64,
@@ -2033,6 +2011,8 @@ static const struct net_device_ops xgbe_netdev_ops = { 
	.ndo_fix_features	= xgbe_fix_features,

	.ndo_set_features	= xgbe_set_features,

	.ndo_features_check	= xgbe_features_check,

	.ndo_hwtstamp_get	= xgbe_get_hwtstamp_settings,

	.ndo_hwtstamp_set	= xgbe_set_hwtstamp_settings,

};



const struct net_device_ops *xgbe_get_netdev_ops(void)

drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c

+13 −15
Original line number Diff line number Diff line
@@ -157,26 +157,24 @@ void xgbe_tx_tstamp(struct work_struct *work) 
	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);

}



int xgbe_get_hwtstamp_settings(struct xgbe_prv_data *pdata, struct ifreq *ifreq)

int xgbe_get_hwtstamp_settings(struct net_device *netdev,

			       struct kernel_hwtstamp_config *config)

{

	if (copy_to_user(ifreq->ifr_data, &pdata->tstamp_config,

			 sizeof(pdata->tstamp_config)))

		return -EFAULT;

	struct xgbe_prv_data *pdata = netdev_priv(netdev);



	*config = pdata->tstamp_config;



	return 0;

}



int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata, struct ifreq *ifreq)

int xgbe_set_hwtstamp_settings(struct net_device *netdev,

			       struct kernel_hwtstamp_config *config,

			       struct netlink_ext_ack *extack)

{

	struct hwtstamp_config config;

	unsigned int mac_tscr;



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

		return -EFAULT;



	mac_tscr = 0;

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	unsigned int mac_tscr = 0;



	switch (config.tx_type) {

	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

		break;
@@ -188,7 +186,7 @@ int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata, struct ifreq *ifreq) 
		return -ERANGE;

	}



	switch (config.rx_filter) {

	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		break;
@@ -290,7 +288,7 @@ int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata, struct ifreq *ifreq) 


	xgbe_config_tstamp(pdata, mac_tscr);



	memcpy(&pdata->tstamp_config, &config, sizeof(config));

	pdata->tstamp_config = *config;



	return 0;

}

drivers/net/ethernet/amd/xgbe/xgbe.h

+6 −5
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ struct xgbe_prv_data { 
	spinlock_t tstamp_lock;

	struct ptp_clock_info ptp_clock_info;

	struct ptp_clock *ptp_clock;

	struct hwtstamp_config tstamp_config;

	struct kernel_hwtstamp_config tstamp_config;

	unsigned int tstamp_addend;

	struct work_struct tx_tstamp_work;

	struct sk_buff *tx_tstamp_skb;
@@ -1307,10 +1307,11 @@ void xgbe_update_tstamp_addend(struct xgbe_prv_data *pdata, 
void xgbe_set_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,

			  unsigned int nsec);

void xgbe_tx_tstamp(struct work_struct *work);

int xgbe_get_hwtstamp_settings(struct xgbe_prv_data *pdata,

			       struct ifreq *ifreq);

int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,

			       struct ifreq *ifreq);

int xgbe_get_hwtstamp_settings(struct net_device *netdev,

			       struct kernel_hwtstamp_config *config);

int xgbe_set_hwtstamp_settings(struct net_device *netdev,

			       struct kernel_hwtstamp_config *config,

			       struct netlink_ext_ack *extack);

void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,

			 struct sk_buff *skb,

			 struct xgbe_packet_data *packet);

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+15 −51
Original line number Diff line number Diff line
@@ -258,10 +258,15 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev) 
	(void)aq_nic_set_multicast_list(aq_nic, ndev);

}



#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)

static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic,

				   struct hwtstamp_config *config)

static int aq_ndev_hwtstamp_set(struct net_device *netdev,

				struct kernel_hwtstamp_config *config,

				struct netlink_ext_ack *extack)

{

	struct aq_nic_s *aq_nic = netdev_priv(netdev);



	if (!IS_REACHABLE(CONFIG_PTP_1588_CLOCK) || !aq_nic->aq_ptp)

		return -EOPNOTSUPP;



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:
@@ -290,59 +295,17 @@ static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic, 


	return aq_ptp_hwtstamp_config_set(aq_nic->aq_ptp, config);

}

#endif



static int aq_ndev_hwtstamp_set(struct aq_nic_s *aq_nic, struct ifreq *ifr)

{

	struct hwtstamp_config config;

#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)

	int ret_val;

#endif



	if (!aq_nic->aq_ptp)

		return -EOPNOTSUPP;



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

		return -EFAULT;

#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)

	ret_val = aq_ndev_config_hwtstamp(aq_nic, &config);

	if (ret_val)

		return ret_val;

#endif



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

	       -EFAULT : 0;

}



#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)

static int aq_ndev_hwtstamp_get(struct aq_nic_s *aq_nic, struct ifreq *ifr)

static int aq_ndev_hwtstamp_get(struct net_device *netdev,

				struct kernel_hwtstamp_config *config)

{

	struct hwtstamp_config config;

	struct aq_nic_s *aq_nic = netdev_priv(netdev);



	if (!aq_nic->aq_ptp)

		return -EOPNOTSUPP;



	aq_ptp_hwtstamp_config_get(aq_nic->aq_ptp, &config);

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

	       -EFAULT : 0;

}

#endif



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

{

	struct aq_nic_s *aq_nic = netdev_priv(netdev);



	switch (cmd) {

	case SIOCSHWTSTAMP:

		return aq_ndev_hwtstamp_set(aq_nic, ifr);



#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)

	case SIOCGHWTSTAMP:

		return aq_ndev_hwtstamp_get(aq_nic, ifr);

#endif

	}



	return -EOPNOTSUPP;

	aq_ptp_hwtstamp_config_get(aq_nic->aq_ptp, config);

	return 0;

}



static int aq_ndo_vlan_rx_add_vid(struct net_device *ndev, __be16 proto,
@@ -500,12 +463,13 @@ static const struct net_device_ops aq_ndev_ops = { 
	.ndo_set_mac_address = aq_ndev_set_mac_address,

	.ndo_set_features = aq_ndev_set_features,

	.ndo_fix_features = aq_ndev_fix_features,

	.ndo_eth_ioctl = aq_ndev_ioctl,

	.ndo_vlan_rx_add_vid = aq_ndo_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid = aq_ndo_vlan_rx_kill_vid,

	.ndo_setup_tc = aq_ndo_setup_tc,

	.ndo_bpf = aq_xdp,

	.ndo_xdp_xmit = aq_xdp_xmit,

	.ndo_hwtstamp_get = aq_ndev_hwtstamp_get,

	.ndo_hwtstamp_set = aq_ndev_hwtstamp_set,

};



static int __init aq_ndev_init_module(void)

drivers/net/ethernet/aquantia/atlantic/aq_ptp.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct ptp_tx_timeout { 


struct aq_ptp_s {

	struct aq_nic_s *aq_nic;

	struct hwtstamp_config hwtstamp_config;

	struct kernel_hwtstamp_config hwtstamp_config;

	spinlock_t ptp_lock;

	spinlock_t ptp_ring_lock;

	struct ptp_clock *ptp_clock;
@@ -567,7 +567,7 @@ static void aq_ptp_rx_hwtstamp(struct aq_ptp_s *aq_ptp, struct skb_shared_hwtsta 
}



void aq_ptp_hwtstamp_config_get(struct aq_ptp_s *aq_ptp,

				struct hwtstamp_config *config)

				struct kernel_hwtstamp_config *config)

{

	*config = aq_ptp->hwtstamp_config;

}
@@ -588,7 +588,7 @@ static void aq_ptp_prepare_filters(struct aq_ptp_s *aq_ptp) 
}



int aq_ptp_hwtstamp_config_set(struct aq_ptp_s *aq_ptp,

			       struct hwtstamp_config *config)

			       struct kernel_hwtstamp_config *config)

{

	struct aq_nic_s *aq_nic = aq_ptp->aq_nic;

	const struct aq_hw_ops *hw_ops;