ee035de0fd
Import patches from Linux v5.16 and v5.17 to get 2500Base-X SFP working
again with mvneta driver after the generic phylink validate backport.
Fixes: aab466f422 ("kernel: backport generic phylink validate")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
131 lines
3.9 KiB
Diff
131 lines
3.9 KiB
Diff
From 983d96a9116a328668601555d96736261d33170c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 16 Sep 2021 14:03:51 +0200
|
|
Subject: [PATCH] net: dsa: b53: Include all ports in "enabled_ports"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Make "enabled_ports" bitfield contain all available switch ports
|
|
including a CPU port. This way there is no need for fixup during
|
|
initialization.
|
|
|
|
For BCM53010, BCM53018 and BCM53019 include also other available ports.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 23 +++++++++++------------
|
|
1 file changed, 11 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2300,7 +2300,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5325_DEVICE_ID,
|
|
.dev_name = "BCM5325",
|
|
.vlans = 16,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x3f,
|
|
.arl_bins = 2,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 5,
|
|
@@ -2311,7 +2311,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5365_DEVICE_ID,
|
|
.dev_name = "BCM5365",
|
|
.vlans = 256,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x3f,
|
|
.arl_bins = 2,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 5,
|
|
@@ -2322,7 +2322,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5389_DEVICE_ID,
|
|
.dev_name = "BCM5389",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x11f,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2336,7 +2336,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5395_DEVICE_ID,
|
|
.dev_name = "BCM5395",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x11f,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2350,7 +2350,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5397_DEVICE_ID,
|
|
.dev_name = "BCM5397",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x11f,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2364,7 +2364,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM5398_DEVICE_ID,
|
|
.dev_name = "BCM5398",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x7f,
|
|
+ .enabled_ports = 0x17f,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2378,7 +2378,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM53115_DEVICE_ID,
|
|
.dev_name = "BCM53115",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x11f,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.vta_regs = B53_VTA_REGS,
|
|
@@ -2392,7 +2392,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM53125_DEVICE_ID,
|
|
.dev_name = "BCM53125",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0xff,
|
|
+ .enabled_ports = 0x1ff,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2434,7 +2434,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM53010_DEVICE_ID,
|
|
.dev_name = "BCM53010",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x1bf,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2476,7 +2476,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM53018_DEVICE_ID,
|
|
.dev_name = "BCM53018",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x1bf,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2490,7 +2490,7 @@ static const struct b53_chip_data b53_sw
|
|
.chip_id = BCM53019_DEVICE_ID,
|
|
.dev_name = "BCM53019",
|
|
.vlans = 4096,
|
|
- .enabled_ports = 0x1f,
|
|
+ .enabled_ports = 0x1bf,
|
|
.arl_bins = 4,
|
|
.arl_buckets = 1024,
|
|
.imp_port = 8,
|
|
@@ -2632,7 +2632,6 @@ static int b53_switch_init(struct b53_de
|
|
dev->cpu_port = 5;
|
|
}
|
|
|
|
- dev->enabled_ports |= BIT(dev->cpu_port);
|
|
dev->num_ports = fls(dev->enabled_ports);
|
|
|
|
dev->ds->num_ports = min_t(unsigned int, dev->num_ports, DSA_MAX_PORTS);
|