diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-10-31 01:17:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 14:51:24 +0300 |
| commit | cdb583cfe7d79b784a74b97deb2997fccb5dcf9b (patch) | |
| tree | 3d03f8a440be1e28344afec749b66faebf0362cb /drivers/net/dsa/b53 | |
| parent | 6683ed96b5d788a5876f1c6f84bed2b93b002a07 (diff) | |
| download | linux-cdb583cfe7d79b784a74b97deb2997fccb5dcf9b.tar.xz | |
net: dsa: b53: Have b53_hdr_setup() enable/disable tagging
Have b53_hdr_setup() check what kind of tagging protocol is configured
(Broadcom or none) and apply the correct settings in both cases.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/b53')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index fa37f501f10b..a7ca62ba27b7 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -545,6 +545,7 @@ EXPORT_SYMBOL(b53_disable_port); void b53_brcm_hdr_setup(struct dsa_switch *ds, int port) { + bool tag_en = !!(ds->ops->get_tag_protocol(ds) == DSA_TAG_PROTO_BRCM); struct b53_device *dev = ds->priv; u8 hdr_ctl, val; u16 reg; @@ -567,7 +568,10 @@ void b53_brcm_hdr_setup(struct dsa_switch *ds, int port) /* Enable Broadcom tags for IMP port */ b53_read8(dev, B53_MGMT_PAGE, B53_BRCM_HDR, &hdr_ctl); - hdr_ctl |= val; + if (tag_en) + hdr_ctl |= val; + else + hdr_ctl &= ~val; b53_write8(dev, B53_MGMT_PAGE, B53_BRCM_HDR, hdr_ctl); /* Registers below are only accessible on newer devices */ @@ -578,14 +582,20 @@ void b53_brcm_hdr_setup(struct dsa_switch *ds, int port) * allow us to tag outgoing frames */ b53_read16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_RX_DIS, ®); - reg &= ~BIT(port); + if (tag_en) + reg &= ~BIT(port); + else + reg |= BIT(port); b53_write16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_RX_DIS, reg); /* Enable transmission of Broadcom tags from the switch (CPU RX) to * allow delivering frames to the per-port net_devices */ b53_read16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_TX_DIS, ®); - reg &= ~BIT(port); + if (tag_en) + reg &= ~BIT(port); + else + reg |= BIT(port); b53_write16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_TX_DIS, reg); } EXPORT_SYMBOL(b53_brcm_hdr_setup); |