From: Greg Kroah-Hartman Date: Tue, 29 Apr 2025 14:20:34 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v5.4.293~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=494da55b19ba94a72b19b3d12e348ced6ca879d3;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-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 --- diff --git a/queue-6.6/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch b/queue-6.6/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch new file mode 100644 index 0000000000..d211901282 --- /dev/null +++ b/queue-6.6/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch @@ -0,0 +1,43 @@ +From stable+bounces-137031-greg=kroah.com@vger.kernel.org Tue Apr 29 12:11:04 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:10:49 +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: <20250429101050.17539-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 +@@ -5047,6 +5047,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, +@@ -5097,6 +5098,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.6/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch b/queue-6.6/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch new file mode 100644 index 0000000000..9abc998ce8 --- /dev/null +++ b/queue-6.6/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch @@ -0,0 +1,35 @@ +From stable+bounces-137030-greg=kroah.com@vger.kernel.org Tue Apr 29 12:11:01 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:10:48 +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: <20250429101050.17539-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 +@@ -6152,6 +6152,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.6/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch b/queue-6.6/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch new file mode 100644 index 0000000000..9703822aff --- /dev/null +++ b/queue-6.6/net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch @@ -0,0 +1,62 @@ +From stable+bounces-137032-greg=kroah.com@vger.kernel.org Tue Apr 29 12:11:08 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:10:50 +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: <20250429101050.17539-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 +@@ -5074,6 +5074,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, +@@ -5124,6 +5126,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, +@@ -6120,6 +6124,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, +@@ -6146,6 +6151,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.6/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch b/queue-6.6/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch new file mode 100644 index 0000000000..3175199957 --- /dev/null +++ b/queue-6.6/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch @@ -0,0 +1,45 @@ +From stable+bounces-137029-greg=kroah.com@vger.kernel.org Tue Apr 29 12:11:00 2025 +From: "Marek Behún" +Date: Tue, 29 Apr 2025 12:10:47 +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: <20250429101050.17539-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 +@@ -5713,7 +5713,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, +@@ -6174,7 +6174,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.6/series b/queue-6.6/series index 4c9556a095..fb383139d4 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -193,3 +193,7 @@ driver-core-fix-potential-null-pointer-dereference-in-dev_uevent.patch vmxnet3-fix-malformed-packet-sizing-in-vmxnet3_process_xdp.patch comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch ext4-goto-right-label-out_mmap_sem-in-ext4_setattr.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