b389c3d66f
Manually adapted:
bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch
I replaced it with the version from main branch which applies more easily
bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
generic/hack-5.15/645-netfilter-connmark-introduce-set-dscpmark.patch
Added patch:
generic/backport-5.15/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch
This fixes a bug intoduced in this version.
Adapt kernel configuration for newly added option
CONFIG_PROC_MEM_ALWAYS_FORCE.
Link: https://github.com/openwrt/openwrt/pull/16882
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
132 lines
3.9 KiB
Diff
132 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
|
|
@@ -2312,7 +2312,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,
|
|
@@ -2323,7 +2323,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,
|
|
@@ -2334,7 +2334,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,
|
|
@@ -2348,7 +2348,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,
|
|
@@ -2362,7 +2362,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,
|
|
@@ -2376,7 +2376,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,
|
|
@@ -2390,7 +2390,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,
|
|
@@ -2404,7 +2404,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,
|
|
@@ -2446,7 +2446,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,
|
|
@@ -2488,7 +2488,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,
|
|
@@ -2502,7 +2502,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,
|
|
@@ -2644,7 +2644,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);
|