| Message ID | 20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | net: Make timestamping selectable | expand |
Hello: This series was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Tue, 14 Nov 2023 12:28:28 +0100 you wrote: > Up until now, there was no way to let the user select the layer 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 layer administratively. > > [...] Here is the summary with links: - [net-next,v7,01/16] net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config https://git.kernel.org/netdev/net-next/c/446e2305827b - [net-next,v7,02/16] net: phy: Remove the call to phy_mii_ioctl in phy_hwstamp_get/set https://git.kernel.org/netdev/net-next/c/430dc3256d57 - [net-next,v7,03/16] net: ethtool: Refactor identical get_ts_info implementations. https://git.kernel.org/netdev/net-next/c/b8768dc40777 - [net-next,v7,04/16] net: macb: Convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() https://git.kernel.org/netdev/net-next/c/202cb220026e - [net-next,v7,05/16] net: Make dev_set_hwtstamp_phylib accessible https://git.kernel.org/netdev/net-next/c/011dd3b3f83f - [net-next,v7,06/16] net: phy: micrel: fix ts_info value in case of no phc https://git.kernel.org/netdev/net-next/c/915d25a9d69b - [net-next,v7,07/16] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask https://git.kernel.org/netdev/net-next/c/acec05fb78ab - [net-next,v7,08/16] net: ethtool: Add a command to expose current time stamping layer https://git.kernel.org/netdev/net-next/c/11d55be06df0 - [net-next,v7,09/16] netlink: specs: Introduce new netlink command to get current timestamp https://git.kernel.org/netdev/net-next/c/bb8645b00ced - [net-next,v7,10/16] net: ethtool: Add a command to list available time stamping layers https://git.kernel.org/netdev/net-next/c/d905f9c75329 - [net-next,v7,11/16] netlink: specs: Introduce new netlink command to list available time stamping layers https://git.kernel.org/netdev/net-next/c/aed5004ee7a0 - [net-next,v7,12/16] net: Replace hwtstamp_source by timestamping layer https://git.kernel.org/netdev/net-next/c/51bdf3165f01 - [net-next,v7,13/16] net: Change the API of PHY default timestamp to MAC https://git.kernel.org/netdev/net-next/c/0f7f463d4821 - [net-next,v7,14/16] net: ethtool: ts: Update GET_TS to reply the current selected timestamp https://git.kernel.org/netdev/net-next/c/091fab122869 - [net-next,v7,15/16] net: ethtool: ts: Let the active time stamping layer be selectable https://git.kernel.org/netdev/net-next/c/152c75e1d002 - [net-next,v7,16/16] netlink: specs: Introduce time stamping set command https://git.kernel.org/netdev/net-next/c/ee60ea6be0d3 You are awesome, thank you!
On Sat, 18 Nov 2023 15:10:26 +0000 patchwork-bot+netdevbpf@kernel.org wrote: > This series was applied to netdev/net-next.git (main) > by David S. Miller <davem@davemloft.net>: You need to run ./tools/net/ynl/ynl-regen.sh after touching specs. The tree will now be dirty for anyone trying to do YNL work. I'm dropping this series, sorry, please post a v8.
Up until now, there was no way to let the user select the layer 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 layer administratively. 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. 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 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 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 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 v7: - Fix a temporary build error. - Link to v6: https://lore.kernel.org/r/20231019-feature_ptp_netnext-v6-0-71affc27b0e5@bootlin.com Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> --- Kory Maincent (15): net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config net: phy: Remove the call to phy_mii_ioctl in phy_hwstamp_get/set net: macb: Convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() net: Make dev_set_hwtstamp_phylib accessible net: phy: micrel: fix ts_info value in case of no phc net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask net: ethtool: Add a command to expose current time stamping layer netlink: specs: Introduce new netlink command to get current timestamp net: ethtool: Add a command to list available time stamping layers netlink: specs: Introduce new netlink command to list available time stamping layers net: Replace hwtstamp_source by timestamping layer net: Change the API of PHY default timestamp to MAC net: ethtool: ts: Update GET_TS to reply the current selected timestamp net: ethtool: ts: Let the active time stamping layer be selectable netlink: specs: Introduce time stamping set command Richard Cochran (1): net: ethtool: Refactor identical get_ts_info implementations. Documentation/netlink/specs/ethtool.yaml | 57 +++++ Documentation/networking/ethtool-netlink.rst | 63 ++++++ drivers/net/bonding/bond_main.c | 29 +-- drivers/net/ethernet/cadence/macb.h | 15 +- drivers/net/ethernet/cadence/macb_main.c | 42 +++- drivers/net/ethernet/cadence/macb_ptp.c | 28 +-- .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 +- drivers/net/macvlan.c | 14 +- drivers/net/phy/bcm-phy-ptp.c | 18 +- drivers/net/phy/dp83640.c | 27 +-- drivers/net/phy/micrel.c | 50 ++--- drivers/net/phy/mscc/mscc_ptp.c | 20 +- drivers/net/phy/nxp-c45-tja11xx.c | 20 +- drivers/net/phy/phy.c | 28 ++- drivers/net/phy/phy_device.c | 37 ++++ drivers/ptp/ptp_ines.c | 16 +- include/linux/ethtool.h | 8 + include/linux/mii_timestamper.h | 4 +- include/linux/net_tstamp.h | 11 +- include/linux/netdevice.h | 8 + include/linux/phy.h | 10 +- include/uapi/linux/ethtool_netlink.h | 29 +++ include/uapi/linux/net_tstamp.h | 18 ++ net/8021q/vlan_dev.c | 15 +- net/core/dev.c | 3 + net/core/dev_ioctl.c | 43 ++-- net/core/timestamping.c | 10 + net/ethtool/Makefile | 2 +- net/ethtool/common.c | 25 ++- net/ethtool/common.h | 1 + net/ethtool/netlink.c | 28 +++ net/ethtool/netlink.h | 4 + net/ethtool/ts.c | 244 +++++++++++++++++++++ 33 files changed, 732 insertions(+), 201 deletions(-) --- base-commit: 5b7dd66960ba4e5cd2648692a6082a7ac6993867 change-id: 20231011-feature_ptp_netnext-3f278578e84b Best regards,