Commit de99e1ea authored by Horatiu Vultur's avatar Horatiu Vultur Committed by Jakub Kicinski
Browse files

net: phy: micrel: lan8814: Fix when enabling/disabling 1-step timestamping 



There are 2 issues with the blamed commit.
1. When the phy is initialized, it would enable the disabled of UDPv4
   checksums. The UDPv6 checksum is already enabled by default. So when
   1-step is configured then it would clear these flags.
2. After the 1-step is configured, then if 2-step is configured then the
   1-step would be still configured because it is not clearing the flag.
   So the sync frames will still have origin timestamps set.

Fix this by reading first the value of the register and then
just change bit 12 as this one determines if the timestamp needs to
be inserted in the frame, without changing any other bits.

Fixes: ece19502 ("net: phy: micrel: 1588 support for LAN8814 phy")
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: default avatarDivya Koppera <divya.koppera@microchip.com>
Link: https://lore.kernel.org/r/20240402071634.2483524-1-horatiu.vultur@microchip.com


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

drivers/net/phy/micrel.c

+8 −2
Original line number Diff line number Diff line
@@ -2431,6 +2431,7 @@ static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, 
	struct lan8814_ptp_rx_ts *rx_ts, *tmp;

	int txcfg = 0, rxcfg = 0;

	int pkt_ts_enable;

	int tx_mod;



	ptp_priv->hwts_tx_type = config->tx_type;

	ptp_priv->rx_filter = config->rx_filter;
@@ -2477,9 +2478,14 @@ static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, 
	lanphy_write_page_reg(ptp_priv->phydev, 5, PTP_RX_TIMESTAMP_EN, pkt_ts_enable);

	lanphy_write_page_reg(ptp_priv->phydev, 5, PTP_TX_TIMESTAMP_EN, pkt_ts_enable);



	if (ptp_priv->hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC)

	tx_mod = lanphy_read_page_reg(ptp_priv->phydev, 5, PTP_TX_MOD);

	if (ptp_priv->hwts_tx_type == HWTSTAMP_TX_ONESTEP_SYNC) {

		lanphy_write_page_reg(ptp_priv->phydev, 5, PTP_TX_MOD,

				      PTP_TX_MOD_TX_PTP_SYNC_TS_INSERT_);

				      tx_mod | PTP_TX_MOD_TX_PTP_SYNC_TS_INSERT_);

	} else if (ptp_priv->hwts_tx_type == HWTSTAMP_TX_ON) {

		lanphy_write_page_reg(ptp_priv->phydev, 5, PTP_TX_MOD,

				      tx_mod & ~PTP_TX_MOD_TX_PTP_SYNC_TS_INSERT_);

	}



	if (config->rx_filter != HWTSTAMP_FILTER_NONE)

		lan8814_config_ts_intr(ptp_priv->phydev, true);