f2f42a54e8
The qca8k patch series brings the numbering to 799. This patch renames 7xx patches to create space for more backports to be added. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> [rename 729->719] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 46c5176c586c81306bf9e7024c13b95da775490f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Wed, 17 Mar 2021 11:29:27 +0100
|
|
Subject: [PATCH] net: dsa: b53: support legacy tags
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
These tags are used on BCM5325, BCM5365 and BCM63xx switches.
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/b53/Kconfig | 1 +
|
|
drivers/net/dsa/b53/b53_common.c | 12 +++++++-----
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/Kconfig
|
|
+++ b/drivers/net/dsa/b53/Kconfig
|
|
@@ -3,6 +3,7 @@ menuconfig B53
|
|
tristate "Broadcom BCM53xx managed switch support"
|
|
depends on NET_DSA
|
|
select NET_DSA_TAG_BRCM
|
|
+ select NET_DSA_TAG_BRCM_LEGACY
|
|
select NET_DSA_TAG_BRCM_PREPEND
|
|
help
|
|
This driver adds support for Broadcom managed switch chips. It supports
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2024,15 +2024,17 @@ enum dsa_tag_protocol b53_get_tag_protoc
|
|
{
|
|
struct b53_device *dev = ds->priv;
|
|
|
|
- /* Older models (5325, 5365) support a different tag format that we do
|
|
- * not support in net/dsa/tag_brcm.c yet.
|
|
- */
|
|
- if (is5325(dev) || is5365(dev) ||
|
|
- !b53_can_enable_brcm_tags(ds, port, mprot)) {
|
|
+ if (!b53_can_enable_brcm_tags(ds, port, mprot)) {
|
|
dev->tag_protocol = DSA_TAG_PROTO_NONE;
|
|
goto out;
|
|
}
|
|
|
|
+ /* Older models require a different 6 byte tag */
|
|
+ if (is5325(dev) || is5365(dev) || is63xx(dev)) {
|
|
+ dev->tag_protocol = DSA_TAG_PROTO_BRCM_LEGACY;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
/* Broadcom BCM58xx chips have a flow accelerator on Port 8
|
|
* which requires us to use the prepended Broadcom tag type
|
|
*/
|