From: Kurt Kanzenbach <kurt@linutronix.de>
Date: Tue, 14 Dec 2021 13:45:07 +0000 (+0100)
Subject: net: dsa: hellcreek: Allow PTP P2P measurements on blocked ports
X-Git-Tag: Ubuntu-5.15.0-19.19~597
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f9ce6732a261212770b71f3b7dbb555bc826d5bd;p=mirror_ubuntu-jammy-kernel.git

net: dsa: hellcreek: Allow PTP P2P measurements on blocked ports

BugLink: https://bugs.launchpad.net/bugs/1959376

[ Upstream commit cad1798d2d0811ded37d1e946c6796102e58013b ]

Allow PTP peer delay measurements on blocked ports by STP. In case of topology
changes the PTP stack can directly start with the correct delays.

Fixes: ddd56dfe52c9 ("net: dsa: hellcreek: Add PTP clock support")
Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---

diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
index 1469e41f2045..2dd1227e0c35 100644
--- a/drivers/net/dsa/hirschmann/hellcreek.c
+++ b/drivers/net/dsa/hirschmann/hellcreek.c
@@ -1069,7 +1069,7 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
 		.portmask     = 0x03,	/* Management ports */
 		.age	      = 0,
 		.is_obt	      = 0,
-		.pass_blocked = 0,
+		.pass_blocked = 1,
 		.is_static    = 1,
 		.reprio_tc    = 6,	/* TC: 6 as per IEEE 802.1AS */
 		.reprio_en    = 1,