From patchwork Mon Feb 26 13:39:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kory Maincent X-Patchwork-Id: 13572108 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D8E11AACC; Mon, 26 Feb 2024 13:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708954816; cv=none; b=BmMQAiw4IlWFS6eK0O09wMkieVOgyxshlbcZkX4ThKfZX0a77/D4wXLhhjIwfwoUzfzfOivdsVQbwTecDW2EYVwvKrRWWRd3XeuATvqBUMo+XynY7syWIdsxOwLLMr+OKvGeUTMK+pBfTp+FOoSUNfWG76TDH/fXJW4h2awMiCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708954816; c=relaxed/simple; bh=snvxzmvtHptYaUIy+1EYoHXTpXcv2JUdKgMdQ/5quTY=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=cvrr+Jja4gpFyCXuIgcSjOsy7Uzi9UetG6hKTZR1GNaHnHvAqFtm3wVdLdPxrtr4r8QflnxbRrb+HSR4jbXWkQ+lQlupz97KQ6JbON3UBmrMDjt46g8jvOwWeMSqehsEshnroYaCNNZ+WYxYb0AeLbfWxZot/4ENDZLcsKo2czQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=jE2dZuPu; arc=none smtp.client-ip=217.70.183.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="jE2dZuPu" Received: by mail.gandi.net (Postfix) with ESMTPSA id 9960F4000D; Mon, 26 Feb 2024 13:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708954811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O7wBBJmEXnNs06UYH/8/hPcDm+2EPxT/0p2T3v3y0gI=; b=jE2dZuPud8RmzymxqhuRxI87XZk1zLukrlRBZOYTiaR+VCFF6EQ8pTpJ3Zv/MrraQ+b7Yg Ad76NYZVYzyauC0bJl7yZaCAJ51Inmaib7ZivjVIfgUICnysn7KSuxH68k90Z1UAz50OJQ bHDUpIlfxv2x/pD6hN/cXnp5CzYTeHcWpJVHYcvkaJdIsa+RYfNnDfjcBcJfBPOm3AWLDZ 4sT01jfQbD5BnD9O39DF7ZJ3RD/WuaEn7PtQjLAFh/RUvoK3kPavQ4u3KompG/Dr5mpE/m KWNVrszoaqFJ+eT9kEXKus2RHf8G/2Fv/AFrnKm0r2bHbVvGGMp4yu0aiBimMw== From: Kory Maincent Subject: [PATCH net-next v9 00/13] net: Make timestamping selectable Date: Mon, 26 Feb 2024 14:39:51 +0100 Message-Id: <20240226-feature_ptp_netnext-v9-0-455611549f21@bootlin.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAKiU3GUC/23N0WqEMBAF0F9Z8rwpmezEifvU/yhF1E5qoJtIT MUi/ntTaSnL+ni5d86sYuLkeRLX0yoSz37yMZRQn0+iH9rwztK/lSy00hdQANJxmz8TN2Mem8A 58JLlxWmyhixb7ES5HBM7v+zqiygj+bMSr6UZ/JRj+trfzdXe/8r1oTxXUkmC1rleU6fYPHcx5 g8fnvp428WZ/hUAPFaoKEiaiWoDjOpRsX8KKg3VsWKLYkA51A4RXXevbNv2DdbcSztOAQAA 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@microchip.com, Simon Horman , Vladimir Oltean Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Maxime Chevallier , Rahul Rameshbabu , Kory Maincent , Willem de Bruijn X-Mailer: b4 0.12.4 X-GND-Sasl: kory.maincent@bootlin.com X-Patchwork-Delegate: kuba@kernel.org 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 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 (13): net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask 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: Move from simple ida to xarray 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: 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 | 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/marvell_ptp.c | 2 +- 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 | 7 + drivers/ptp/ptp_clock.c | 131 ++++- drivers/ptp/ptp_ines.c | 2 +- drivers/ptp/ptp_mock.c | 4 +- drivers/ptp/ptp_private.h | 5 + 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 | 15 + include/linux/netdevice.h | 10 + include/linux/phy.h | 19 +- include/linux/ptp_clock_kernel.h | 116 ++++ include/linux/ptp_mock.h | 4 +- include/net/dsa.h | 2 +- include/soc/mscc/ocelot.h | 2 +- include/uapi/linux/ethtool_netlink.h | 12 + include/uapi/linux/net_tstamp.h | 14 +- net/8021q/vlan_dev.c | 2 +- net/core/dev.c | 23 + net/core/dev_ioctl.c | 53 +- net/core/timestamping.c | 36 +- net/dsa/user.c | 2 +- net/ethtool/common.c | 39 +- net/ethtool/common.h | 5 +- net/ethtool/ioctl.c | 12 +- net/ethtool/netlink.c | 14 +- net/ethtool/netlink.h | 6 +- net/ethtool/tsinfo.c | 600 ++++++++++++++++++++- net/sched/sch_taprio.c | 2 +- 119 files changed, 1268 insertions(+), 178 deletions(-) --- base-commit: b4493e4663afcafb0cec1b3d7b967c73a6c0bf72 change-id: 20231011-feature_ptp_netnext-3f278578e84b Best regards,