Merge tag 'trace-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[J-linux.git] / drivers / net / dsa / dsa_loop.c

diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c
index eb600b3dbf26767c943054cd09bb55ebbb9dc4f0..bfdf3324aac3a24172b096ef48c05d656a633a38 100644 (file)
--- a/drivers/net/dsa/dsa_loop.c
+++ b/drivers/net/dsa/dsa_loop.c
@@ -28,6 +28,53 @@ static struct dsa_loop_mib_entry dsa_loop_mibs[] = {
 
 static struct phy_device *phydevs[PHY_MAX_ADDR];
 
+enum dsa_loop_devlink_resource_id {
+       DSA_LOOP_DEVLINK_PARAM_ID_VTU,
+};
+
+static u64 dsa_loop_devlink_vtu_get(void *priv)
+{
+       struct dsa_loop_priv *ps = priv;
+       unsigned int i, count = 0;
+       struct dsa_loop_vlan *vl;
+
+       for (i = 0; i < ARRAY_SIZE(ps->vlans); i++) {
+               vl = &ps->vlans[i];
+               if (vl->members)
+                       count++;
+       }
+
+       return count;
+}
+
+static int dsa_loop_setup_devlink_resources(struct dsa_switch *ds)
+{
+       struct devlink_resource_size_params size_params;
+       struct dsa_loop_priv *ps = ds->priv;
+       int err;
+
+       devlink_resource_size_params_init(&size_params, ARRAY_SIZE(ps->vlans),
+                                         ARRAY_SIZE(ps->vlans),
+                                         1, DEVLINK_RESOURCE_UNIT_ENTRY);
+
+       err = dsa_devlink_resource_register(ds, "VTU", ARRAY_SIZE(ps->vlans),
+                                           DSA_LOOP_DEVLINK_PARAM_ID_VTU,
+                                           DEVLINK_RESOURCE_ID_PARENT_TOP,
+                                           &size_params);
+       if (err)
+               goto out;
+
+       dsa_devlink_resource_occ_get_register(ds,
+                                             DSA_LOOP_DEVLINK_PARAM_ID_VTU,
+                                             dsa_loop_devlink_vtu_get, ps);
+
+       return 0;
+
+out:
+       dsa_devlink_resources_unregister(ds);
+       return err;
+}
+
 static enum dsa_tag_protocol dsa_loop_get_protocol(struct dsa_switch *ds,
                                                   int port,
                                                   enum dsa_tag_protocol mp)
@@ -48,7 +95,12 @@ static int dsa_loop_setup(struct dsa_switch *ds)
 
        dev_dbg(ds->dev, "%s\n", __func__);
 
-       return 0;
+       return dsa_loop_setup_devlink_resources(ds);
+}
+
+static void dsa_loop_teardown(struct dsa_switch *ds)
+{
+       dsa_devlink_resources_unregister(ds);
 }
 
 static int dsa_loop_get_sset_count(struct dsa_switch *ds, int port, int sset)
@@ -138,7 +190,8 @@ static void dsa_loop_port_stp_state_set(struct dsa_switch *ds, int port,
 }
 
 static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port,
-                                       bool vlan_filtering)
+                                       bool vlan_filtering,
+                                       struct netlink_ext_ack *extack)
 {
        dev_dbg(ds->dev, "%s: port: %d, vlan_filtering: %d\n",
                __func__, port, vlan_filtering);
@@ -146,53 +199,37 @@ static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port,
        return 0;
 }
 
