[PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port

public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
@ 2025-04-29 10:13 Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 2/4] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Marek Behún @ 2025-04-29 10:13 UTC (permalink / raw)
  To: stable, Sasha Levin
  Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún,
	Jakub Kicinski

commit 4ae01ec007716986e1a20f1285eb013cbf188830 upstream.

The atu_move_port_mask for 6341 family (Topaz) is 0xf, not 0x1f. The
PortVec field is 8 bits wide, not 11 as in 6390 family. Fix this.

Fixes: e606ca36bbf2 ("net: dsa: mv88e6xxx: rework ATU Remove")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250317173250.28780-3-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 0541c9a7fc49..b5e06f66cd38 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5813,7 +5813,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.global1_addr = 0x1b,
 		.global2_addr = 0x1c,
 		.age_time_coeff = 3750,
-		.atu_move_port_mask = 0x1f,
+		.atu_move_port_mask = 0xf,
 		.g1_irqs = 9,
 		.g2_irqs = 10,
 		.pvt = true,
@@ -6272,7 +6272,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.global1_addr = 0x1b,
 		.global2_addr = 0x1c,
 		.age_time_coeff = 3750,
-		.atu_move_port_mask = 0x1f,
+		.atu_move_port_mask = 0xf,
 		.g1_irqs = 9,
 		.g2_irqs = 10,
 		.pvt = true,
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 6.1.y v2 2/4] net: dsa: mv88e6xxx: enable PVT for 6321 switch
  2025-04-29 10:13 [PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
@ 2025-04-29 10:13 ` Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 3/4] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 4/4] net: dsa: mv88e6xxx: enable STU methods " Marek Behún
  2 siblings, 0 replies; 4+ messages in thread
From: Marek Behún @ 2025-04-29 10:13 UTC (permalink / raw)
  To: stable, Sasha Levin
  Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún,
	Jakub Kicinski

commit f85c69369854a43af2c5d3b3896da0908d713133 upstream.

Commit f36456522168 ("net: dsa: mv88e6xxx: move PVT description in
info") did not enable PVT for 6321 switch. Fix it.

Fixes: f36456522168 ("net: dsa: mv88e6xxx: move PVT description in info")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250317173250.28780-4-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index b5e06f66cd38..8f53123de004 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6250,6 +6250,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.g1_irqs = 8,
 		.g2_irqs = 10,
 		.atu_move_port_mask = 0xf,
+		.pvt = true,
 		.multi_chip = true,
 		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,
 		.ptp_support = true,
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 6.1.y v2 3/4] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
  2025-04-29 10:13 [PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 2/4] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
@ 2025-04-29 10:13 ` Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 4/4] net: dsa: mv88e6xxx: enable STU methods " Marek Behún
  2 siblings, 0 replies; 4+ messages in thread
From: Marek Behún @ 2025-04-29 10:13 UTC (permalink / raw)
  To: stable, Sasha Levin
  Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún,
	Jakub Kicinski

commit a2ef58e2c4aea4de166fc9832eb2b621e88c98d5 upstream.

Commit f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy")
did not add the .port_set_policy() method for the 6320 family. Fix it.

Fixes: f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250317173250.28780-5-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 8f53123de004..96b989e336ae 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5173,6 +5173,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
 	.port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
 	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
 	.port_tag_remap = mv88e6095_port_tag_remap,
+	.port_set_policy = mv88e6352_port_set_policy,
 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,
 	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
 	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,
@@ -5221,6 +5222,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
 	.port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
 	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
 	.port_tag_remap = mv88e6095_port_tag_remap,
+	.port_set_policy = mv88e6352_port_set_policy,
 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,
 	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
 	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 6.1.y v2 4/4] net: dsa: mv88e6xxx: enable STU methods for 6320 family
  2025-04-29 10:13 [PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 2/4] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
  2025-04-29 10:13 ` [PATCH 6.1.y v2 3/4] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
@ 2025-04-29 10:13 ` Marek Behún
  2 siblings, 0 replies; 4+ messages in thread
From: Marek Behún @ 2025-04-29 10:13 UTC (permalink / raw)
  To: stable, Sasha Levin
  Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún,
	Jakub Kicinski

commit 1428a6109b20e356188c3fb027bdb7998cc2fb98 upstream.

Commit c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all
supported chips") introduced STU methods, but did not add them to the
6320 family. Fix it.

Fixes: c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250317173250.28780-6-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 96b989e336ae..29e4c94c8405 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5200,6 +5200,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
 	.reset = mv88e6352_g1_reset,
 	.vtu_getnext = mv88e6352_g1_vtu_getnext,
 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+	.stu_getnext = mv88e6352_g1_stu_getnext,
+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6352_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -5248,6 +5250,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
 	.reset = mv88e6352_g1_reset,
 	.vtu_getnext = mv88e6352_g1_vtu_getnext,
 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+	.stu_getnext = mv88e6352_g1_stu_getnext,
+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6352_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -6218,6 +6222,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.internal_phys_offset = 3,
 		.num_gpio = 15,
 		.max_vid = 4095,
+		.max_sid = 63,
 		.port_base_addr = 0x10,
 		.phy_base_addr = 0x0,
 		.global1_addr = 0x1b,
@@ -6244,6 +6249,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.internal_phys_offset = 3,
 		.num_gpio = 15,
 		.max_vid = 4095,
+		.max_sid = 63,
 		.port_base_addr = 0x10,
 		.phy_base_addr = 0x0,
 		.global1_addr = 0x1b,
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-04-29 10:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-29 10:13 [PATCH 6.1.y v2 1/4] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-04-29 10:13 ` [PATCH 6.1.y v2 2/4] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
2025-04-29 10:13 ` [PATCH 6.1.y v2 3/4] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
2025-04-29 10:13 ` [PATCH 6.1.y v2 4/4] net: dsa: mv88e6xxx: enable STU methods " Marek Behún

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox