From d6c172fc7bde91e78eceeb211649594db035e8ce Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 29 Apr 2025 16:20:24 +0200 Subject: [PATCH] 6.1-stable patches added patches: net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch --- ...ble-.port_set_policy-for-6320-family.patch | 43 +++++++++++++ ...mv88e6xxx-enable-pvt-for-6321-switch.patch | 35 +++++++++++ ...x-enable-stu-methods-for-6320-family.patch | 62 +++++++++++++++++++ ...x-atu_move_port_mask-for-6341-family.patch | 45 ++++++++++++++ queue-6.1/series | 4 ++ 5 files changed, 189 insertions(+) create mode 100644 queue-6.1/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch create mode 100644 queue-6.1/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch create mode 100644 queue-6.1/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch create mode 100644 queue-6.1/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch diff --git a/queue-6.1/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch b/queue-6.1/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch new file mode 100644 index 0000000000..0107b9a885 --- /dev/null +++ b/queue-6.1/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch @@ -0,0 +1,43 @@ +From stable+bounces-137035-greg=kroah.com@vger.kernel.org Tue Apr 29 12:13:16 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:13:02 +0200 +Subject: net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family +To: stable@vger.kernel.org, Sasha Levin +Cc: "Andrew Lunn" , "Vladimir Oltean" , "Eric Dumazet" , "Marek Behún" , "Jakub Kicinski" +Message-ID: <20250429101303.18190-3-kabel@kernel.org> + +From: "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 +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20250317173250.28780-5-kabel@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -5173,6 +5173,7 @@ static const struct mv88e6xxx_ops mv88e6 + .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 mv88e6 + .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, diff --git a/queue-6.1/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch b/queue-6.1/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch new file mode 100644 index 0000000000..30df41b367 --- /dev/null +++ b/queue-6.1/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch @@ -0,0 +1,35 @@ +From stable+bounces-137034-greg=kroah.com@vger.kernel.org Tue Apr 29 12:13:15 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:13:01 +0200 +Subject: net: dsa: mv88e6xxx: enable PVT for 6321 switch +To: stable@vger.kernel.org, Sasha Levin +Cc: "Andrew Lunn" , "Vladimir Oltean" , "Eric Dumazet" , "Marek Behún" , "Jakub Kicinski" +Message-ID: <20250429101303.18190-2-kabel@kernel.org> + +From: "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 +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20250317173250.28780-4-kabel@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/mv88e6xxx/chip.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -6250,6 +6250,7 @@ static const struct mv88e6xxx_info mv88e + .g1_irqs = 8, + .g2_irqs = 10, + .atu_move_port_mask = 0xf, ++ .pvt = true, + .multi_chip = true, + .edsa_support = MV88E6XXX_EDSA_SUPPORTED, + .ptp_support = true, diff --git a/queue-6.1/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch b/queue-6.1/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch new file mode 100644 index 0000000000..a1ef6e6605 --- /dev/null +++ b/queue-6.1/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch @@ -0,0 +1,62 @@ +From stable+bounces-137036-greg=kroah.com@vger.kernel.org Tue Apr 29 12:13:19 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:13:03 +0200 +Subject: net: dsa: mv88e6xxx: enable STU methods for 6320 family +To: stable@vger.kernel.org, Sasha Levin +Cc: "Andrew Lunn" , "Vladimir Oltean" , "Eric Dumazet" , "Marek Behún" , "Jakub Kicinski" +Message-ID: <20250429101303.18190-4-kabel@kernel.org> + +From: "Marek Behún" + +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 +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20250317173250.28780-6-kabel@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -5200,6 +5200,8 @@ static const struct mv88e6xxx_ops mv88e6 + .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 mv88e6 + .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 mv88e + .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 mv88e + .internal_phys_offset = 3, + .num_gpio = 15, + .max_vid = 4095, ++ .max_sid = 63, + .port_base_addr = 0x10, + .phy_base_addr = 0x0, + .global1_addr = 0x1b, diff --git a/queue-6.1/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch b/queue-6.1/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch new file mode 100644 index 0000000000..a63c916b4c --- /dev/null +++ b/queue-6.1/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch @@ -0,0 +1,45 @@ +From stable+bounces-137033-greg=kroah.com@vger.kernel.org Tue Apr 29 12:13:17 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:13:00 +0200 +Subject: net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family +To: stable@vger.kernel.org, Sasha Levin +Cc: "Andrew Lunn" , "Vladimir Oltean" , "Eric Dumazet" , "Marek Behún" , "Jakub Kicinski" +Message-ID: <20250429101303.18190-1-kabel@kernel.org> + +From: "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 +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20250317173250.28780-3-kabel@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -5813,7 +5813,7 @@ static const struct mv88e6xxx_info mv88e + .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 mv88e + .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, diff --git a/queue-6.1/series b/queue-6.1/series index 30e72619cc..bd4af9f426 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -152,3 +152,7 @@ jfs-define-xtree-root-and-page-independently.patch comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch net-sched-act_mirred-don-t-override-retval-if-we-already-lost-the-skb.patch +net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch +net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch +net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch +net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch -- 2.47.3