Received-SPF: pass (google.com: domain of linux-kernel+bounces-197192-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>
Subject: [PATCH stable-5.15.y 0/2] Fix PTP received on wrong port with bridged SJA1105 DSA
Date: Fri, 31 May 2024 19:50:14 +0300
Message-Id: <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?X2vFEZxStmGFyHEGz37FHs1uLCX1B2FP3tmoX0b2bvuIL58P9pwG9TZDd57s?=
 =?us-ascii?Q?gYyB6Aaoq3XMBRzVCFnyWzHIM83gsvLBQJFDj7OwWhkbGQDQ/FiDW5LYpP1W?=
 =?us-ascii?Q?XF18ex2JXzSQdi2SrUnTwTeJW74ugQNjlFbBFyLA5zJdlUZHA7UNKmw/Bs2R?=
 =?us-ascii?Q?O0QjGUn9lBQUo5IDdqJrM3pYj+E4op72r83IrPx/tTS4uu25pFFk4I48xmJj?=
 =?us-ascii?Q?q8qXMz1ZlfCg2IOihkpl3YhmcoBdvuu3QY6qhC7Mu0902gqcrSfZyuLYP7yX?=
 =?us-ascii?Q?R3dlYvqg1oQcbPI0YNplQ51s0N2N5DvVUDUfSbc7aFn00HDfI8zAr63lLUAc?=
 =?us-ascii?Q?wSi0WMVGPfMDIJxf7EnJraPlQMe5j35hTibHARKYerWogaZaxoumqKdscB+O?=
 =?us-ascii?Q?xha8Q53SCz2TEpufqjUZ/CXSxPMM6ayNHSDiTRiQyQOyoRSgHIhzhJetr+71?=
 =?us-ascii?Q?IJzS54oq8TRmV+ftBPpolQWYt0nhn5mAAwGjSdFQVR31mDCkHfbE3fgigU05?=
 =?us-ascii?Q?HvB4ZH0HRWCGPUNWRWzVrvk2U8zrHXeQDA61qkYHME8oZStSbXhwx3oj5ajq?=
 =?us-ascii?Q?MlWFbrAEVkDZUFfqLkWlLXLc1sFEbh0sd0NmPnSD5Z1LgX/EOrZ8pw0ig17N?=
 =?us-ascii?Q?b0sLpBX3mpRGWHiPMJgdKjmWqr84uJZXmzt/brBc+N6mk7Lr/H+MkQyisDhh?=
 =?us-ascii?Q?tN+ZCcPSZoLLRzD3V9BX/+yHdAGInr7szy90gDVI4la2it9s2vUI6KHV77dK?=
 =?us-ascii?Q?qseV/0qlx5EGvVlmiAsaOhfRqWCcyqDKlSlPWWaFeNn2770GNyQeVKn3pXVY?=
 =?us-ascii?Q?ZzauyyktTdi8JB6apu3c+zuQyXxJ2ekReKNZ//86RThkYw+3z9mru5kLzCvU?=
 =?us-ascii?Q?I/IqznrVeOJngyvTIfsohvnUten09RJWJo5jP3eik6nhMqB+tfLIO/KsAEY3?=
 =?us-ascii?Q?ssS2K+U5Em0uWWTlUZNztz0Y97jhjDaXa0FK+ybN4szibvgWjT6u7CVQFwJ6?=
 =?us-ascii?Q?yrOBIAXCy8b/dzSkWdh4tFYkVr2L/MEVBrg4qCAzQ1PqCqhAqjlGWjf+WJzW?=
 =?us-ascii?Q?aqw9mY27ig5ky4qRiziE54kumrdXjoeQHC/PgrsF4l2bEcbY3zn9uETPin9S?=
 =?us-ascii?Q?jEt2N3/iPMSwOYw7k/VuvVsTFJreGmh/p/eFVp4oP/mcHIY3K6PfUFxlkklL?=
 =?us-ascii?Q?ET+CZLMCTUDsZ5Tsv4xYazOKB8Hvt/oiwpSF977odXTQLpGp4IKalGZF/GBP?=
 =?us-ascii?Q?9ftF+uZXittsFDQ4THoX540Q9LFAwaLFd+OOUbMp0ORaPP5nHY28I5zm0aMX?=
 =?us-ascii?Q?4IZPemPXdR7A1Y5zzSmYUKm4fqCaPQ+ghQzXtFgxXhp2gGXA/woFZBqnF7+B?=
 =?us-ascii?Q?nMDEPowxwj3gNnh8qtrvPINNkF8OIwm5I8Ei6UKlEnqqTHlr9UPEmYRB70Q3?=
 =?us-ascii?Q?e8YqWMX315GGmH8my5YhonM6826q9+ekpqS3y3FUPT+JJRmlGtMEBgBCAeir?=
 =?us-ascii?Q?ShbxcwvobRzVjUxL5k3Wti+bSXZ7HqXxXi7OF5vF8sSh2/+QXN0EZjkLWv5h?=
 =?us-ascii?Q?KFqztRjyHIqLmVWtBAPoVGuvEmSAzkPzu8+yg0zQciewWFwesbJB25yhroQ8?=
 =?us-ascii?Q?Nw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ad6041f0-d9c9-4541-a968-08dc8191ca07
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:34.1756
 (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: HCa6BKhBVL0AmHP/uTwOV+btQ0Bopt3a67rinmEc2cVz6yMr4RPH0MKMOr/dxTK6ydKlkocPIOeu5g+eYFR4vQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7233

It has been brought to my attention that what had been fixed 1 year ago
here for kernels 5.18 and later:
https://lore.kernel.org/netdev/20230626155112.3155993-1-vladimir.oltean@nxp.com/

is still broken on linux-5.15.y. Short summary: PTP boundary clock is
broken for ports under a VLAN-aware bridge.

The reason is that the Fixes: tags in those patches were wrong. The
issue originated from earlier, but the changes from 5.18 (blamed there),
aka DSA FDB isolation, masked that.

A straightforward cherry-pick was not possible, due to the conflict with
the aforementioned DSA FDB isolation work from 5.18. So I redid patch
2/2 and marked what I had to adapt.

Tested on the NXP LS1021A-TSN board.

Vladimir Oltean (2):
  net: dsa: sja1105: always enable the INCL_SRCPT option
  net: dsa: tag_sja1105: always prefer source port information from
    INCL_SRCPT

 drivers/net/dsa/sja1105/sja1105_main.c |  9 ++-----
 net/dsa/tag_sja1105.c                  | 34 ++++++++++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)
---

I'm sorry for the people who will want to backport DSA FDB isolation to
linux-5.15.y :(

-- 
2.34.1