Commit fc65403d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'support-for-hwtstamp_get-in-phy-part-2' 

Vadim Fedorenko says:

====================
support for hwtstamp_get in phy - part 2

There are 2 drivers which had some inconsistency in HW timestamping
configuration logic. Improve both of them and add hwtstamp_get()
callback.
====================

Link: https://patch.msgid.link/20260106160723.3925872-1-vadim.fedorenko@linux.dev


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a45ed8db f529893f

drivers/net/phy/micrel.c

+38 −6
Original line number Diff line number Diff line
@@ -3147,6 +3147,18 @@ static void lan8814_flush_fifo(struct phy_device *phydev, bool egress) 
	lanphy_read_page_reg(phydev, LAN8814_PAGE_PORT_REGS, PTP_TSU_INT_STS);

}



static int lan8814_hwtstamp_get(struct mii_timestamper *mii_ts,

				struct kernel_hwtstamp_config *config)

{

	struct kszphy_ptp_priv *ptp_priv =

			  container_of(mii_ts, struct kszphy_ptp_priv, mii_ts);



	config->tx_type = ptp_priv->hwts_tx_type;

	config->rx_filter = ptp_priv->rx_filter;



	return 0;

}



static int lan8814_hwtstamp_set(struct mii_timestamper *mii_ts,

				struct kernel_hwtstamp_config *config,

				struct netlink_ext_ack *extack)
@@ -3157,9 +3169,6 @@ static int lan8814_hwtstamp_set(struct mii_timestamper *mii_ts, 
	int txcfg = 0, rxcfg = 0;

	int pkt_ts_enable;



	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		ptp_priv->layer = 0;
@@ -3187,6 +3196,18 @@ static int lan8814_hwtstamp_set(struct mii_timestamper *mii_ts, 
		return -ERANGE;

	}



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:

	case HWTSTAMP_TX_ONESTEP_SYNC:

		break;

	default:

		return -ERANGE;

	}



	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	if (ptp_priv->layer & PTP_CLASS_L2) {

		rxcfg = PTP_RX_PARSE_CONFIG_LAYER2_EN_;

		txcfg = PTP_TX_PARSE_CONFIG_LAYER2_EN_;
@@ -4390,6 +4411,7 @@ static void lan8814_ptp_init(struct phy_device *phydev) 
	ptp_priv->mii_ts.rxtstamp = lan8814_rxtstamp;

	ptp_priv->mii_ts.txtstamp = lan8814_txtstamp;

	ptp_priv->mii_ts.hwtstamp_set = lan8814_hwtstamp_set;

	ptp_priv->mii_ts.hwtstamp_get = lan8814_hwtstamp_get;

	ptp_priv->mii_ts.ts_info  = lan8814_ts_info;



	phydev->mii_ts = &ptp_priv->mii_ts;
@@ -5051,9 +5073,6 @@ static int lan8841_hwtstamp_set(struct mii_timestamper *mii_ts, 
	int txcfg = 0, rxcfg = 0;

	int pkt_ts_enable;



	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		ptp_priv->layer = 0;
@@ -5081,6 +5100,18 @@ static int lan8841_hwtstamp_set(struct mii_timestamper *mii_ts, 
		return -ERANGE;

	}



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:

	case HWTSTAMP_TX_ONESTEP_SYNC:

		break;

	default:

		return -ERANGE;

	}



	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;



	/* Setup parsing of the frames and enable the timestamping for ptp

	 * frames

	 */
@@ -5925,6 +5956,7 @@ static int lan8841_probe(struct phy_device *phydev) 
	ptp_priv->mii_ts.rxtstamp = lan8841_rxtstamp;

	ptp_priv->mii_ts.txtstamp = lan8814_txtstamp;

	ptp_priv->mii_ts.hwtstamp_set = lan8841_hwtstamp_set;

	ptp_priv->mii_ts.hwtstamp_get = lan8814_hwtstamp_get;

	ptp_priv->mii_ts.ts_info = lan8841_ts_info;



	phydev->mii_ts = &ptp_priv->mii_ts;

drivers/net/phy/microchip_rds_ptp.c

+29 −5
Original line number Diff line number Diff line
@@ -476,6 +476,18 @@ static bool mchp_rds_ptp_rxtstamp(struct mii_timestamper *mii_ts, 
	return true;

}



static int mchp_rds_ptp_hwtstamp_get(struct mii_timestamper *mii_ts,

				     struct kernel_hwtstamp_config *config)

{

	struct mchp_rds_ptp_clock *clock =

				container_of(mii_ts, struct mchp_rds_ptp_clock,

					     mii_ts);

	config->tx_type = clock->hwts_tx_type;

	config->rx_filter = clock->rx_filter;



	return 0;

}



static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts,

				     struct kernel_hwtstamp_config *config,

				     struct netlink_ext_ack *extack)
@@ -488,9 +500,6 @@ static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 
	unsigned long flags;

	int rc;



	clock->hwts_tx_type = config->tx_type;

	clock->rx_filter = config->rx_filter;



	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		clock->layer = 0;
@@ -518,6 +527,15 @@ static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 
		return -ERANGE;

	}



	switch (config->tx_type) {

	case HWTSTAMP_TX_ONESTEP_SYNC:

	case HWTSTAMP_TX_ON:

	case HWTSTAMP_TX_OFF:

		break;

	default:

		return -ERANGE;

	}



	/* Setup parsing of the frames and enable the timestamping for ptp

	 * frames

	 */
@@ -553,7 +571,7 @@ static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 
	if (rc < 0)

		return rc;



	if (clock->hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC)

	if (config->tx_type == HWTSTAMP_TX_ONESTEP_SYNC)

		/* Enable / disable of the TX timestamp in the SYNC frames */

		rc = mchp_rds_phy_modify_mmd(clock, MCHP_RDS_PTP_TX_MOD,

					     MCHP_RDS_PTP_PORT,
@@ -587,8 +605,13 @@ static int mchp_rds_ptp_hwtstamp_set(struct mii_timestamper *mii_ts, 
	/* Now enable the timestamping interrupts */

	rc = mchp_rds_ptp_config_intr(clock,

				      config->rx_filter != HWTSTAMP_FILTER_NONE);

	if (rc < 0)

		return rc;



	clock->hwts_tx_type = config->tx_type;

	clock->rx_filter = config->rx_filter;



	return rc < 0 ? rc : 0;

	return 0;

}



static int mchp_rds_ptp_ts_info(struct mii_timestamper *mii_ts,
@@ -1282,6 +1305,7 @@ struct mchp_rds_ptp_clock *mchp_rds_ptp_probe(struct phy_device *phydev, u8 mmd, 
	clock->mii_ts.rxtstamp = mchp_rds_ptp_rxtstamp;

	clock->mii_ts.txtstamp = mchp_rds_ptp_txtstamp;

	clock->mii_ts.hwtstamp_set = mchp_rds_ptp_hwtstamp_set;

	clock->mii_ts.hwtstamp_get = mchp_rds_ptp_hwtstamp_get;

	clock->mii_ts.ts_info = mchp_rds_ptp_ts_info;



	phydev->mii_ts = &clock->mii_ts;