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

Commit fd6720ae authored by Mario Molitor's avatar Mario Molitor Committed by David S. Miller
Browse files

stmmac: fix ptp header for GMAC3 hw timestamp 



According the CYCLON V documention only the bit 16 of snaptypesel should
set.
(more information see Table 17-20 (cv_5v4.pdf) :
 Timestamp Snapshot Dependency on Register Bits)

Fixes: d2042052 ("stmmac: update the PTP header file")
Signed-off-by: default avatarMario Molitor <mario_molitor@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f186ce61

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+12 −3
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) 
			/* PTP v1, UDP, any kind of event packet */

			config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;

			/* take time stamp for all event messages */

			if (priv->plat->has_gmac4)

				snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;

			else

				snap_type_sel = PTP_TCR_SNAPTYPSEL_1;



			ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
@@ -578,6 +581,9 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) 
			config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;

			ptp_v2 = PTP_TCR_TSVER2ENA;

			/* take time stamp for all event messages */

			if (priv->plat->has_gmac4)

				snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;

			else

				snap_type_sel = PTP_TCR_SNAPTYPSEL_1;



			ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
@@ -612,6 +618,9 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) 
			config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

			ptp_v2 = PTP_TCR_TSVER2ENA;

			/* take time stamp for all event messages */

			if (priv->plat->has_gmac4)

				snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;

			else

				snap_type_sel = PTP_TCR_SNAPTYPSEL_1;



			ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;

drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ 
/* Enable Snapshot for Messages Relevant to Master */

#define	PTP_TCR_TSMSTRENA	BIT(15)

/* Select PTP packets for Taking Snapshots */

#define	PTP_TCR_SNAPTYPSEL_1	GENMASK(17, 16)

#define	PTP_TCR_SNAPTYPSEL_1	BIT(16)

#define	PTP_GMAC4_TCR_SNAPTYPSEL_1	GENMASK(17, 16)

/* Enable MAC address for PTP Frame Filtering */

#define	PTP_TCR_TSENMACADDR	BIT(18)