ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-28 01:28:59 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
7d9b9762c9
openwrt/target/linux/generic/backport-6.1/807-v6.5-04-net-dsa-mv88e6xxx-fix-88E6393X-family-internal-phys-.patch

53 lines
1.7 KiB
Diff
Raw Normal View History

generic: 6.1: backport support for Marvell 88E6361 switch New revision of Methode eDPU boards uses Marvell 88E6361 switch, so lets backport it from kernel 6.5. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
2023-08-04 12:39:18 +00:00
From eb8c75f82a6711387f3b9e03e28923f3e75a761b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= <alexis.lothore@bootlin.com>
Date: Mon, 29 May 2023 10:02:44 +0200
Subject: [PATCH 4/6] net: dsa: mv88e6xxx: fix 88E6393X family internal phys
layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
88E6393X/88E6193X/88E6191X switches have in fact 8 internal PHYs, but those
are not present starting at port 0: supported ports go from 1 to 8
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
kernel: move mv88e6xxx fix to generic backports The backports introduced in commit d40756563c46 ("kernel: backport phylink changes from mainline Linux") broke the mv88e6xxx DSA driver. A backport to fix this was added to the kirkwood target, but as it is used in multiple targets, and there's a kmod package for it, the fix should be in generic backports. This fixes the switch on the WatchGuard Firebox M300 when running the 6.1 testing kernel. There is no need to backport the fix for the 6.6 kernel, as it was included in 6.6.5. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2024-04-26 16:40:17 +00:00
@@ -5956,7 +5956,8 @@ static const struct mv88e6xxx_info mv88e
generic: 6.1: backport support for Marvell 88E6361 switch New revision of Methode eDPU boards uses Marvell 88E6361 switch, so lets backport it from kernel 6.5. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
2023-08-04 12:39:18 +00:00
.name = "Marvell 88E6191X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
- .num_internal_phys = 9,
+ .num_internal_phys = 8,
+ .internal_phys_offset = 1,
.max_vid = 8191,
.max_sid = 63,
.port_base_addr = 0x0,
kernel: move mv88e6xxx fix to generic backports The backports introduced in commit d40756563c46 ("kernel: backport phylink changes from mainline Linux") broke the mv88e6xxx DSA driver. A backport to fix this was added to the kirkwood target, but as it is used in multiple targets, and there's a kmod package for it, the fix should be in generic backports. This fixes the switch on the WatchGuard Firebox M300 when running the 6.1 testing kernel. There is no need to backport the fix for the 6.6 kernel, as it was included in 6.6.5. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2024-04-26 16:40:17 +00:00
@@ -5979,7 +5980,8 @@ static const struct mv88e6xxx_info mv88e
generic: 6.1: backport support for Marvell 88E6361 switch New revision of Methode eDPU boards uses Marvell 88E6361 switch, so lets backport it from kernel 6.5. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
2023-08-04 12:39:18 +00:00
.name = "Marvell 88E6193X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
- .num_internal_phys = 9,
+ .num_internal_phys = 8,
+ .internal_phys_offset = 1,
.max_vid = 8191,
.max_sid = 63,
.port_base_addr = 0x0,
kernel: move mv88e6xxx fix to generic backports The backports introduced in commit d40756563c46 ("kernel: backport phylink changes from mainline Linux") broke the mv88e6xxx DSA driver. A backport to fix this was added to the kirkwood target, but as it is used in multiple targets, and there's a kmod package for it, the fix should be in generic backports. This fixes the switch on the WatchGuard Firebox M300 when running the 6.1 testing kernel. There is no need to backport the fix for the 6.6 kernel, as it was included in 6.6.5. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2024-04-26 16:40:17 +00:00
@@ -6298,7 +6300,8 @@ static const struct mv88e6xxx_info mv88e
generic: 6.1: backport support for Marvell 88E6361 switch New revision of Methode eDPU boards uses Marvell 88E6361 switch, so lets backport it from kernel 6.5. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
2023-08-04 12:39:18 +00:00
.name = "Marvell 88E6393X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
- .num_internal_phys = 9,
+ .num_internal_phys = 8,
+ .internal_phys_offset = 1,
.max_vid = 8191,
.max_sid = 63,
.port_base_addr = 0x0,
Reference in New Issue Copy Permalink