| Message ID | 20231019-feature_ptp_netnext-v6-12-71affc27b0e5@bootlin.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Make timestamping selectable | expand |
On Thu, 19 Oct 2023 16:29:27 +0200 Kory Maincent wrote: > Replace hwtstamp_source which is only used by the kernel_hwtstamp_config > structure by the more widely use timestamp_layer structure. This is done > to prepare the support of selectable timestamping source. > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> Temporarily breaks the build :( net/core/dev_ioctl.c:335:44: error: use of undeclared identifier 'NET_TIMESTAMPING'; did you mean 'NO_TIMESTAMPING'? cfg->source = phy_ts ? PHY_TIMESTAMPING : NET_TIMESTAMPING; ^~~~~~~~~~~~~~~~ NO_TIMESTAMPING include/uapi/linux/net_tstamp.h:18:2: note: 'NO_TIMESTAMPING' declared here NO_TIMESTAMPING, ^
On Fri, 20 Oct 2023 18:47:14 -0700 Jakub Kicinski <kuba@kernel.org> wrote: > On Thu, 19 Oct 2023 16:29:27 +0200 Kory Maincent wrote: > > Replace hwtstamp_source which is only used by the kernel_hwtstamp_config > > structure by the more widely use timestamp_layer structure. This is done > > to prepare the support of selectable timestamping source. > > > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> > > Temporarily breaks the build :( > > net/core/dev_ioctl.c:335:44: error: use of undeclared identifier > 'NET_TIMESTAMPING'; did you mean 'NO_TIMESTAMPING'? cfg->source = phy_ts ? > PHY_TIMESTAMPING : NET_TIMESTAMPING; ^~~~~~~~~~~~~~~~ > NO_TIMESTAMPING > include/uapi/linux/net_tstamp.h:18:2: note: 'NO_TIMESTAMPING' declared here > NO_TIMESTAMPING, > ^ Doh, I forgot to run the in-between patch build procedures. Sorry about that. Köry
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 8e4101628fbd..b219259600e7 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -470,15 +470,15 @@ static int lan966x_port_hwtstamp_set(struct net_device *dev, struct lan966x_port *port = netdev_priv(dev); int err; - if (cfg->source != HWTSTAMP_SOURCE_NETDEV && - cfg->source != HWTSTAMP_SOURCE_PHYLIB) + if (cfg->source != MAC_TIMESTAMPING && + cfg->source != PHY_TIMESTAMPING) return -EOPNOTSUPP; err = lan966x_ptp_setup_traps(port, cfg); if (err) return err; - if (cfg->source == HWTSTAMP_SOURCE_NETDEV) { + if (cfg->source == MAC_TIMESTAMPING) { if (!port->lan966x->ptp) return -EOPNOTSUPP; diff --git a/include/linux/net_tstamp.h b/include/linux/net_tstamp.h index eb01c37e71e0..bb289c2ad376 100644 --- a/include/linux/net_tstamp.h +++ b/include/linux/net_tstamp.h @@ -5,11 +5,6 @@ #include <uapi/linux/net_tstamp.h> -enum hwtstamp_source { - HWTSTAMP_SOURCE_NETDEV, - HWTSTAMP_SOURCE_PHYLIB, -}; - /** * struct kernel_hwtstamp_config - Kernel copy of struct hwtstamp_config * @@ -20,8 +15,8 @@ enum hwtstamp_source { * a legacy implementation of a lower driver * @copied_to_user: request was passed to a legacy implementation which already * copied the ioctl request back to user space - * @source: indication whether timestamps should come from the netdev or from - * an attached phylib PHY + * @source: indication whether timestamps should come from software, the netdev + * or from an attached phylib PHY * * Prefer using this structure for in-kernel processing of hardware * timestamping configuration, over the inextensible struct hwtstamp_config @@ -33,7 +28,7 @@ struct kernel_hwtstamp_config { int rx_filter; struct ifreq *ifr; bool copied_to_user; - enum hwtstamp_source source; + enum timestamping_layer source; }; static inline void hwtstamp_config_to_kernel(struct kernel_hwtstamp_config *kernel_cfg, diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index cb60b0b9c31d..57d9f25f16b8 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -332,7 +332,7 @@ int dev_set_hwtstamp_phylib(struct net_device *dev, bool changed = false; int err; - cfg->source = phy_ts ? HWTSTAMP_SOURCE_PHYLIB : HWTSTAMP_SOURCE_NETDEV; + cfg->source = phy_ts ? PHY_TIMESTAMPING : NET_TIMESTAMPING; if (phy_ts && (dev->priv_flags & IFF_SEE_ALL_HWTSTAMP_REQUESTS)) { err = ops->ndo_hwtstamp_get(dev, &old_cfg);
Replace hwtstamp_source which is only used by the kernel_hwtstamp_config structure by the more widely use timestamp_layer structure. This is done to prepare the support of selectable timestamping source. Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> --- Change in v6: - Follow timestamping layer naming update. --- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 6 +++--- include/linux/net_tstamp.h | 11 +++-------- net/core/dev_ioctl.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-)