Commit f0d997e3 authored by Arun Ramadoss's avatar Arun Ramadoss Committed by Paolo Abeni
Browse files

net: dsa: microchip: move vlan functionality to ksz_common 



This patch moves the vlan dsa_switch_ops such as vlan_add, vlan_del and
vlan_filtering from the individual files ksz8795.c, ksz9477.c to
ksz_common.c file.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 930e5790

drivers/net/dsa/microchip/ksz8795.c

+9 −10
Original line number Diff line number Diff line
@@ -958,11 +958,9 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) 
	}

}



static int ksz8_port_vlan_filtering(struct dsa_switch *ds, int port, bool flag,

static int ksz8_port_vlan_filtering(struct ksz_device *dev, int port, bool flag,

				    struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;



	if (ksz_is_ksz88x3(dev))

		return -ENOTSUPP;
@@ -987,12 +985,11 @@ static void ksz8_port_enable_pvid(struct ksz_device *dev, int port, bool state) 
	}

}



static int ksz8_port_vlan_add(struct dsa_switch *ds, int port,

static int ksz8_port_vlan_add(struct ksz_device *dev, int port,

			      const struct switchdev_obj_port_vlan *vlan,

			      struct netlink_ext_ack *extack)

{

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	struct ksz_device *dev = ds->priv;

	struct ksz_port *p = &dev->ports[port];

	u16 data, new_pvid = 0;

	u8 fid, member, valid;
@@ -1060,10 +1057,9 @@ static int ksz8_port_vlan_add(struct dsa_switch *ds, int port, 
	return 0;

}



static int ksz8_port_vlan_del(struct dsa_switch *ds, int port,

static int ksz8_port_vlan_del(struct ksz_device *dev, int port,

			      const struct switchdev_obj_port_vlan *vlan)

{

	struct ksz_device *dev = ds->priv;

	u16 data, pvid;

	u8 fid, member, valid;
@@ -1398,9 +1394,9 @@ static const struct dsa_switch_ops ksz8_switch_ops = { 
	.port_bridge_leave	= ksz_port_bridge_leave,

	.port_stp_state_set	= ksz8_port_stp_state_set,

	.port_fast_age		= ksz_port_fast_age,

	.port_vlan_filtering	= ksz8_port_vlan_filtering,

	.port_vlan_add		= ksz8_port_vlan_add,

	.port_vlan_del		= ksz8_port_vlan_del,

	.port_vlan_filtering	= ksz_port_vlan_filtering,

	.port_vlan_add		= ksz_port_vlan_add,

	.port_vlan_del		= ksz_port_vlan_del,

	.port_fdb_dump		= ksz_port_fdb_dump,

	.port_mdb_add           = ksz_port_mdb_add,

	.port_mdb_del           = ksz_port_mdb_del,
@@ -1465,6 +1461,9 @@ static const struct ksz_dev_ops ksz8_dev_ops = { 
	.r_mib_pkt = ksz8_r_mib_pkt,

	.freeze_mib = ksz8_freeze_mib,

	.port_init_cnt = ksz8_port_init_cnt,

	.vlan_filtering = ksz8_port_vlan_filtering,

	.vlan_add = ksz8_port_vlan_add,

	.vlan_del = ksz8_port_vlan_del,

	.shutdown = ksz8_reset_switch,

	.init = ksz8_switch_init,

	.exit = ksz8_switch_exit,

drivers/net/dsa/microchip/ksz9477.c

+9 −10
Original line number Diff line number Diff line
@@ -372,12 +372,10 @@ static void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port) 
	}

}



static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port,

static int ksz9477_port_vlan_filtering(struct ksz_device *dev, int port,

				       bool flag,

				       struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;



	if (flag) {

		ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL,

			     PORT_VLAN_LOOKUP_VID_0, true);
@@ -391,11 +389,10 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port, 
	return 0;

}



static int ksz9477_port_vlan_add(struct dsa_switch *ds, int port,

static int ksz9477_port_vlan_add(struct ksz_device *dev, int port,

				 const struct switchdev_obj_port_vlan *vlan,

				 struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;

	u32 vlan_table[3];

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	int err;
@@ -428,10 +425,9 @@ static int ksz9477_port_vlan_add(struct dsa_switch *ds, int port, 
	return 0;

}



static int ksz9477_port_vlan_del(struct dsa_switch *ds, int port,

static int ksz9477_port_vlan_del(struct ksz_device *dev, int port,

				 const struct switchdev_obj_port_vlan *vlan)

{

	struct ksz_device *dev = ds->priv;

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	u32 vlan_table[3];

	u16 pvid;
@@ -1323,9 +1319,9 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { 
	.port_bridge_leave	= ksz_port_bridge_leave,

	.port_stp_state_set	= ksz9477_port_stp_state_set,

	.port_fast_age		= ksz_port_fast_age,

	.port_vlan_filtering	= ksz9477_port_vlan_filtering,

	.port_vlan_add		= ksz9477_port_vlan_add,

	.port_vlan_del		= ksz9477_port_vlan_del,

	.port_vlan_filtering	= ksz_port_vlan_filtering,

	.port_vlan_add		= ksz_port_vlan_add,

	.port_vlan_del		= ksz_port_vlan_del,

	.port_fdb_dump		= ksz9477_port_fdb_dump,

	.port_fdb_add		= ksz9477_port_fdb_add,

	.port_fdb_del		= ksz9477_port_fdb_del,
@@ -1407,6 +1403,9 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { 
	.r_mib_stat64 = ksz_r_mib_stats64,

	.freeze_mib = ksz9477_freeze_mib,

	.port_init_cnt = ksz9477_port_init_cnt,

	.vlan_filtering = ksz9477_port_vlan_filtering,

	.vlan_add = ksz9477_port_vlan_add,

	.vlan_del = ksz9477_port_vlan_del,

	.shutdown = ksz9477_reset_switch,

	.init = ksz9477_switch_init,

	.exit = ksz9477_switch_exit,

drivers/net/dsa/microchip/ksz_common.c

+37 −0
Original line number Diff line number Diff line
@@ -954,6 +954,43 @@ enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, 
}

EXPORT_SYMBOL_GPL(ksz_get_tag_protocol);



int ksz_port_vlan_filtering(struct dsa_switch *ds, int port,

			    bool flag, struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->vlan_filtering)

		return -EOPNOTSUPP;



	return dev->dev_ops->vlan_filtering(dev, port, flag, extack);

}

EXPORT_SYMBOL_GPL(ksz_port_vlan_filtering);



int ksz_port_vlan_add(struct dsa_switch *ds, int port,

		      const struct switchdev_obj_port_vlan *vlan,

		      struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->vlan_add)

		return -EOPNOTSUPP;



	return dev->dev_ops->vlan_add(dev, port, vlan, extack);

}

EXPORT_SYMBOL_GPL(ksz_port_vlan_add);



int ksz_port_vlan_del(struct dsa_switch *ds, int port,

		      const struct switchdev_obj_port_vlan *vlan)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->vlan_del)

		return -EOPNOTSUPP;



	return dev->dev_ops->vlan_del(dev, port, vlan);

}

EXPORT_SYMBOL_GPL(ksz_port_vlan_del);



static int ksz_switch_detect(struct ksz_device *dev)

{

	u8 id1, id2;

drivers/net/dsa/microchip/ksz_common.h

+14 −0
Original line number Diff line number Diff line
@@ -180,6 +180,13 @@ struct ksz_dev_ops { 
	void (*r_mib_pkt)(struct ksz_device *dev, int port, u16 addr,

			  u64 *dropped, u64 *cnt);

	void (*r_mib_stat64)(struct ksz_device *dev, int port);

	int  (*vlan_filtering)(struct ksz_device *dev, int port,

			       bool flag, struct netlink_ext_ack *extack);

	int  (*vlan_add)(struct ksz_device *dev, int port,

			 const struct switchdev_obj_port_vlan *vlan,

			 struct netlink_ext_ack *extack);

	int  (*vlan_del)(struct ksz_device *dev, int port,

			 const struct switchdev_obj_port_vlan *vlan);

	void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);

	void (*port_init_cnt)(struct ksz_device *dev, int port);

	int (*shutdown)(struct ksz_device *dev);
@@ -233,6 +240,13 @@ void ksz_get_strings(struct dsa_switch *ds, int port, 
		     u32 stringset, uint8_t *buf);

enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,

					   int port, enum dsa_tag_protocol mp);

int ksz_port_vlan_filtering(struct dsa_switch *ds, int port,

			    bool flag, struct netlink_ext_ack *extack);

int ksz_port_vlan_add(struct dsa_switch *ds, int port,

		      const struct switchdev_obj_port_vlan *vlan,

		      struct netlink_ext_ack *extack);

int ksz_port_vlan_del(struct dsa_switch *ds, int port,

		      const struct switchdev_obj_port_vlan *vlan);



/* Common register access functions */