-static int
-dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port,
-                          const struct switchdev_obj_port_vlan *vlan)
-{
-       struct dsa_loop_priv *ps = ds->priv;
-       struct mii_bus *bus = ps->bus;
-
-       dev_dbg(ds->dev, "%s: port: %d, vlan: %d-%d",
-               __func__, port, vlan->vid_begin, vlan->vid_end);
-
-       /* Just do a sleeping operation to make lockdep checks effective */
-       mdiobus_read(bus, ps->port_base + port, MII_BMSR);
-
-       if (vlan->vid_end > ARRAY_SIZE(ps->vlans))
-               return -ERANGE;
-
-       return 0;
-}
-
-static void dsa_loop_port_vlan_add(struct dsa_switch *ds, int port,
-                                  const struct switchdev_obj_port_vlan *vlan)
+static int dsa_loop_port_vlan_add(struct dsa_switch *ds, int port,
+                                 const struct switchdev_obj_port_vlan *vlan,
+                                 struct netlink_ext_ack *extack)
 {
        bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
        bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
        struct dsa_loop_priv *ps = ds->priv;
        struct mii_bus *bus = ps->bus;
        struct dsa_loop_vlan *vl;
-       u16 vid;
+
+       if (vlan->vid >= ARRAY_SIZE(ps->vlans))
+               return -ERANGE;
 
        /* Just do a sleeping operation to make lockdep checks effective */
        mdiobus_read(bus, ps->port_base + port, MII_BMSR);
 
-       for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) {
-               vl = &ps->vlans[vid];
+       vl = &ps->vlans[vlan->vid];
 
-               vl->members |= BIT(port);
-               if (untagged)
-                       vl->untagged |= BIT(port);
-               else
-                       vl->untagged &= ~BIT(port);
+       vl->members |= BIT(port);
+       if (untagged)
+               vl->untagged |= BIT(port);
+       else
+               vl->untagged &= ~BIT(port);
 
-               dev_dbg(ds->dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",
-                       __func__, port, vid, untagged ? "un" : "", pvid);
-       }
+       dev_dbg(ds->dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",
+               __func__, port, vlan->vid, untagged ? "un" : "", pvid);
 
        if (pvid)
-               ps->ports[port].pvid = vid;
+               ps->ports[port].pvid = vlan->vid;
+
+       return 0;
 }
 
 static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port,
@@ -200,26 +237,24 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port,
 {
        bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
        struct dsa_loop_priv *ps = ds->priv;
+       u16 pvid = ps->ports[port].pvid;
        struct mii_bus *bus = ps->bus;
        struct dsa_loop_vlan *vl;
-       u16 vid, pvid = ps->ports[port].pvid;
 
        /* Just do a sleeping operation to make lockdep checks effective */
        mdiobus_read(bus, ps->port_base + port, MII_BMSR);
 
-       for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) {
-               vl = &ps->vlans[vid];
+       vl = &ps->vlans[vlan->vid];
 
-               vl->members &= ~BIT(port);
-               if (untagged)
-                       vl->untagged &= ~BIT(port);
+       vl->members &= ~BIT(port);
+       if (untagged)
+               vl->untagged &= ~BIT(port);
 
-               if (pvid == vid)
-                       pvid = 1;
+       if (pvid == vlan->vid)
+               pvid = 1;
 
-               dev_dbg(ds->dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",
-                       __func__, port, vid, untagged ? "un" : "", pvid);
-       }
+       dev_dbg(ds->dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",
+               __func__, port, vlan->vid, untagged ? "un" : "", pvid);
        ps->ports[port].pvid = pvid;
 
        return 0;
@@ -243,6 +278,7 @@ static int dsa_loop_port_max_mtu(struct dsa_switch *ds, int port)
 static const struct dsa_switch_ops dsa_loop_driver = {
        .get_tag_protocol       = dsa_loop_get_protocol,
        .setup                  = dsa_loop_setup,
+       .teardown               = dsa_loop_teardown,
        .get_strings            = dsa_loop_get_strings,
        .get_ethtool_stats      = dsa_loop_get_ethtool_stats,
        .get_sset_count         = dsa_loop_get_sset_count,
@@ -253,7 +289,6 @@ static const struct dsa_switch_ops dsa_loop_driver = {
        .port_bridge_leave      = dsa_loop_port_bridge_leave,
        .port_stp_state_set     = dsa_loop_port_stp_state_set,
        .port_vlan_filtering    = dsa_loop_port_vlan_filtering,
-       .port_vlan_prepare      = dsa_loop_port_vlan_prepare,
        .port_vlan_add          = dsa_loop_port_vlan_add,
        .port_vlan_del          = dsa_loop_port_vlan_del,
        .port_change_mtu        = dsa_loop_port_change_mtu,