Commit 446e2305 authored by Kory Maincent's avatar Kory Maincent Committed by David S. Miller
Browse files

net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config 



The PHYs hwtstamp callback are still getting the timestamp config from
ifreq and using copy_from/to_user.
Get rid of these functions by using timestamp configuration in parameter.
This also allow to move on to kernel_hwtstamp_config and be similar to
net devices using the new ndo_hwstamp_get/set.

This adds the possibility to manipulate the timestamp configuration
from the kernel which was not possible with the copy_from/to_user.

Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18de1e51

drivers/net/phy/bcm-phy-ptp.c

+6 −9
Original line number Diff line number Diff line
@@ -782,16 +782,13 @@ static void bcm_ptp_txtstamp(struct mii_timestamper *mii_ts, 
}



static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts,

			    struct ifreq *ifr)

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack)

{

	struct bcm_ptp_private *priv = mii2priv(mii_ts);

	struct hwtstamp_config cfg;

	u16 mode, ctrl;



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

		return -EFAULT;



	switch (cfg.rx_filter) {

	switch (cfg->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		priv->hwts_rx = false;

		break;
@@ -804,14 +801,14 @@ static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts, 
	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		priv->hwts_rx = true;

		break;

	default:

		return -ERANGE;

	}



	priv->tx_type = cfg.tx_type;

	priv->tx_type = cfg->tx_type;



	ctrl  = priv->hwts_rx ? SLICE_RX_EN : 0;

	ctrl |= priv->tx_type != HWTSTAMP_TX_OFF ? SLICE_TX_EN : 0;
@@ -840,7 +837,7 @@ static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts, 
	/* purge existing data */

	skb_queue_purge(&priv->tx_queue);



	return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;

	return 0;

}



static int bcm_ptp_ts_info(struct mii_timestamper *mii_ts,

drivers/net/phy/dp83640.c

+11 −13
Original line number Diff line number Diff line
@@ -1207,22 +1207,20 @@ static irqreturn_t dp83640_handle_interrupt(struct phy_device *phydev) 
	return IRQ_HANDLED;

}



static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr)

static int dp83640_hwtstamp(struct mii_timestamper *mii_ts,

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack)

{

	struct dp83640_private *dp83640 =

		container_of(mii_ts, struct dp83640_private, mii_ts);

	struct hwtstamp_config cfg;

	u16 txcfg0, rxcfg0;



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

		return -EFAULT;



	if (cfg.tx_type < 0 || cfg.tx_type > HWTSTAMP_TX_ONESTEP_SYNC)

	if (cfg->tx_type < 0 || cfg->tx_type > HWTSTAMP_TX_ONESTEP_SYNC)

		return -ERANGE;



	dp83640->hwts_tx_en = cfg.tx_type;

	dp83640->hwts_tx_en = cfg->tx_type;



	switch (cfg.rx_filter) {

	switch (cfg->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		dp83640->hwts_rx_en = 0;

		dp83640->layer = 0;
@@ -1234,7 +1232,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4;

		dp83640->version = PTP_CLASS_V1;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
@@ -1242,7 +1240,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
@@ -1250,7 +1248,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L2;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:
@@ -1258,7 +1256,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4 | PTP_CLASS_L2;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		break;

	default:

		return -ERANGE;
@@ -1292,7 +1290,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 


	mutex_unlock(&dp83640->clock->extreg_lock);



	return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;

	return 0;

}



static void rx_timestamp_work(struct work_struct *work)

drivers/net/phy/micrel.c

+17 −21
Original line number Diff line number Diff line
@@ -2395,24 +2395,22 @@ static void lan8814_flush_fifo(struct phy_device *phydev, bool egress) 
	lanphy_read_page_reg(phydev, 5, PTP_TSU_INT_STS);

}



static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr)

static int lan8814_hwtstamp(struct mii_timestamper *mii_ts,

			    struct kernel_hwtstamp_config *config,

			    struct netlink_ext_ack *extack)

{

	struct kszphy_ptp_priv *ptp_priv =

			  container_of(mii_ts, struct kszphy_ptp_priv, mii_ts);

	struct phy_device *phydev = ptp_priv->phydev;

	struct lan8814_shared_priv *shared = phydev->shared->priv;

	struct lan8814_ptp_rx_ts *rx_ts, *tmp;

	struct hwtstamp_config config;

	int txcfg = 0, rxcfg = 0;

	int pkt_ts_enable;



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

		return -EFAULT;

	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	ptp_priv->hwts_tx_type = config.tx_type;

	ptp_priv->rx_filter = config.rx_filter;



