Commit 6cf01e45 authored by Kurt Kanzenbach's avatar Kurt Kanzenbach Committed by Jakub Kicinski
Browse files

net: dsa: hellcreek: Add missing PTP via UDP rules 



The switch supports PTP for UDP transport too. Therefore, add the missing static
FDB entries to ensure correct forwarding of these packets.

Fixes: ddd56dfe ("net: dsa: hellcreek: Add PTP clock support")
Signed-off-by: default avatarKurt Kanzenbach <kurt@linutronix.de>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent cad1798d

drivers/net/dsa/hirschmann/hellcreek.c

+60 −4
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek) 


static int hellcreek_setup_fdb(struct hellcreek *hellcreek)

{

	static struct hellcreek_fdb_entry ptp = {

	static struct hellcreek_fdb_entry l2_ptp = {

		/* MAC: 01-1B-19-00-00-00 */

		.mac	      = { 0x01, 0x1b, 0x19, 0x00, 0x00, 0x00 },

		.portmask     = 0x03,	/* Management ports */
@@ -1064,7 +1064,29 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) 
		.reprio_tc    = 6,	/* TC: 6 as per IEEE 802.1AS */

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry p2p = {

	static struct hellcreek_fdb_entry udp4_ptp = {

		/* MAC: 01-00-5E-00-01-81 */

		.mac	      = { 0x01, 0x00, 0x5e, 0x00, 0x01, 0x81 },

		.portmask     = 0x03,	/* Management ports */

		.age	      = 0,

		.is_obt	      = 0,

		.pass_blocked = 0,

		.is_static    = 1,

		.reprio_tc    = 6,

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry udp6_ptp = {

		/* MAC: 33-33-00-00-01-81 */

		.mac	      = { 0x33, 0x33, 0x00, 0x00, 0x01, 0x81 },

		.portmask     = 0x03,	/* Management ports */

		.age	      = 0,

		.is_obt	      = 0,

		.pass_blocked = 0,

		.is_static    = 1,

		.reprio_tc    = 6,

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry l2_p2p = {

		/* MAC: 01-80-C2-00-00-0E */

		.mac	      = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e },

		.portmask     = 0x03,	/* Management ports */
@@ -1075,6 +1097,28 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) 
		.reprio_tc    = 6,	/* TC: 6 as per IEEE 802.1AS */

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry udp4_p2p = {

		/* MAC: 01-00-5E-00-00-6B */

		.mac	      = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x6b },

		.portmask     = 0x03,	/* Management ports */

		.age	      = 0,

		.is_obt	      = 0,

		.pass_blocked = 1,

		.is_static    = 1,

		.reprio_tc    = 6,

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry udp6_p2p = {

		/* MAC: 33-33-00-00-00-6B */

		.mac	      = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x6b },

		.portmask     = 0x03,	/* Management ports */

		.age	      = 0,

		.is_obt	      = 0,

		.pass_blocked = 1,

		.is_static    = 1,

		.reprio_tc    = 6,

		.reprio_en    = 1,

	};

	static struct hellcreek_fdb_entry stp = {

		/* MAC: 01-80-C2-00-00-00 */

		.mac	      = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 },
@@ -1089,10 +1133,22 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) 
	int ret;



	mutex_lock(&hellcreek->reg_lock);

	ret = __hellcreek_fdb_add(hellcreek, &ptp);

	ret = __hellcreek_fdb_add(hellcreek, &l2_ptp);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &udp4_ptp);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &udp6_ptp);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &l2_p2p);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &udp4_p2p);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &p2p);

	ret = __hellcreek_fdb_add(hellcreek, &udp6_p2p);

	if (ret)

		goto out;

	ret = __hellcreek_fdb_add(hellcreek, &stp);