5.15-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-fix-atu_move_port_mask-for-6341-family.patch

diff --git a/queue-5.15/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch b/queue-5.15/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch
new file mode 100644 (file)
index 0000000..c1b6287
--- /dev/null
+++ b/queue-5.15/net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch
@@ -0,0 +1,43 @@
+From stable+bounces-137039-greg=kroah.com@vger.kernel.org Tue Apr 29 12:14:52 2025
+From: "Marek Behún" <kabel@kernel.org>
+Date: Tue, 29 Apr 2025 12:14:36 +0200
+Subject: net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
+To: stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>
+Cc: "Andrew Lunn" <andrew@lunn.ch>, "Vladimir Oltean" <olteanv@gmail.com>, "Eric Dumazet" <edumazet@google.com>, "Marek Behún" <kabel@kernel.org>, "Jakub Kicinski" <kuba@kernel.org>
+Message-ID: <20250429101436.18669-3-kabel@kernel.org>
+
+From: "Marek Behún" <kabel@kernel.org>
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -4597,6 +4597,7 @@ static const struct mv88e6xxx_ops mv88e6
+       .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 mv88e6
+       .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,

diff --git a/queue-5.15/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch b/queue-5.15/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch
new file mode 100644 (file)
index 0000000..e46e9f4
--- /dev/null
+++ b/queue-5.15/net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch
@@ -0,0 +1,35 @@
+From stable+bounces-137038-greg=kroah.com@vger.kernel.org Tue Apr 29 12:14:51 2025
+From: "Marek Behún" <kabel@kernel.org>
+Date: Tue, 29 Apr 2025 12:14:35 +0200
+Subject: net: dsa: mv88e6xxx: enable PVT for 6321 switch
+To: stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>
+Cc: "Andrew Lunn" <andrew@lunn.ch>, "Vladimir Oltean" <olteanv@gmail.com>, "Eric Dumazet" <edumazet@google.com>, "Marek Behún" <kabel@kernel.org>, "Jakub Kicinski" <kuba@kernel.org>
+Message-ID: <20250429101436.18669-2-kabel@kernel.org>
+
+From: "Marek Behún" <kabel@kernel.org>
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -5639,6 +5639,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-5.15/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch b/queue-5.15/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch
new file mode 100644 (file)
index 0000000..4e9fda1
--- /dev/null
+++ b/queue-5.15/net-dsa-mv88e6xxx-fix-atu_move_port_mask-for-6341-family.patch
@@ -0,0 +1,45 @@
+From stable+bounces-137037-greg=kroah.com@vger.kernel.org Tue Apr 29 12:14:48 2025
+From: "Marek Behún" <kabel@kernel.org>
+Date: Tue, 29 Apr 2025 12:14:34 +0200
+Subject: net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
+To: stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>
+Cc: "Andrew Lunn" <andrew@lunn.ch>, "Vladimir Oltean" <olteanv@gmail.com>, "Eric Dumazet" <edumazet@google.com>, "Marek Behún" <kabel@kernel.org>, "Jakub Kicinski" <kuba@kernel.org>
+Message-ID: <20250429101436.18669-1-kabel@kernel.org>
+
+From: "Marek Behún" <kabel@kernel.org>
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -5217,7 +5217,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,
+@@ -5660,7 +5660,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-5.15/series b/queue-5.15/series
index 7004e07c23e071d44ce00ceae8ccf1669cac4bbc..7a5f42f830cd5e49ec1943ef3103d58333c68717 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -361,3 +361,6 @@ s390-virtio_ccw-don-t-allocate-assign-airqs-for-non-existing-queues.patch
 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-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