Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Mario Molitor <mario_molitor@web.de>,
        "David S . Miller" <davem@davemloft.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 023/293] stmmac: fix ptp header for GMAC3 hw
 timestamp
Thread-Topic: [PATCH AUTOSEL for 4.9 023/293] stmmac: fix ptp header for GMAC3
 hw timestamp
Thread-Index: AQHTz5jvtd+9hZey4Ee/y9MqytTWrQ==
Date:   Mon, 9 Apr 2018 00:23:07 +0000
Message-ID: <20180409002239.163177-23-alexander.levin@microsoft.com>
References: <20180409002239.163177-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b7c4461-3682-4ae6-edc8-08d59db0920b
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:23:07.9873
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Mario Molitor <mario_molitor@web.de>

[ Upstream commit fd6720aefde06eacf17404eed2cad65c6ec103e1 ]

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: d2042052a0aa ("stmmac: update the PTP header file")
Signed-off-by: Mario Molitor <mario_molitor@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 ++++++++++++---
 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h  |  3 ++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne=
t/ethernet/stmicro/stmmac/stmmac_main.c
index 98bbb91336e4..c212d1dd8bfd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -478,7 +478,10 @@ static int stmmac_hwtstamp_ioctl(struct net_device *de=
v, struct ifreq *ifr)
 			/* PTP v1, UDP, any kind of event packet */
 			config.rx_filter =3D HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
 			/* take time stamp for all event messages */
-			snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
+			if (priv->plat->has_gmac4)
+				snap_type_sel =3D PTP_GMAC4_TCR_SNAPTYPSEL_1;
+			else
+				snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
=20
 			ptp_over_ipv4_udp =3D PTP_TCR_TSIPV4ENA;
 			ptp_over_ipv6_udp =3D PTP_TCR_TSIPV6ENA;
@@ -510,7 +513,10 @@ static int stmmac_hwtstamp_ioctl(struct net_device *de=
v, struct ifreq *ifr)
 			config.rx_filter =3D HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
 			ptp_v2 =3D PTP_TCR_TSVER2ENA;
 			/* take time stamp for all event messages */
-			snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
+			if (priv->plat->has_gmac4)
+				snap_type_sel =3D PTP_GMAC4_TCR_SNAPTYPSEL_1;
+			else
+				snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
=20
 			ptp_over_ipv4_udp =3D PTP_TCR_TSIPV4ENA;
 			ptp_over_ipv6_udp =3D PTP_TCR_TSIPV6ENA;
@@ -544,7 +550,10 @@ static int stmmac_hwtstamp_ioctl(struct net_device *de=
v, struct ifreq *ifr)
 			config.rx_filter =3D HWTSTAMP_FILTER_PTP_V2_EVENT;
 			ptp_v2 =3D PTP_TCR_TSVER2ENA;
 			/* take time stamp for all event messages */
-			snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
+			if (priv->plat->has_gmac4)
+				snap_type_sel =3D PTP_GMAC4_TCR_SNAPTYPSEL_1;
+			else
+				snap_type_sel =3D PTP_TCR_SNAPTYPSEL_1;
=20
 			ptp_over_ipv4_udp =3D PTP_TCR_TSIPV4ENA;
 			ptp_over_ipv6_udp =3D PTP_TCR_TSIPV6ENA;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net=
/ethernet/stmicro/stmmac/stmmac_ptp.h
index c06938c47af5..174777cd888e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -63,7 +63,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)
=20
--=20
2.15.1