Commit 97248adb authored by Vishnu Singh's avatar Vishnu Singh Committed by Jakub Kicinski
Browse files

net: ti: am65-cpsw: Update hw timestamping filter for PTPv1 RX packets 



CPTS module of CPSW supports hardware timestamping of PTPv1 packets.Update
the "hwtstamp_rx_filters" of CPSW driver to enable timestamping of received
PTPv1 packets. Also update the advertised capability to include PTPv1.

Signed-off-by: default avatarVishnu Singh <v-singh1@ti.com>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: default avatarMD Danish Anwar <danishanwar@ti.com>
Link: https://patch.msgid.link/20250917041455.1815579-1-v-singh1@ti.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f2cdc4c2

drivers/net/ethernet/ti/am65-cpsw-ethtool.c

+15 −12
Original line number Diff line number Diff line
@@ -694,9 +694,9 @@ static int am65_cpsw_get_ethtool_ts_info(struct net_device *ndev, 
					 struct kernel_ethtool_ts_info *info)

{

	struct am65_cpsw_common *common = am65_ndev_to_common(ndev);

	unsigned int ptp_v2_filter;

	unsigned int ptp_filter;



	ptp_v2_filter = BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT)	 |

	ptp_filter = BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT)	|

		     BIT(HWTSTAMP_FILTER_PTP_V2_L4_SYNC)	|

		     BIT(HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ)	|

		     BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT)	|
@@ -704,7 +704,10 @@ static int am65_cpsw_get_ethtool_ts_info(struct net_device *ndev, 
		     BIT(HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ)	|

		     BIT(HWTSTAMP_FILTER_PTP_V2_EVENT)		|

		     BIT(HWTSTAMP_FILTER_PTP_V2_SYNC)		|

			BIT(HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);

		     BIT(HWTSTAMP_FILTER_PTP_V2_DELAY_REQ)	|

		     BIT(HWTSTAMP_FILTER_PTP_V1_L4_EVENT)	|

		     BIT(HWTSTAMP_FILTER_PTP_V1_L4_SYNC)	|

		     BIT(HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ);



	if (!IS_ENABLED(CONFIG_TI_K3_AM65_CPTS))

		return ethtool_op_get_ts_info(ndev, info);
@@ -716,7 +719,7 @@ static int am65_cpsw_get_ethtool_ts_info(struct net_device *ndev, 
		SOF_TIMESTAMPING_RAW_HARDWARE;

	info->phc_index = am65_cpts_phc_index(common->cpts);

	info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);

	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | ptp_v2_filter;

	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | ptp_filter;

	return 0;

}

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+6 −3
Original line number Diff line number Diff line
@@ -1813,6 +1813,9 @@ static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev, 
	case HWTSTAMP_FILTER_NONE:

		port->rx_ts_enabled = false;

		break;

	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:

	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:

	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
@@ -1823,7 +1826,7 @@ static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev, 
	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

		port->rx_ts_enabled = true;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT | HWTSTAMP_FILTER_PTP_V1_L4_EVENT;

		break;

	case HWTSTAMP_FILTER_ALL:

	case HWTSTAMP_FILTER_SOME:
@@ -1884,8 +1887,8 @@ static int am65_cpsw_nuss_hwtstamp_get(struct net_device *ndev, 
	cfg.flags = 0;

	cfg.tx_type = port->tx_ts_enabled ?

		      HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;

	cfg.rx_filter = port->rx_ts_enabled ?

			HWTSTAMP_FILTER_PTP_V2_EVENT : HWTSTAMP_FILTER_NONE;

	cfg.rx_filter = port->rx_ts_enabled ? HWTSTAMP_FILTER_PTP_V2_EVENT |

			HWTSTAMP_FILTER_PTP_V1_L4_EVENT : HWTSTAMP_FILTER_NONE;



	return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;

}