	switch (config.rx_filter) {

	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		ptp_priv->layer = 0;

		ptp_priv->version = 0;
@@ -2458,13 +2456,13 @@ static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		lanphy_write_page_reg(ptp_priv->phydev, 5, PTP_TX_MOD,

				      PTP_TX_MOD_TX_PTP_SYNC_TS_INSERT_);



	if (config.rx_filter != HWTSTAMP_FILTER_NONE)

	if (config->rx_filter != HWTSTAMP_FILTER_NONE)

		lan8814_config_ts_intr(ptp_priv->phydev, true);

	else

		lan8814_config_ts_intr(ptp_priv->phydev, false);



	mutex_lock(&shared->shared_lock);

	if (config.rx_filter != HWTSTAMP_FILTER_NONE)

	if (config->rx_filter != HWTSTAMP_FILTER_NONE)

		shared->ref++;

	else

		shared->ref--;
@@ -2488,7 +2486,7 @@ static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
	lan8814_flush_fifo(ptp_priv->phydev, false);

	lan8814_flush_fifo(ptp_priv->phydev, true);



	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0;

	return 0;

}



static void lan8814_txtstamp(struct mii_timestamper *mii_ts,
@@ -3703,21 +3701,19 @@ static void lan8841_ptp_enable_processing(struct kszphy_ptp_priv *ptp_priv, 
#define LAN8841_PTP_TX_TIMESTAMP_EN		443

#define LAN8841_PTP_TX_MOD			445



static int lan8841_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr)

static int lan8841_hwtstamp(struct mii_timestamper *mii_ts,

			    struct kernel_hwtstamp_config *config,

			    struct netlink_ext_ack *extack)

{

	struct kszphy_ptp_priv *ptp_priv = container_of(mii_ts, struct kszphy_ptp_priv, mii_ts);

	struct phy_device *phydev = ptp_priv->phydev;

	struct hwtstamp_config config;

	int txcfg = 0, rxcfg = 0;

	int pkt_ts_enable;



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

		return -EFAULT;

	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	ptp_priv->hwts_tx_type = config.tx_type;

	ptp_priv->rx_filter = config.rx_filter;



	switch (config.rx_filter) {

	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		ptp_priv->layer = 0;

		ptp_priv->version = 0;
@@ -3771,13 +3767,13 @@ static int lan8841_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 


	/* Now enable/disable the timestamping */

	lan8841_ptp_enable_processing(ptp_priv,

				      config.rx_filter != HWTSTAMP_FILTER_NONE);

				      config->rx_filter != HWTSTAMP_FILTER_NONE);



	skb_queue_purge(&ptp_priv->tx_queue);



	lan8841_ptp_flush_fifo(ptp_priv);



	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0;

	return 0;

}



static bool lan8841_rxtstamp(struct mii_timestamper *mii_ts,

drivers/net/phy/mscc/mscc_ptp.c

+8 −10
Original line number Diff line number Diff line
@@ -1045,19 +1045,17 @@ static void vsc85xx_ts_reset_fifo(struct phy_device *phydev) 
			     val);

}



static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr)

static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts,

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack)

{

	struct vsc8531_private *vsc8531 =

		container_of(mii_ts, struct vsc8531_private, mii_ts);

	struct phy_device *phydev = vsc8531->ptp->phydev;

	struct hwtstamp_config cfg;

	bool one_step = false;

	u32 val;



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

		return -EFAULT;



	switch (cfg.tx_type) {

	switch (cfg->tx_type) {

	case HWTSTAMP_TX_ONESTEP_SYNC:

		one_step = true;

		break;
@@ -1069,9 +1067,9 @@ static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		return -ERANGE;

	}



	vsc8531->ptp->tx_type = cfg.tx_type;

	vsc8531->ptp->tx_type = cfg->tx_type;



	switch (cfg.rx_filter) {

	switch (cfg->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		break;

	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
@@ -1084,7 +1082,7 @@ static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
		return -ERANGE;

	}



	vsc8531->ptp->rx_filter = cfg.rx_filter;

	vsc8531->ptp->rx_filter = cfg->rx_filter;



	mutex_lock(&vsc8531->ts_lock);
@@ -1132,7 +1130,7 @@ static int vsc85xx_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) 
	vsc8531->ptp->configured = 1;

	mutex_unlock(&vsc8531->ts_lock);



	return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;

	return 0;

}



static int vsc85xx_ts_info(struct mii_timestamper *mii_ts,

drivers/net/phy/nxp-c45-tja11xx.c

+7 −10
Original line number Diff line number Diff line
@@ -1022,24 +1022,21 @@ static bool nxp_c45_rxtstamp(struct mii_timestamper *mii_ts, 
}



static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts,

			    struct ifreq *ifreq)

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack)

{

	struct nxp_c45_phy *priv = container_of(mii_ts, struct nxp_c45_phy,

						mii_ts);

	struct phy_device *phydev = priv->phydev;

	const struct nxp_c45_phy_data *data;

	struct hwtstamp_config cfg;



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

		return -EFAULT;



	if (cfg.tx_type < 0 || cfg.tx_type > HWTSTAMP_TX_ON)

	if (cfg->tx_type < 0 || cfg->tx_type > HWTSTAMP_TX_ON)

		return -ERANGE;



	data = nxp_c45_get_data(phydev);

	priv->hwts_tx = cfg.tx_type;

	priv->hwts_tx = cfg->tx_type;



	switch (cfg.rx_filter) {

	switch (cfg->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		priv->hwts_rx = 0;

		break;
@@ -1047,7 +1044,7 @@ static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, 
	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:

		priv->hwts_rx = 1;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;

		cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;

		break;

	default:

		return -ERANGE;
@@ -1074,7 +1071,7 @@ static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, 
		nxp_c45_clear_reg_field(phydev, &data->regmap->irq_egr_ts_en);



nxp_c45_no_ptp_irq:

	return copy_to_user(ifreq->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;

	return 0;

}



static int nxp_c45_ts_info(struct mii_timestamper *mii_ts,