Received-SPF: pass (google.com: domain of linux-kernel+bounces-197193-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: stable@vger.kernel.org,
	Sasha Levin <sashal@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Andrew Lunn <andrew@lunn.ch>,
	Florian Fainelli <f.fainelli@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	Simon Horman <horms@kernel.org>,
	Simon Horman <simon.horman@corigine.com>
Subject: [PATCH stable-5.15.y 1/2] net: dsa: sja1105: always enable the INCL_SRCPT option
Date: Fri, 31 May 2024 19:50:15 +0300
Message-Id: <20240531165016.3021154-2-vladimir.oltean@nxp.com>
In-Reply-To: <20240531165016.3021154-1-vladimir.oltean@nxp.com>
References: <20240531165016.3021154-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?l1e2arjndqCP6+L3I7jaFtf24UafDwA7GHdl9HOJYxF4KZkSI2FcUwkduyx1?=
 =?us-ascii?Q?zoX2Ma8OrfSLH0857F2qrwh9GR/GL/dJHmncSXrN5bdL1o9Mbdl9J/0dsz0N?=
 =?us-ascii?Q?jLwFZOSauTxv/ZhMCmeyejJx6nxc9S2Xrt4KwPqhQ6aBcCBc3Pcp1SrE6GsK?=
 =?us-ascii?Q?3MUm70gkqZMkmG7AKfl2uY9sp9vqn6YuU3G7pRqSoZHL9/I18IjPefEP597d?=
 =?us-ascii?Q?gRA6t9dFctB6yb6CdwObq39gebnfOuthj1MzJYg3KMziMvPPKmMd+tVgCJAL?=
 =?us-ascii?Q?CzEiboVNCDMINQV5E8zrzO+Ao8TE3hbZTa3B4zULUvRxx21u7jLOxqdPm2lR?=
 =?us-ascii?Q?a2sy2plLOJcLWv1mrq/RkxstMidXE3sTJky6FiQdX7R6HuHFn5Wm3JMvUOZl?=
 =?us-ascii?Q?nvJS2eV4ZFBjOCo1uRnAA14Edk1YylSVQNFbFY/KnpCN4K538RR1dLW66yb9?=
 =?us-ascii?Q?ww7ks+C4g2bUqtpI3VcSTtUPq18L9tocOvJAE6cAGtRNWGuNwCPCIUagg8ob?=
 =?us-ascii?Q?pAwmR/GG5L2mDCKyo0AQAN25zG692q6jC7SXFxgxdD4b7GUVrZifXYmux2/P?=
 =?us-ascii?Q?D7wvDNgJkARI3rqXLMW8xg5Prj2lIMsU8w49w/KxqfyVJ9xjhJbM5vxJEtWZ?=
 =?us-ascii?Q?q1gBFIWe8Em+N8F4QTsGPxSgY+HkB6ZctDFoQCc89EMz013pppse/DLJHsrW?=
 =?us-ascii?Q?XnCCVUu5b5eZwusKiFPalQGwDswkqwD1osJWq2P5nhxieeJwt6vyKQrat299?=
 =?us-ascii?Q?scX0nYhbYgghvwNuKzGcvbqGNBlRKfkpJZq5lauxpzd3G0CIeOXnWN0YMhkr?=
 =?us-ascii?Q?4ZYKlhEF+7avC3+ecRdMGqIbMDwiu76096Hs+dTuiiesz4LwPkc3FF35wrHy?=
 =?us-ascii?Q?ksrpVWYeqwwN77n+4MB8HSqTqzlqwOKWdFdPmlbs5Rfoi3gXMHn7iM99mRpv?=
 =?us-ascii?Q?t7l5PpZlyUQLfGerkbc5SmPJWvU3UkCYPN4LKBY0z7OYahEDfprgxGHjXLjj?=
 =?us-ascii?Q?+XzhiloR6uTVFiSMlw0EKVSQCDl0beHk9m2boaC6c3ZV2MOzGubG3prTzQtY?=
 =?us-ascii?Q?EZBebGIQK8IoS3aTAzIIguV8qRiU57Nqa0GuhpJSaLX0YNI34tBLZfUdjPWp?=
 =?us-ascii?Q?w+pSfHkUx6M4Qtv7Dl9ibQXQugFA1RSc3DPjh8SxzBlVyIihoWv5cybaLXId?=
 =?us-ascii?Q?+b+Gb7C4cRdBGmZR7n2J9FhZky52+fPNNqjgPQet8ZgClMjCEomc6MnUX1cK?=
 =?us-ascii?Q?OhGwZrd5eS2+IxIZj96RSoLwtXLHD1U88K/MiKGI3QdhJGvmZ1nsNzi7RJkn?=
 =?us-ascii?Q?+hL3r2q6zQ6+WJaLrYCSgv4V1Qzdj39/NQIUSLYYTfsfgXuR3axnnkg+pHH2?=
 =?us-ascii?Q?dpK9XV8sNU719GYok1pOpiP/8QnBuZidBbHs1umFtSZzGSu+iRVeKGqTZizL?=
 =?us-ascii?Q?pzrXwuzxro1sRyWOkyOaDgpbCz+SUdUogA5grtsgWofeDM6ntFZG5q6Tk8dJ?=
 =?us-ascii?Q?vnbIkA0zy+5MpphZ8A6W4ucluRwjLiufpbqFqYUGbeACpndUUl0t3S9iSc79?=
 =?us-ascii?Q?rXIVV8xfQObsCPN4NVHdAPro1OC8KtVmlzSsBI5l1cP3Z4QJ3EmEmeRNYnii?=
 =?us-ascii?Q?kw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e037b366-8f13-4d19-10d7-08dc8191cad5
X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4555.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 16:50:35.4195
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: T76d/Xm25i+Qn1m1GDMdLMhDG83tj5ZnPFWgfvBylX8JaeCZbE2gIw1wvby5Ap/J02F92YKiNdz4KFrpTjTh7g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7233

commit b4638af8885af93cd70351081da1909c59342440 upstream.

Link-local traffic on bridged SJA1105 ports is sometimes tagged by the
hardware with source port information (when the port is under a VLAN
aware bridge).

The tag_8021q source port identification has become more loose
("imprecise") and will report a plausible rather than exact bridge port,
when under a bridge (be it VLAN-aware or VLAN-unaware). But link-local
traffic always needs to know the precise source port.

Modify the driver logic (and therefore: the tagging protocol itself) to
always include the source port information with link-local packets,
regardless of whether the port is standalone, under a VLAN-aware or
VLAN-unaware bridge. This makes it possible for the tagging driver to
give priority to that information over the tag_8021q VLAN header.

The big drawback with INCL_SRCPT is that it makes it impossible to
distinguish between an original MAC DA of 01:80:C2:XX:YY:ZZ and
01:80:C2:AA:BB:ZZ, because the tagger just patches MAC DA bytes 3 and 4
with zeroes. Only if PTP RX timestamping is enabled, the switch will
generate a META follow-up frame containing the RX timestamp and the
original bytes 3 and 4 of the MAC DA. Those will be used to patch up the
original packet. Nonetheless, in the absence of PTP RX timestamping, we
have to live with this limitation, since it is more important to have
the more precise source port information for link-local traffic.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Cc: stable@vger.kernel.org
[ dropped Fixes: tags for patches not in linux-5.15.y ]
Stable-dep-of: c1ae02d87689 ("net: dsa: tag_sja1105: always prefer source port information from INCL_SRCPT")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/dsa/sja1105/sja1105_main.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 493192a8000c..888f10d93b9a 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -853,11 +853,11 @@ static int sja1105_init_general_params(struct sja1105_private *priv)
 		.hostprio = 7,
 		.mac_fltres1 = SJA1105_LINKLOCAL_FILTER_A,
 		.mac_flt1    = SJA1105_LINKLOCAL_FILTER_A_MASK,
-		.incl_srcpt1 = false,
+		.incl_srcpt1 = true,
 		.send_meta1  = false,
 		.mac_fltres0 = SJA1105_LINKLOCAL_FILTER_B,
 		.mac_flt0    = SJA1105_LINKLOCAL_FILTER_B_MASK,
-		.incl_srcpt0 = false,
+		.incl_srcpt0 = true,
 		.send_meta0  = false,
 		/* Default to an invalid value */
 		.mirr_port = priv->ds->num_ports,
@@ -2346,11 +2346,6 @@ int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled,
 	general_params->tpid = tpid;
 	/* EtherType used to identify outer tagged (S-tag) VLAN traffic */
 	general_params->tpid2 = tpid2;
-	/* When VLAN filtering is on, we need to at least be able to
-	 * decode management traffic through the "backup plan".
-	 */
-	general_params->incl_srcpt1 = enabled;
-	general_params->incl_srcpt0 = enabled;
 
 	/* VLAN filtering => independent VLAN learning.
 	 * No VLAN filtering (or best effort) => shared VLAN learning.
-- 
2.34.1