Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceff5eff authored Feb 23, 2016 by Vivien Didelot Committed by David S. Miller Feb 25, 2016

net: dsa: mv88e6xxx: implement port_vlan_dump



Remove the port_pvid_get and vlan_getnext functions in favor of a
simpler mv88e6xxx_port_vlan_dump function.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 65aebfc0

drivers/net/dsa/mv88e6171.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -106,11 +106,10 @@ struct dsa_switch_driver mv88e6171_switch_driver = {
		.port_join_bridge = mv88e6xxx_port_bridge_join,
		.port_leave_bridge = mv88e6xxx_port_bridge_leave,
		.port_stp_update = mv88e6xxx_port_stp_update,
		.port_pvid_get = mv88e6xxx_port_pvid_get,
		.port_vlan_prepare = mv88e6xxx_port_vlan_prepare,
		.port_vlan_add = mv88e6xxx_port_vlan_add,
		.port_vlan_del = mv88e6xxx_port_vlan_del,
		.vlan_getnext = mv88e6xxx_vlan_getnext,
		.port_vlan_dump = mv88e6xxx_port_vlan_dump,
		.port_fdb_prepare = mv88e6xxx_port_fdb_prepare,
		.port_fdb_add = mv88e6xxx_port_fdb_add,
		.port_fdb_del = mv88e6xxx_port_fdb_del,

drivers/net/dsa/mv88e6352.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -327,11 +327,10 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
		.port_join_bridge = mv88e6xxx_port_bridge_join,
		.port_leave_bridge = mv88e6xxx_port_bridge_leave,
		.port_stp_update = mv88e6xxx_port_stp_update,
		.port_pvid_get = mv88e6xxx_port_pvid_get,
		.port_vlan_prepare = mv88e6xxx_port_vlan_prepare,
		.port_vlan_add = mv88e6xxx_port_vlan_add,
		.port_vlan_del = mv88e6xxx_port_vlan_del,
		.vlan_getnext = mv88e6xxx_vlan_getnext,
		.port_vlan_dump = mv88e6xxx_port_vlan_dump,
		.port_fdb_prepare = mv88e6xxx_port_fdb_prepare,
		.port_fdb_add = mv88e6xxx_port_fdb_add,
		.port_fdb_del = mv88e6xxx_port_fdb_del,

drivers/net/dsa/mv88e6xxx.c

+51 −59

Original line number	Diff line number	Diff line
		@@ -1151,19 +1151,6 @@ static int _mv88e6xxx_port_pvid_get(struct dsa_switch ds, int port, u16 pvid)
		return 0;
		}

		int mv88e6xxx_port_pvid_get(struct dsa_switch ds, int port, u16 pvid)
		{
		int ret;

		ret = mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_DEFAULT_VLAN);
		if (ret < 0)
		return ret;

		*pvid = ret & PORT_DEFAULT_VLAN_MASK;

		return 0;
		}

		static int _mv88e6xxx_port_pvid_set(struct dsa_switch *ds, int port, u16 pvid)
		{
		return _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_DEFAULT_VLAN,
		@@ -1306,6 +1293,57 @@ static int _mv88e6xxx_vtu_getnext(struct dsa_switch *ds,
		return 0;
		}

		int mv88e6xxx_port_vlan_dump(struct dsa_switch *ds, int port,
		struct switchdev_obj_port_vlan *vlan,
		int (cb)(struct switchdev_obj obj))
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
		struct mv88e6xxx_vtu_stu_entry next;
		u16 pvid;
		int err;

		mutex_lock(&ps->smi_mutex);

		err = _mv88e6xxx_port_pvid_get(ds, port, &pvid);
		if (err)
		goto unlock;

		err = _mv88e6xxx_vtu_vid_write(ds, GLOBAL_VTU_VID_MASK);
		if (err)
		goto unlock;

		do {
		err = _mv88e6xxx_vtu_getnext(ds, &next);
		if (err)
		break;

		if (!next.valid)
		break;

		if (next.data[port] == GLOBAL_VTU_DATA_MEMBER_TAG_NON_MEMBER)
		continue;

		/* reinit and dump this VLAN obj */
		vlan->vid_begin = vlan->vid_end = next.vid;
		vlan->flags = 0;

		if (next.data[port] == GLOBAL_VTU_DATA_MEMBER_TAG_UNTAGGED)
		vlan->flags \|= BRIDGE_VLAN_INFO_UNTAGGED;

		if (next.vid == pvid)
		vlan->flags \|= BRIDGE_VLAN_INFO_PVID;

		err = cb(&vlan->obj);
		if (err)
		break;
		} while (next.vid < GLOBAL_VTU_VID_MASK);

		unlock:
		mutex_unlock(&ps->smi_mutex);

		return err;
		}

		static int _mv88e6xxx_vtu_loadpurge(struct dsa_switch *ds,
		struct mv88e6xxx_vtu_stu_entry *entry)
		{
		@@ -1675,52 +1713,6 @@ int mv88e6xxx_port_vlan_del(struct dsa_switch *ds, int port,
		return err;
		}

		int mv88e6xxx_vlan_getnext(struct dsa_switch ds, u16 vid,
		unsigned long ports, unsigned long untagged)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
		struct mv88e6xxx_vtu_stu_entry next;
		int port;
		int err;

		if (*vid == 4095)
		return -ENOENT;

		mutex_lock(&ps->smi_mutex);
		err = _mv88e6xxx_vtu_vid_write(ds, *vid);
		if (err)
		goto unlock;

		err = _mv88e6xxx_vtu_getnext(ds, &next);
		unlock:
		mutex_unlock(&ps->smi_mutex);

		if (err)
		return err;

		if (!next.valid)
		return -ENOENT;

		*vid = next.vid;

		for (port = 0; port < ps->num_ports; ++port) {
		clear_bit(port, ports);
		clear_bit(port, untagged);

		if (dsa_is_cpu_port(ds, port) \|\| dsa_is_dsa_port(ds, port))
		continue;

		if (next.data[port] == GLOBAL_VTU_DATA_MEMBER_TAG_TAGGED \|\|
		next.data[port] == GLOBAL_VTU_DATA_MEMBER_TAG_UNTAGGED)
		set_bit(port, ports);

		if (next.data[port] == GLOBAL_VTU_DATA_MEMBER_TAG_UNTAGGED)
		set_bit(port, untagged);
		}

		return 0;
		}

		static int _mv88e6xxx_atu_mac_write(struct dsa_switch *ds,
		const unsigned char *addr)
		{

drivers/net/dsa/mv88e6xxx.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -494,9 +494,9 @@ int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,
		struct switchdev_trans *trans);
		int mv88e6xxx_port_vlan_del(struct dsa_switch *ds, int port,
		const struct switchdev_obj_port_vlan *vlan);
		int mv88e6xxx_port_pvid_get(struct dsa_switch ds, int port, u16 vid);
		int mv88e6xxx_vlan_getnext(struct dsa_switch ds, u16 vid,
		unsigned long ports, unsigned long untagged);
		int mv88e6xxx_port_vlan_dump(struct dsa_switch *ds, int port,
		struct switchdev_obj_port_vlan *vlan,
		int (cb)(struct switchdev_obj obj));
		int mv88e6xxx_port_fdb_prepare(struct dsa_switch *ds, int port,
		const struct switchdev_obj_port_fdb *fdb,
		struct switchdev_trans *trans);