* [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
@ 2025-04-28 8:49 Marek Behún
2025-04-28 8:49 ` [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Marek Behún @ 2025-04-28 8:49 UTC (permalink / raw)
To: stable, Sasha Levin
Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún
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>
---
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 9f7ff54894d4..02bcf5a4b073 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5217,7 +5217,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,
@@ -5660,7 +5660,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] 6+ messages in thread* [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch
2025-04-28 8:49 [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
@ 2025-04-28 8:49 ` Marek Behún
2025-04-29 12:49 ` Sasha Levin
2025-04-28 8:49 ` [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
2025-04-29 12:50 ` [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Sasha Levin
2 siblings, 1 reply; 6+ messages in thread
From: Marek Behún @ 2025-04-28 8:49 UTC (permalink / raw)
To: stable, Sasha Levin
Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún
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>
---
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 02bcf5a4b073..06ae3440c785 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5639,6 +5639,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] 6+ messages in thread* Re: [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch
2025-04-28 8:49 ` [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
@ 2025-04-29 12:49 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2025-04-29 12:49 UTC (permalink / raw)
To: stable; +Cc: Marek Behún, Sasha Levin
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: f85c69369854a43af2c5d3b3896da0908d713133
Status in newer kernel trees:
6.14.y | Present (different SHA1: 7eb13e5b4615)
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: f85c69369854a ! 1: a6896c73ecdf9 net: dsa: mv88e6xxx: enable PVT for 6321 switch
@@ Metadata
## Commit message ##
net: dsa: mv88e6xxx: enable PVT for 6321 switch
+ 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 ##
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_info mv88e6xxx_table[] = {
+ .g1_irqs = 8,
.g2_irqs = 10,
- .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,
.atu_move_port_mask = 0xf,
+ .pvt = true,
.multi_chip = true,
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
2025-04-28 8:49 [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-04-28 8:49 ` [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
@ 2025-04-28 8:49 ` Marek Behún
2025-04-29 13:01 ` Sasha Levin
2025-04-29 12:50 ` [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Sasha Levin
2 siblings, 1 reply; 6+ messages in thread
From: Marek Behún @ 2025-04-28 8:49 UTC (permalink / raw)
To: stable, Sasha Levin
Cc: Andrew Lunn, Vladimir Oltean, Eric Dumazet, Marek Behún
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>
---
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 06ae3440c785..2d1d60dbe7f0 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4597,6 +4597,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
.port_sync_link = mv88e6xxx_port_sync_link,
.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,
@@ -4644,6 +4645,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
.port_sync_link = mv88e6xxx_port_sync_link,
.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] 6+ messages in thread* Re: [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
2025-04-28 8:49 ` [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
@ 2025-04-29 13:01 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2025-04-29 13:01 UTC (permalink / raw)
To: stable; +Cc: Marek Behún, Sasha Levin
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: a2ef58e2c4aea4de166fc9832eb2b621e88c98d5
Status in newer kernel trees:
6.14.y | Present (different SHA1: a0898cf9a38d)
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: a2ef58e2c4aea ! 1: 0730fa59a0c25 net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
@@ Metadata
## Commit message ##
net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
+ 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 ##
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_ops mv88e6320_ops = {
- .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
+ .port_sync_link = mv88e6xxx_port_sync_link,
.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
.port_tag_remap = mv88e6095_port_tag_remap,
+ .port_set_policy = mv88e6352_port_set_policy,
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_ops mv88e6320_op
.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_ops mv88e6321_ops = {
- .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,
+ .port_sync_link = mv88e6xxx_port_sync_link,
.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
.port_tag_remap = mv88e6095_port_tag_remap,
+ .port_set_policy = mv88e6352_port_set_policy,
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
2025-04-28 8:49 [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-04-28 8:49 ` [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
2025-04-28 8:49 ` [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
@ 2025-04-29 12:50 ` Sasha Levin
2 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2025-04-29 12:50 UTC (permalink / raw)
To: stable; +Cc: Marek Behún, Sasha Levin
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: 4ae01ec007716986e1a20f1285eb013cbf188830
Status in newer kernel trees:
6.14.y | Present (different SHA1: 74c9ffccc3c8)
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: 4ae01ec007716 ! 1: c951fb413223a net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
@@ Metadata
## Commit message ##
net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
+ 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 ##
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_info mv88e6xxx_table[] = {
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_info mv88e6xxx_t
+ .atu_move_port_mask = 0xf,
.g1_irqs = 9,
.g2_irqs = 10,
- .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,
+ .pvt = true,
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.global1_addr = 0x1b,
.global2_addr = 0x1c,
@@ drivers/net/dsa/mv88e6xxx/chip.c: static const struct mv88e6xxx_info mv88e6xxx_t
+ .atu_move_port_mask = 0xf,
.g1_irqs = 9,
.g2_irqs = 10,
- .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,
+ .pvt = true,
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-04-29 13:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-28 8:49 [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-04-28 8:49 ` [PATCH 5.15.y 2/3] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
2025-04-29 12:49 ` Sasha Levin
2025-04-28 8:49 ` [PATCH 5.15.y 3/3] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
2025-04-29 13:01 ` Sasha Levin
2025-04-29 12:50 ` [PATCH 5.15.y 1/3] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox