Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b406aa authored by Csókás Bence's avatar Csókás Bence Committed by Greg Kroah-Hartman
Browse files

fec: Fix timer capture timing in `fec_ptp_enable_pps()` 



commit 61d5e2a251fb20c2c5e998c3f1d52ed6d5360319 upstream.

Code reimplements functionality already in `fec_ptp_read()`,
but misses check for FEC_QUIRK_BUG_CAPTURE. Replace with function call.

Fixes: 28b5f058 ("net: fec: ptp: fix convergence issue to support LinuxPTP stack")
Signed-off-by: default avatarCsókás Bence <csokas.bence@prolan.hu>
Link: https://lore.kernel.org/r/20220811101348.13755-1-csokas.bence@prolan.hu


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f861285d

drivers/net/ethernet/freescale/fec_ptp.c

+1 −5
Original line number Diff line number Diff line
@@ -141,11 +141,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) 
		 * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds

		 * to current timer would be next second.

		 */

		tempval = readl(fep->hwp + FEC_ATIME_CTRL);

		tempval |= FEC_T_CTRL_CAPTURE;

		writel(tempval, fep->hwp + FEC_ATIME_CTRL);



		tempval = readl(fep->hwp + FEC_ATIME);

		tempval = fep->cc.read(&fep->cc);

		/* Convert the ptp local counter to 1588 timestamp */

		ns = timecounter_cyc2time(&fep->tc, tempval);

		ts = ns_to_timespec64(ns);