* [PATCH net-next v14 00/14] net: Make timestamping selectable
@ 2024-06-04 10:36 Kory Maincent
2024-06-04 10:36 ` [PATCH net-next v14 01/14] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Kory Maincent
2024-06-04 10:38 ` [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
0 siblings, 2 replies; 6+ messages in thread
From: Kory Maincent @ 2024-06-04 10:36 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list,
Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran,
Radu Pirea, Jay Vosburgh, Andy Gospodarek, Nicolas Ferre,
Claudiu Beznea, Willem de Bruijn, Jonathan Corbet, Horatiu Vultur,
UNGLinuxDriver, Simon Horman, Vladimir Oltean
Cc: Thomas Petazzoni, netdev, linux-kernel, linux-doc,
Maxime Chevallier, Rahul Rameshbabu, Kory Maincent,
Willem de Bruijn, Alexandra Winter
Up until now, there was no way to let the user select the hardware
PTP provider at which time stamping occurs. The stack assumed that PHY time
stamping is always preferred, but some MAC/PHY combinations were buggy.
This series updates the default MAC/PHY default timestamping and aims to
allow the user to select the desired hwtstamp provider administratively.
Changes in v14:
- Add back an EXPORT_SYMBOL() missing.
- Link to v13: https://lore.kernel.org/r/20240529-feature_ptp_netnext-v13-0-6eda4d40fa4f@bootlin.com
Changes in v13:
- Add PTP builtin code to fix build errors when building PTP as a module.
- Fix error spotted by smatch and sparse.
- Link to v12: https://lore.kernel.org/r/20240430-feature_ptp_netnext-v12-0-2c5f24b6a914@bootlin.com
Changes in v12:
- Add missing return description in the kdoc.
- Fix few nit.
- Link to v11: https://lore.kernel.org/r/20240422-feature_ptp_netnext-v11-0-f14441f2a1d8@bootlin.com
Changes in v11:
- Add netlink examples.
- Remove a change of my out of tree marvell_ptp patch in the patch series.
- Remove useless extern.
- Link to v10: https://lore.kernel.org/r/20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com
Changes in v10:
- Move declarations to net/core/dev.h instead of netdevice.h
- Add netlink documentation.
- Add ETHTOOL_A_TSINFO_GHWTSTAMP netlink attributes instead of a bit in
ETHTOOL_A_TSINFO_TIMESTAMPING bitset.
- Send "Move from simple ida to xarray" patch standalone.
- Add tsinfo ntf command.
- Add rcu_lock protection mechanism to avoid memory leak.
- Fixed doc and kdoc issue.
- Link to v9: https://lore.kernel.org/r/20240226-feature_ptp_netnext-v9-0-455611549f21@bootlin.com
Changes in v9:
- Remove the RFC prefix.
- Correct few NIT fixes.
- Link to v8: https://lore.kernel.org/r/20240216-feature_ptp_netnext-v8-0-510f42f444fb@bootlin.com
Changes in v8:
- Drop the 6 first patch as they are now merged.
- Change the full implementation to not be based on the hwtstamp layer
(MAC/PHY) but on the hwtstamp provider which mean a ptp clock and a
phc qualifier.
- Made some patch to prepare the new implementation.
- Expand netlink tsinfo instead of a new ts command for new hwtstamp
configuration uAPI and for dumping tsinfo of specific hwtstamp provider.
- Link to v7: https://lore.kernel.org/r/20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com
Changes in v7:
- Fix a temporary build error.
- Link to v6: https://lore.kernel.org/r/20231019-feature_ptp_netnext-v6-0-71affc27b0e5@bootlin.com
Changes in v6:
- Few fixes from the reviews.
- Replace the allowlist to default_timestamp flag to know which phy is
using old API behavior.
- Rename the timestamping layer enum values.
- Move to a simple enum instead of the mix between enum and bitfield.
- Update ts_info and ts-set in software timestamping case.
Changes in v5:
- Update to ndo_hwstamp_get/set. This bring several new patches.
- Add few patches to make the glue.
- Convert macb to ndo_hwstamp_get/set.
- Add netlink specs description of new ethtool commands.
- Removed netdev notifier.
- Split the patches that expose the timestamping to userspace to separate
the core and ethtool development.
- Add description of software timestamping.
- Convert PHYs hwtstamp callback to use kernel_hwtstamp_config.
Changes in v4:
- Move on to ethtool netlink instead of ioctl.
- Add a netdev notifier to allow packet trapping by the MAC in case of PHY
time stamping.
- Add a PHY whitelist to not break the old PHY default time-stamping
preference API.
Changes in v3:
- Expose the PTP choice to ethtool instead of sysfs.
You can test it with the ethtool source on branch feature_ptp of:
https://github.com/kmaincent/ethtool
- Added a devicetree binding to select the preferred timestamp.
Changes in v2:
- Move selected_timestamping_layer variable of the concerned patch.
- Use sysfs_streq instead of strmcmp.
- Use the PHY timestamp only if available.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Kory Maincent (14):
net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask
net: Move dev_set_hwtstamp_phylib to net/core/dev.h
net: Make dev_get_hwtstamp_phylib accessible
net: Make net_hwtstamp_validate accessible
net: Change the API of PHY default timestamp to MAC
net: net_tstamp: Add unspec field to hwtstamp_source enumeration
net: Add struct kernel_ethtool_ts_info
ptp: Add phc source and helpers to register specific PTP clock or get information
net: Add the possibility to support a selected hwtstamp in netdevice
net: netdevsim: ptp_mock: Convert to netdev_ptp_clock_register
net: macb: Convert to netdev_ptp_clock_register
net: ptp: Move ptp_clock_index() to builtin symbol
net: ethtool: tsinfo: Add support for hwtstamp provider and get/set hwtstamp config
netlink: specs: tsinfo: Enhance netlink attributes and add a set command
Documentation/netlink/specs/ethtool.yaml | 43 +-
Documentation/networking/ethtool-netlink.rst | 38 +-
Documentation/networking/timestamping.rst | 35 +-
drivers/net/bonding/bond_main.c | 4 +-
drivers/net/can/dev/dev.c | 2 +-
drivers/net/can/peak_canfd/peak_canfd.c | 2 +-
drivers/net/can/usb/gs_usb.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 2 +-
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 2 +-
drivers/net/dsa/microchip/ksz_ptp.c | 2 +-
drivers/net/dsa/microchip/ksz_ptp.h | 2 +-
drivers/net/dsa/mv88e6xxx/hwtstamp.c | 2 +-
drivers/net/dsa/mv88e6xxx/hwtstamp.h | 4 +-
drivers/net/dsa/ocelot/felix.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.h | 2 +-
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 2 +-
.../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
drivers/net/ethernet/broadcom/tg3.c | 2 +-
drivers/net/ethernet/cadence/macb.h | 2 +-
drivers/net/ethernet/cadence/macb_main.c | 4 +-
drivers/net/ethernet/cadence/macb_ptp.c | 2 +-
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +-
.../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 2 +-
drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +-
drivers/net/ethernet/engleder/tsnep_ethtool.c | 2 +-
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +-
.../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 +-
.../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 2 +-
drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +-
.../net/ethernet/fungible/funeth/funeth_ethtool.c | 2 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 2 +-
drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-
drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +-
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
.../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +-
.../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +-
.../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 4 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 10 +-
drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +-
.../ethernet/microchip/lan966x/lan966x_ethtool.c | 2 +-
.../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 2 +-
drivers/net/ethernet/mscc/ocelot_net.c | 2 +-
drivers/net/ethernet/mscc/ocelot_ptp.c | 2 +-
.../net/ethernet/pensando/ionic/ionic_ethtool.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ptp.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ptp.h | 2 +-
drivers/net/ethernet/renesas/ravb_main.c | 2 +-
drivers/net/ethernet/renesas/rswitch.c | 2 +-
drivers/net/ethernet/sfc/ethtool.c | 2 +-
drivers/net/ethernet/sfc/falcon/nic.h | 2 +-
drivers/net/ethernet/sfc/ptp.c | 2 +-
drivers/net/ethernet/sfc/ptp.h | 5 +-
drivers/net/ethernet/sfc/siena/ethtool.c | 2 +-
drivers/net/ethernet/sfc/siena/ptp.c | 2 +-
drivers/net/ethernet/sfc/siena/ptp.h | 4 +-
.../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 +-
drivers/net/ethernet/ti/cpsw_ethtool.c | 4 +-
drivers/net/ethernet/ti/cpsw_priv.h | 2 +-
drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 2 +-
drivers/net/ethernet/ti/netcp_ethss.c | 4 +-
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
drivers/net/macvlan.c | 2 +-
drivers/net/netdevsim/ethtool.c | 2 +-
drivers/net/netdevsim/netdev.c | 19 +-
drivers/net/phy/bcm-phy-ptp.c | 5 +-
drivers/net/phy/dp83640.c | 4 +-
drivers/net/phy/micrel.c | 10 +-
drivers/net/phy/mscc/mscc_ptp.c | 5 +-
drivers/net/phy/nxp-c45-tja11xx.c | 5 +-
drivers/net/phy/phy_device.c | 11 +
drivers/ptp/Makefile | 5 +
drivers/ptp/ptp_clock.c | 39 +-
drivers/ptp/ptp_clock_consumer.c | 172 ++++++
drivers/ptp/ptp_ines.c | 2 +-
drivers/ptp/ptp_mock.c | 4 +-
drivers/ptp/ptp_private.h | 7 +
drivers/s390/net/qeth_ethtool.c | 2 +-
include/linux/can/dev.h | 2 +-
include/linux/ethtool.h | 29 +-
include/linux/mii_timestamper.h | 2 +-
include/linux/net_tstamp.h | 16 +
include/linux/netdevice.h | 8 +-
include/linux/phy.h | 21 +-
include/linux/ptp_clock_kernel.h | 178 ++++++
include/linux/ptp_mock.h | 4 +-
include/net/dsa.h | 2 +-
include/soc/mscc/ocelot.h | 2 +-
include/uapi/linux/ethtool_netlink.h | 14 +
include/uapi/linux/net_tstamp.h | 11 +
net/8021q/vlan_dev.c | 2 +-
net/core/dev.h | 7 +
net/core/dev_ioctl.c | 56 +-
net/core/timestamping.c | 49 +-
net/dsa/user.c | 2 +-
net/ethtool/common.c | 40 +-
net/ethtool/common.h | 5 +-
net/ethtool/ioctl.c | 12 +-
net/ethtool/netlink.c | 16 +-
net/ethtool/netlink.h | 6 +-
net/ethtool/tsinfo.c | 641 ++++++++++++++++++++-
net/sched/sch_taprio.c | 2 +-
122 files changed, 1520 insertions(+), 202 deletions(-)
---
base-commit: caaa6a85f0658de87358e08fb9e3768d2daf5e01
change-id: 20231011-feature_ptp_netnext-3f278578e84b
Best regards,
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v14 01/14] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask
2024-06-04 10:36 [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
@ 2024-06-04 10:36 ` Kory Maincent
2024-06-04 10:38 ` [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
1 sibling, 0 replies; 6+ messages in thread
From: Kory Maincent @ 2024-06-04 10:36 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list,
Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran,
Radu Pirea, Jay Vosburgh, Andy Gospodarek, Nicolas Ferre,
Claudiu Beznea, Willem de Bruijn, Jonathan Corbet, Horatiu Vultur,
UNGLinuxDriver, Simon Horman, Vladimir Oltean
Cc: Thomas Petazzoni, netdev, linux-kernel, linux-doc,
Maxime Chevallier, Rahul Rameshbabu, Kory Maincent,
Willem de Bruijn
Timestamping software or hardware flags are often used as a group,
therefore adding these masks will ease future use.
I did not use SOF_TIMESTAMPING_SYS_HARDWARE flag as it is deprecated and
not used at all.
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Changes in v7:
- Move the masks out of uapi to include/linux/net_tstamp.h
Changes in v9:
- Fix commit message typos
---
include/linux/net_tstamp.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/linux/net_tstamp.h b/include/linux/net_tstamp.h
index eb01c37e71e0..3799c79b6c83 100644
--- a/include/linux/net_tstamp.h
+++ b/include/linux/net_tstamp.h
@@ -5,6 +5,14 @@
#include <uapi/linux/net_tstamp.h>
+#define SOF_TIMESTAMPING_SOFTWARE_MASK (SOF_TIMESTAMPING_RX_SOFTWARE | \
+ SOF_TIMESTAMPING_TX_SOFTWARE | \
+ SOF_TIMESTAMPING_SOFTWARE)
+
+#define SOF_TIMESTAMPING_HARDWARE_MASK (SOF_TIMESTAMPING_RX_HARDWARE | \
+ SOF_TIMESTAMPING_TX_HARDWARE | \
+ SOF_TIMESTAMPING_RAW_HARDWARE)
+
enum hwtstamp_source {
HWTSTAMP_SOURCE_NETDEV,
HWTSTAMP_SOURCE_PHYLIB,
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v14 00/14] net: Make timestamping selectable
2024-06-04 10:36 [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
2024-06-04 10:36 ` [PATCH net-next v14 01/14] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Kory Maincent
@ 2024-06-04 10:38 ` Kory Maincent
1 sibling, 0 replies; 6+ messages in thread
From: Kory Maincent @ 2024-06-04 10:38 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list,
Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran,
Radu Pirea, Jay Vosburgh, Andy Gospodarek, Nicolas Ferre,
Claudiu Beznea, Willem de Bruijn, Jonathan Corbet, Horatiu Vultur,
UNGLinuxDriver, Simon Horman, Vladimir Oltean
Cc: Thomas Petazzoni, netdev, linux-kernel, linux-doc,
Maxime Chevallier, Rahul Rameshbabu, Willem de Bruijn,
Alexandra Winter
On Tue, 04 Jun 2024 12:36:00 +0200
Kory Maincent <kory.maincent@bootlin.com> wrote:
> Up until now, there was no way to let the user select the hardware
> PTP provider at which time stamping occurs. The stack assumed that PHY time
> stamping is always preferred, but some MAC/PHY combinations were buggy.
>
> This series updates the default MAC/PHY default timestamping and aims to
> allow the user to select the desired hwtstamp provider administratively.
I got an issue with my connection. I will resent it.
Regards,
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v14 00/14] net: Make timestamping selectable
@ 2024-06-04 10:39 Kory Maincent
2024-06-06 13:28 ` Paolo Abeni
0 siblings, 1 reply; 6+ messages in thread
From: Kory Maincent @ 2024-06-04 10:39 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list,
Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran,
Radu Pirea, Jay Vosburgh, Andy Gospodarek, Nicolas Ferre,
Claudiu Beznea, Willem de Bruijn, Jonathan Corbet, Horatiu Vultur,
UNGLinuxDriver, Simon Horman, Vladimir Oltean
Cc: Thomas Petazzoni, netdev, linux-kernel, linux-doc,
Maxime Chevallier, Rahul Rameshbabu, Kory Maincent,
Willem de Bruijn, Alexandra Winter
Up until now, there was no way to let the user select the hardware
PTP provider at which time stamping occurs. The stack assumed that PHY time
stamping is always preferred, but some MAC/PHY combinations were buggy.
This series updates the default MAC/PHY default timestamping and aims to
allow the user to select the desired hwtstamp provider administratively.
Changes in v14:
- Add back an EXPORT_SYMBOL() missing.
- Link to v13: https://lore.kernel.org/r/20240529-feature_ptp_netnext-v13-0-6eda4d40fa4f@bootlin.com
Changes in v13:
- Add PTP builtin code to fix build errors when building PTP as a module.
- Fix error spotted by smatch and sparse.
- Link to v12: https://lore.kernel.org/r/20240430-feature_ptp_netnext-v12-0-2c5f24b6a914@bootlin.com
Changes in v12:
- Add missing return description in the kdoc.
- Fix few nit.
- Link to v11: https://lore.kernel.org/r/20240422-feature_ptp_netnext-v11-0-f14441f2a1d8@bootlin.com
Changes in v11:
- Add netlink examples.
- Remove a change of my out of tree marvell_ptp patch in the patch series.
- Remove useless extern.
- Link to v10: https://lore.kernel.org/r/20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com
Changes in v10:
- Move declarations to net/core/dev.h instead of netdevice.h
- Add netlink documentation.
- Add ETHTOOL_A_TSINFO_GHWTSTAMP netlink attributes instead of a bit in
ETHTOOL_A_TSINFO_TIMESTAMPING bitset.
- Send "Move from simple ida to xarray" patch standalone.
- Add tsinfo ntf command.
- Add rcu_lock protection mechanism to avoid memory leak.
- Fixed doc and kdoc issue.
- Link to v9: https://lore.kernel.org/r/20240226-feature_ptp_netnext-v9-0-455611549f21@bootlin.com
Changes in v9:
- Remove the RFC prefix.
- Correct few NIT fixes.
- Link to v8: https://lore.kernel.org/r/20240216-feature_ptp_netnext-v8-0-510f42f444fb@bootlin.com
Changes in v8:
- Drop the 6 first patch as they are now merged.
- Change the full implementation to not be based on the hwtstamp layer
(MAC/PHY) but on the hwtstamp provider which mean a ptp clock and a
phc qualifier.
- Made some patch to prepare the new implementation.
- Expand netlink tsinfo instead of a new ts command for new hwtstamp
configuration uAPI and for dumping tsinfo of specific hwtstamp provider.
- Link to v7: https://lore.kernel.org/r/20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com
Changes in v7:
- Fix a temporary build error.
- Link to v6: https://lore.kernel.org/r/20231019-feature_ptp_netnext-v6-0-71affc27b0e5@bootlin.com
Changes in v6:
- Few fixes from the reviews.
- Replace the allowlist to default_timestamp flag to know which phy is
using old API behavior.
- Rename the timestamping layer enum values.
- Move to a simple enum instead of the mix between enum and bitfield.
- Update ts_info and ts-set in software timestamping case.
Changes in v5:
- Update to ndo_hwstamp_get/set. This bring several new patches.
- Add few patches to make the glue.
- Convert macb to ndo_hwstamp_get/set.
- Add netlink specs description of new ethtool commands.
- Removed netdev notifier.
- Split the patches that expose the timestamping to userspace to separate
the core and ethtool development.
- Add description of software timestamping.
- Convert PHYs hwtstamp callback to use kernel_hwtstamp_config.
Changes in v4:
- Move on to ethtool netlink instead of ioctl.
- Add a netdev notifier to allow packet trapping by the MAC in case of PHY
time stamping.
- Add a PHY whitelist to not break the old PHY default time-stamping
preference API.
Changes in v3:
- Expose the PTP choice to ethtool instead of sysfs.
You can test it with the ethtool source on branch feature_ptp of:
https://github.com/kmaincent/ethtool
- Added a devicetree binding to select the preferred timestamp.
Changes in v2:
- Move selected_timestamping_layer variable of the concerned patch.
- Use sysfs_streq instead of strmcmp.
- Use the PHY timestamp only if available.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Kory Maincent (14):
net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask
net: Move dev_set_hwtstamp_phylib to net/core/dev.h
net: Make dev_get_hwtstamp_phylib accessible
net: Make net_hwtstamp_validate accessible
net: Change the API of PHY default timestamp to MAC
net: net_tstamp: Add unspec field to hwtstamp_source enumeration
net: Add struct kernel_ethtool_ts_info
ptp: Add phc source and helpers to register specific PTP clock or get information
net: Add the possibility to support a selected hwtstamp in netdevice
net: netdevsim: ptp_mock: Convert to netdev_ptp_clock_register
net: macb: Convert to netdev_ptp_clock_register
net: ptp: Move ptp_clock_index() to builtin symbol
net: ethtool: tsinfo: Add support for hwtstamp provider and get/set hwtstamp config
netlink: specs: tsinfo: Enhance netlink attributes and add a set command
Documentation/netlink/specs/ethtool.yaml | 43 +-
Documentation/networking/ethtool-netlink.rst | 38 +-
Documentation/networking/timestamping.rst | 35 +-
drivers/net/bonding/bond_main.c | 4 +-
drivers/net/can/dev/dev.c | 2 +-
drivers/net/can/peak_canfd/peak_canfd.c | 2 +-
drivers/net/can/usb/gs_usb.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 2 +-
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 2 +-
drivers/net/dsa/microchip/ksz_ptp.c | 2 +-
drivers/net/dsa/microchip/ksz_ptp.h | 2 +-
drivers/net/dsa/mv88e6xxx/hwtstamp.c | 2 +-
drivers/net/dsa/mv88e6xxx/hwtstamp.h | 4 +-
drivers/net/dsa/ocelot/felix.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.h | 2 +-
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 2 +-
.../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
drivers/net/ethernet/broadcom/tg3.c | 2 +-
drivers/net/ethernet/cadence/macb.h | 2 +-
drivers/net/ethernet/cadence/macb_main.c | 4 +-
drivers/net/ethernet/cadence/macb_ptp.c | 2 +-
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +-
.../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 2 +-
drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +-
drivers/net/ethernet/engleder/tsnep_ethtool.c | 2 +-
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +-
.../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 +-
.../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 2 +-
drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +-
.../net/ethernet/fungible/funeth/funeth_ethtool.c | 2 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 2 +-
drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-
drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +-
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
.../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +-
.../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +-
.../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 4 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 10 +-
drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +-
.../ethernet/microchip/lan966x/lan966x_ethtool.c | 2 +-
.../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 2 +-
drivers/net/ethernet/mscc/ocelot_net.c | 2 +-
drivers/net/ethernet/mscc/ocelot_ptp.c | 2 +-
.../net/ethernet/pensando/ionic/ionic_ethtool.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ptp.c | 2 +-
drivers/net/ethernet/qlogic/qede/qede_ptp.h | 2 +-
drivers/net/ethernet/renesas/ravb_main.c | 2 +-
drivers/net/ethernet/renesas/rswitch.c | 2 +-
drivers/net/ethernet/sfc/ethtool.c | 2 +-
drivers/net/ethernet/sfc/falcon/nic.h | 2 +-
drivers/net/ethernet/sfc/ptp.c | 2 +-
drivers/net/ethernet/sfc/ptp.h | 5 +-
drivers/net/ethernet/sfc/siena/ethtool.c | 2 +-
drivers/net/ethernet/sfc/siena/ptp.c | 2 +-
drivers/net/ethernet/sfc/siena/ptp.h | 4 +-
.../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 +-
drivers/net/ethernet/ti/cpsw_ethtool.c | 4 +-
drivers/net/ethernet/ti/cpsw_priv.h | 2 +-
drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 2 +-
drivers/net/ethernet/ti/netcp_ethss.c | 4 +-
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
drivers/net/macvlan.c | 2 +-
drivers/net/netdevsim/ethtool.c | 2 +-
drivers/net/netdevsim/netdev.c | 19 +-
drivers/net/phy/bcm-phy-ptp.c | 5 +-
drivers/net/phy/dp83640.c | 4 +-
drivers/net/phy/micrel.c | 10 +-
drivers/net/phy/mscc/mscc_ptp.c | 5 +-
drivers/net/phy/nxp-c45-tja11xx.c | 5 +-
drivers/net/phy/phy_device.c | 11 +
drivers/ptp/Makefile | 5 +
drivers/ptp/ptp_clock.c | 39 +-
drivers/ptp/ptp_clock_consumer.c | 172 ++++++
drivers/ptp/ptp_ines.c | 2 +-
drivers/ptp/ptp_mock.c | 4 +-
drivers/ptp/ptp_private.h | 7 +
drivers/s390/net/qeth_ethtool.c | 2 +-
include/linux/can/dev.h | 2 +-
include/linux/ethtool.h | 29 +-
include/linux/mii_timestamper.h | 2 +-
include/linux/net_tstamp.h | 16 +
include/linux/netdevice.h | 8 +-
include/linux/phy.h | 21 +-
include/linux/ptp_clock_kernel.h | 178 ++++++
include/linux/ptp_mock.h | 4 +-
include/net/dsa.h | 2 +-
include/soc/mscc/ocelot.h | 2 +-
include/uapi/linux/ethtool_netlink.h | 14 +
include/uapi/linux/net_tstamp.h | 11 +
net/8021q/vlan_dev.c | 2 +-
net/core/dev.h | 7 +
net/core/dev_ioctl.c | 56 +-
net/core/timestamping.c | 49 +-
net/dsa/user.c | 2 +-
net/ethtool/common.c | 40 +-
net/ethtool/common.h | 5 +-
net/ethtool/ioctl.c | 12 +-
net/ethtool/netlink.c | 16 +-
net/ethtool/netlink.h | 6 +-
net/ethtool/tsinfo.c | 641 ++++++++++++++++++++-
net/sched/sch_taprio.c | 2 +-
122 files changed, 1520 insertions(+), 202 deletions(-)
---
base-commit: caaa6a85f0658de87358e08fb9e3768d2daf5e01
change-id: 20231011-feature_ptp_netnext-3f278578e84b
Best regards,
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v14 00/14] net: Make timestamping selectable
2024-06-04 10:39 Kory Maincent
@ 2024-06-06 13:28 ` Paolo Abeni
2024-06-07 7:57 ` Kory Maincent
0 siblings, 1 reply; 6+ messages in thread
From: Paolo Abeni @ 2024-06-06 13:28 UTC (permalink / raw)
To: Kory Maincent, Florian Fainelli,
Broadcom internal kernel review list, Andrew Lunn,
Heiner Kallweit, Russell King, David S. Miller, Eric Dumazet,
Jakub Kicinski, Richard Cochran, Radu Pirea, Jay Vosburgh,
Andy Gospodarek, Nicolas Ferre, Claudiu Beznea, Willem de Bruijn,
Jonathan Corbet, Horatiu Vultur, UNGLinuxDriver, Simon Horman,
Vladimir Oltean
Cc: Thomas Petazzoni, netdev, linux-kernel, linux-doc,
Maxime Chevallier, Rahul Rameshbabu, Willem de Bruijn,
Alexandra Winter
On Tue, 2024-06-04 at 12:39 +0200, Kory Maincent wrote:
> Up until now, there was no way to let the user select the hardware
> PTP provider at which time stamping occurs. The stack assumed that PHY time
> stamping is always preferred, but some MAC/PHY combinations were buggy.
>
> This series updates the default MAC/PHY default timestamping and aims to
> allow the user to select the desired hwtstamp provider administratively.
>
I'm sorry to ask the question this late, but are there any plan to
introduce self-tests, eventually in a follow-up patch/series?
Thanks,
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v14 00/14] net: Make timestamping selectable
2024-06-06 13:28 ` Paolo Abeni
@ 2024-06-07 7:57 ` Kory Maincent
0 siblings, 0 replies; 6+ messages in thread
From: Kory Maincent @ 2024-06-07 7:57 UTC (permalink / raw)
To: Paolo Abeni
Cc: Florian Fainelli, Broadcom internal kernel review list,
Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Richard Cochran, Radu Pirea,
Jay Vosburgh, Andy Gospodarek, Nicolas Ferre, Claudiu Beznea,
Willem de Bruijn, Jonathan Corbet, Horatiu Vultur, UNGLinuxDriver,
Simon Horman, Vladimir Oltean, Thomas Petazzoni, netdev,
linux-kernel, linux-doc, Maxime Chevallier, Rahul Rameshbabu,
Willem de Bruijn, Alexandra Winter
Hello Paolo,
On Thu, 06 Jun 2024 15:28:28 +0200
Paolo Abeni <pabeni@redhat.com> wrote:
> On Tue, 2024-06-04 at 12:39 +0200, Kory Maincent wrote:
> [...]
>
> I'm sorry to ask the question this late, but are there any plan to
> introduce self-tests, eventually in a follow-up patch/series?
There was no plan about it but it could change if it is needed.
rxtimestamp.sh and txtimestammp.sh should still work. I will verify that next
week.
Before writing tests the next patch series will be in ethtool.
Regards,
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-07 7:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-04 10:36 [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
2024-06-04 10:36 ` [PATCH net-next v14 01/14] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Kory Maincent
2024-06-04 10:38 ` [PATCH net-next v14 00/14] net: Make timestamping selectable Kory Maincent
-- strict thread matches above, loose matches on Subject: below --
2024-06-04 10:39 Kory Maincent
2024-06-06 13:28 ` Paolo Abeni
2024-06-07 7:57 ` Kory Maincent
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox