Commit 547b006d authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: fec: delete fec_ptp_disable_hwts() 



Commit 34074639 ("net: fec: fix hardware time stamping by external
devices") was overly cautious with calling fec_ptp_disable_hwts() when
cmd == SIOCSHWTSTAMP and use_fec_hwts == false, because use_fec_hwts is
based on a runtime invariant (phy_has_hwtstamp()). Thus, if use_fec_hwts
is false, then fep->hwts_tx_en and fep->hwts_rx_en cannot be changed at
runtime; their values depend on the initial memory allocation, which
already sets them to zeroes.

If the core will ever gain support for switching timestamping layers,
it will arrange for a more organized calling convention and disable
timestamping in the previous layer as a first step. This means that the
code in the FEC driver is not necessary in any case.

The purpose of this change is to arrange the phy_has_hwtstamp() code in
a way in which it can be refactored away into generic logic.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarWei Fang <wei.fang@nxp.com>
Link: https://lore.kernel.org/r/20230801142824.1772134-8-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ef5eb9c5

drivers/net/ethernet/freescale/fec.h

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ struct fec_enet_private { 
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 kernel_hwtstamp_config *config,

		struct netlink_ext_ack *extack);

void fec_ptp_get(struct net_device *ndev, struct kernel_hwtstamp_config *config);

drivers/net/ethernet/freescale/fec_main.c

+1 −4
Original line number Diff line number Diff line
@@ -3895,11 +3895,8 @@ static int fec_hwtstamp_set(struct net_device *ndev, 
	struct fec_enet_private *fep = netdev_priv(ndev);

	struct phy_device *phydev = ndev->phydev;



	if (phy_has_hwtstamp(phydev)) {

		fec_ptp_disable_hwts(ndev);



	if (phy_has_hwtstamp(phydev))

		return phy_mii_ioctl(phydev, config->ifr, SIOCSHWTSTAMP);

	}



	if (!netif_running(ndev))

		return -EINVAL;

drivers/net/ethernet/freescale/fec_ptp.c

+0 −12
Original line number Diff line number Diff line
@@ -605,18 +605,6 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, 
	}

}



/**

 * fec_ptp_disable_hwts - disable hardware time stamping

 * @ndev: pointer to net_device

 */

void fec_ptp_disable_hwts(struct net_device *ndev)

{

	struct fec_enet_private *fep = netdev_priv(ndev);



	fep->hwts_tx_en = 0;

	fep->hwts_rx_en = 0;

}



int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config *config,

		struct netlink_ext_ack *extack)

{