| Message ID | 20230713121907.3249291-8-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Introduce ndo_hwtstamp_get() and ndo_hwtstamp_set() | expand |
> -----Original Message----- > From: Vladimir Oltean <vladimir.oltean@nxp.com> > Sent: 2023年7月13日 20:19 > To: netdev@vger.kernel.org > Cc: David S. Miller <davem@davemloft.net>; Eric Dumazet > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com>; Andrew Lunn <andrew@lunn.ch>; Florian Fainelli > <f.fainelli@gmail.com>; Maxim Georgiev <glipus@gmail.com>; Horatiu Vultur > <horatiu.vultur@microchip.com>; Köry Maincent > <kory.maincent@bootlin.com>; Maxime Chevallier > <maxime.chevallier@bootlin.com>; Richard Cochran > <richardcochran@gmail.com>; Vadim Fedorenko > <vadim.fedorenko@linux.dev>; Gerhard Engleder > <gerhard@engleder-embedded.com>; Hangbin Liu <liuhangbin@gmail.com>; > Russell King <linux@armlinux.org.uk>; Heiner Kallweit > <hkallweit1@gmail.com>; Jacob Keller <jacob.e.keller@intel.com>; Jay > Vosburgh <j.vosburgh@gmail.com>; Andy Gospodarek <andy@greyhouse.net>; > Wei Fang <wei.fang@nxp.com>; Shenwei Wang <shenwei.wang@nxp.com>; > Clark Wang <xiaoning.wang@nxp.com>; dl-linux-imx <linux-imx@nxp.com>; > UNGLinuxDriver@microchip.com; Lars Povlsen <lars.povlsen@microchip.com>; > Steen Hegelund <Steen.Hegelund@microchip.com>; Daniel Machon > <daniel.machon@microchip.com>; Simon Horman > <simon.horman@corigine.com>; Casper Andersson > <casper.casan@gmail.com>; Sergey Organov <sorganov@gmail.com>; > linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org > Subject: [PATCH v7 net-next 07/10] net: fec: delete fec_ptp_disable_hwts() > > Commit 340746398b67 ("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: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > Changes in v7: > - Patch is new > > drivers/net/ethernet/freescale/fec.h | 1 - > drivers/net/ethernet/freescale/fec_main.c | 5 +---- > drivers/net/ethernet/freescale/fec_ptp.c | 12 ------------ > 3 files changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec.h > b/drivers/net/ethernet/freescale/fec.h > index d4ae0e7c0a44..e273129d44c9 100644 > --- a/drivers/net/ethernet/freescale/fec.h > +++ b/drivers/net/ethernet/freescale/fec.h > @@ -690,7 +690,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); > diff --git a/drivers/net/ethernet/freescale/fec_main.c > b/drivers/net/ethernet/freescale/fec_main.c > index c0b68fc3ec8b..08744e8164e3 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -3878,11 +3878,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 (!fep->bufdesc_ex) > return -EOPNOTSUPP; > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c > b/drivers/net/ethernet/freescale/fec_ptp.c > index 3f53b8ae57dd..55cf98557e02 100644 > --- a/drivers/net/ethernet/freescale/fec_ptp.c > +++ b/drivers/net/ethernet/freescale/fec_ptp.c > @@ -606,18 +606,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) > { > -- > 2.34.1 Thanks! Reviewed-by: Wei Fang < wei.fang@nxp.com >
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index d4ae0e7c0a44..e273129d44c9 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -690,7 +690,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); diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index c0b68fc3ec8b..08744e8164e3 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3878,11 +3878,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 (!fep->bufdesc_ex) return -EOPNOTSUPP; diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 3f53b8ae57dd..55cf98557e02 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -606,18 +606,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) {
Commit 340746398b67 ("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: Vladimir Oltean <vladimir.oltean@nxp.com> --- Changes in v7: - Patch is new drivers/net/ethernet/freescale/fec.h | 1 - drivers/net/ethernet/freescale/fec_main.c | 5 +---- drivers/net/ethernet/freescale/fec_ptp.c | 12 ------------ 3 files changed, 1 insertion(+), 17 deletions(-)