net: dsa: b53: Fix for brcm tag issue in Cygnus SoC

In the Broadcom Cygnus SoC, the brcm tag needs to be inserted
in between the mac address and the ether type (should use
'DSA_PROTO_TAG_BRCM') for the packets sent to the internal
b53 switch.

Since the Cygnus was added with the BCM58XX device id and the
BCM58XX uses 'DSA_PROTO_TAG_BRCM_PREPEND', the data path is
broken, due to the incorrect brcm tag location.

Add a new b53 device id (BCM583XX) for Cygnus family to fix the
issue. Add the new device id to the BCM58XX family as Cygnus
is similar to the BCM58XX in most other functionalities.

Fixes: 11606039604c ("net: dsa: b53: Support prepended Broadcom tags")
Signed-off-by: Arun Parameswaran <arun.parameswaran@broadcom.com>
Acked-by: Scott Branden <scott.branden@broadcom.com>
Reported-by: Clément Péron <peron.clem@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Clément Péron <peron.clem@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index db9a80e1ee14585afd7392f8524795bf51f4a0c3..5e010b1592f7a6b18c9aa4dcc42de24d27e12c4d 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -684,7 +684,8 @@ static int b53_switch_reset(struct b53_device *dev)
         * still use this driver as a library and need to perform the reset
         * earlier.
         */
-       if (dev->chip_id == BCM58XX_DEVICE_ID) {
+       if (dev->chip_id == BCM58XX_DEVICE_ID ||
+           dev->chip_id == BCM583XX_DEVICE_ID) {
                b53_read8(dev, B53_CTRL_PAGE, B53_SOFTRESET, &reg);
                reg |= SW_RST | EN_SW_RST | EN_CH_RST;
                b53_write8(dev, B53_CTRL_PAGE, B53_SOFTRESET, reg);
@@ -1935,6 +1936,18 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
        },
+       {
+               .chip_id = BCM583XX_DEVICE_ID,
+               .dev_name = "BCM583xx/11360",
+               .vlans = 4096,
+               .enabled_ports = 0x103,
+               .arl_entries = 4,
+               .cpu_port = B53_CPU_PORT,
+               .vta_regs = B53_VTA_REGS,
+               .duplex_reg = B53_DUPLEX_STAT_GE,
+               .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+               .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+       },
        {
                .chip_id = BCM7445_DEVICE_ID,
                .dev_name = "BCM7445",

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 75d9ffb75da82fe4f1fa73bf9fdae6c96f209778..df149756c2820fd7eda73a0cdb3e5de8f16ebaa6 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -62,6 +62,7 @@ enum {
        BCM53018_DEVICE_ID = 0x53018,
        BCM53019_DEVICE_ID = 0x53019,
        BCM58XX_DEVICE_ID = 0x5800,
+       BCM583XX_DEVICE_ID = 0x58300,
        BCM7445_DEVICE_ID = 0x7445,
        BCM7278_DEVICE_ID = 0x7278,
 };
@@ -181,6 +182,7 @@ static inline int is5301x(struct b53_device *dev)
 static inline int is58xx(struct b53_device *dev)
 {
        return dev->chip_id == BCM58XX_DEVICE_ID ||
+               dev->chip_id == BCM583XX_DEVICE_ID ||
                dev->chip_id == BCM7445_DEVICE_ID ||
                dev->chip_id == BCM7278_DEVICE_ID;
 }

diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
index c37ffd1b68338d2f5d9e421d7314c01370b04061..8247481eaa06ab0f14ddd9416a0946b646054607 100644 (file)
--- a/drivers/net/dsa/b53/b53_srab.c
+++ b/drivers/net/dsa/b53/b53_srab.c
@@ -364,7 +364,7 @@ static const struct of_device_id b53_srab_of_match[] = {
        { .compatible = "brcm,bcm53018-srab" },
        { .compatible = "brcm,bcm53019-srab" },
        { .compatible = "brcm,bcm5301x-srab" },
-       { .compatible = "brcm,bcm11360-srab", .data = (void *)BCM58XX_DEVICE_ID },
+       { .compatible = "brcm,bcm11360-srab", .data = (void *)BCM583XX_DEVICE_ID },
        { .compatible = "brcm,bcm58522-srab", .data = (void *)BCM58XX_DEVICE_ID },
        { .compatible = "brcm,bcm58525-srab", .data = (void *)BCM58XX_DEVICE_ID },
        { .compatible = "brcm,bcm58535-srab", .data = (void *)BCM58XX_DEVICE_ID },
@@ -372,7 +372,7 @@ static const struct of_device_id b53_srab_of_match[] = {
        { .compatible = "brcm,bcm58623-srab", .data = (void *)BCM58XX_DEVICE_ID },
        { .compatible = "brcm,bcm58625-srab", .data = (void *)BCM58XX_DEVICE_ID },
        { .compatible = "brcm,bcm88312-srab", .data = (void *)BCM58XX_DEVICE_ID },
-       { .compatible = "brcm,cygnus-srab", .data = (void *)BCM58XX_DEVICE_ID },
+       { .compatible = "brcm,cygnus-srab", .data = (void *)BCM583XX_DEVICE_ID },
        { .compatible = "brcm,nsp-srab", .data = (void *)BCM58XX_DEVICE_ID },
        { /* sentinel */ },
 };