target/linux/generic/backport-5.10/740-v5.13-0005-net-dsa-b53-support-legacy-tags.patch

   1 From 46c5176c586c81306bf9e7024c13b95da775490f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
   3 Date: Wed, 17 Mar 2021 11:29:27 +0100
   4 Subject: [PATCH] net: dsa: b53: support legacy tags
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 These tags are used on BCM5325, BCM5365 and BCM63xx switches.
  10
  11 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
  12 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 ---
  15  drivers/net/dsa/b53/Kconfig      |  1 +
  16  drivers/net/dsa/b53/b53_common.c | 12 +++++++-----
  17  2 files changed, 8 insertions(+), 5 deletions(-)
  18
  19 --- a/drivers/net/dsa/b53/Kconfig
  20 +++ b/drivers/net/dsa/b53/Kconfig
  21 @@ -3,6 +3,7 @@ menuconfig B53
  22         tristate "Broadcom BCM53xx managed switch support"
  23         depends on NET_DSA
  24         select NET_DSA_TAG_BRCM
  25 +       select NET_DSA_TAG_BRCM_LEGACY
  26         select NET_DSA_TAG_BRCM_PREPEND
  27         help
  28           This driver adds support for Broadcom managed switch chips. It supports
  29 --- a/drivers/net/dsa/b53/b53_common.c
  30 +++ b/drivers/net/dsa/b53/b53_common.c
  31 @@ -2024,15 +2024,17 @@ enum dsa_tag_protocol b53_get_tag_protoc
  32  {
  33         struct b53_device *dev = ds->priv;
  34
  35 -       /* Older models (5325, 5365) support a different tag format that we do
  36 -        * not support in net/dsa/tag_brcm.c yet.
  37 -        */
  38 -       if (is5325(dev) || is5365(dev) ||
  39 -           !b53_can_enable_brcm_tags(ds, port, mprot)) {
  40 +       if (!b53_can_enable_brcm_tags(ds, port, mprot)) {
  41                 dev->tag_protocol = DSA_TAG_PROTO_NONE;
  42                 goto out;
  43         }
  44
  45 +       /* Older models require a different 6 byte tag */
  46 +       if (is5325(dev) || is5365(dev) || is63xx(dev)) {
  47 +               dev->tag_protocol = DSA_TAG_PROTO_BRCM_LEGACY;
  48 +               goto out;
  49 +       }
  50 +
  51         /* Broadcom BCM58xx chips have a flow accelerator on Port 8
  52          * which requires us to use the prepended Broadcom tag type
  53          */