net: dsa: b53: Add support for port mirroring

Add support for configuring port mirroring through the cls_matchall
classifier. We do a full ingress or egress capture towards the capture
port. Future improvements could include leveraging the divider to allow
less frames to be captured, as well as matching specific MAC DA/SA.

Signed-off-by: Florian Fainelli <f.fainelli@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 3a7d16b6c3eb10e1c0770e3c2e1ed53d0482f831..8cf4801994e883be64010934a0413cfbdb86ed16 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1450,6 +1450,71 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds)
        return DSA_TAG_PROTO_NONE;
 }
 
+int b53_mirror_add(struct dsa_switch *ds, int port,
+                  struct dsa_mall_mirror_tc_entry *mirror, bool ingress)
+{
+       struct b53_device *dev = ds->priv;
+       u16 reg, loc;
+
+       if (ingress)
+               loc = B53_IG_MIR_CTL;
+       else
+               loc = B53_EG_MIR_CTL;
+
+       b53_read16(dev, B53_MGMT_PAGE, loc, &reg);
+       reg &= ~MIRROR_MASK;
+       reg |= BIT(port);
+       b53_write16(dev, B53_MGMT_PAGE, loc, reg);
+
+       b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, &reg);
+       reg &= ~CAP_PORT_MASK;
+       reg |= mirror->to_local_port;
+       reg |= MIRROR_EN;
+       b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg);
+
+       return 0;
+}
+EXPORT_SYMBOL(b53_mirror_add);
+
+void b53_mirror_del(struct dsa_switch *ds, int port,
+                   struct dsa_mall_mirror_tc_entry *mirror)
+{
+       struct b53_device *dev = ds->priv;
+       bool loc_disable = false, other_loc_disable = false;
+       u16 reg, loc;
+
+       if (mirror->ingress)
+               loc = B53_IG_MIR_CTL;
+       else
+               loc = B53_EG_MIR_CTL;
+
+       /* Update the desired ingress/egress register */
+       b53_read16(dev, B53_MGMT_PAGE, loc, &reg);
+       reg &= ~BIT(port);
+       if (!(reg & MIRROR_MASK))
+               loc_disable = true;
+       b53_write16(dev, B53_MGMT_PAGE, loc, reg);
+
+       /* Now look at the other one to know if we can disable mirroring
+        * entirely
+        */
+       if (mirror->ingress)
+               b53_read16(dev, B53_MGMT_PAGE, B53_EG_MIR_CTL, &reg);
+       else
+               b53_read16(dev, B53_MGMT_PAGE, B53_IG_MIR_CTL, &reg);
+       if (!(reg & MIRROR_MASK))
+               other_loc_disable = true;
+
+       b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, &reg);
+       /* Both no longer have ports, let's disable mirroring */
+       if (loc_disable && other_loc_disable) {
+               reg &= ~MIRROR_EN;
+               reg &= ~mirror->to_local_port;
+       }
+       b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg);
+}
+EXPORT_SYMBOL(b53_mirror_del);
+
 static const struct dsa_switch_ops b53_switch_ops = {
        .get_tag_protocol       = b53_get_tag_protocol,
        .setup                  = b53_setup,
@@ -1474,6 +1539,8 @@ static const struct dsa_switch_ops b53_switch_ops = {
        .port_fdb_dump          = b53_fdb_dump,
        .port_fdb_add           = b53_fdb_add,
        .port_fdb_del           = b53_fdb_del,
+       .port_mirror_add        = b53_mirror_add,
+       .port_mirror_del        = b53_mirror_del,
 };
 
 struct b53_chip_data {

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 9d87889728ac5671a9c0210dceca1914717d6b38..a9dc90a01438d26ca1d974c5150416988a67a7ba 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -407,5 +407,9 @@ int b53_fdb_del(struct dsa_switch *ds, int port,
 int b53_fdb_dump(struct dsa_switch *ds, int port,
                 struct switchdev_obj_port_fdb *fdb,
                 int (*cb)(struct switchdev_obj *obj));
+int b53_mirror_add(struct dsa_switch *ds, int port,
+                  struct dsa_mall_mirror_tc_entry *mirror, bool ingress);
+void b53_mirror_del(struct dsa_switch *ds, int port,
+                   struct dsa_mall_mirror_tc_entry *mirror);
 
 #endif