Commit d2822e68 authored by Arun Ramadoss's avatar Arun Ramadoss Committed by David S. Miller
Browse files

net: dsa: microchip: move setup function to ksz_common 



This patch move the common initialization of switches to ksz_setup and
perform the switch specific initialization using the ksz_dev_ops
function pointer.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 331d64f7

drivers/net/dsa/microchip/ksz8795.c

+3 −21
Original line number Diff line number Diff line
@@ -1387,18 +1387,7 @@ static int ksz8_enable_stp_addr(struct ksz_device *dev) 
static int ksz8_setup(struct dsa_switch *ds)

{

	struct ksz_device *dev = ds->priv;

	int i, ret = 0;



	dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),

				       dev->info->num_vlans, GFP_KERNEL);

	if (!dev->vlan_cache)

		return -ENOMEM;



	ret = dev->dev_ops->reset(dev);

	if (ret) {

		dev_err(ds->dev, "failed to reset switch\n");

		return ret;

	}

	int i;



	ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true);
@@ -1417,8 +1406,6 @@ static int ksz8_setup(struct dsa_switch *ds) 
			   UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP,

			   UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP);



	dev->dev_ops->config_cpu_port(ds);



	ksz_cfg(dev, REG_SW_CTRL_2, MULTICAST_STORM_DISABLE, true);



	ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_REPLACE_VID, false);
@@ -1437,12 +1424,6 @@ static int ksz8_setup(struct dsa_switch *ds) 
	for (i = 0; i < (dev->info->num_vlans / 4); i++)

		ksz8_r_vlan_entries(dev, i);



	dev->dev_ops->enable_stp_addr(dev);



	ksz_init_mib_timer(dev);



	ds->configure_vlan_while_not_filtering = false;



	return ksz8_handle_global_errata(ds);

}
@@ -1467,7 +1448,7 @@ static void ksz8_get_caps(struct ksz_device *dev, int port, 
static const struct dsa_switch_ops ksz8_switch_ops = {

	.get_tag_protocol	= ksz_get_tag_protocol,

	.get_phy_flags		= ksz_get_phy_flags,

	.setup			= ksz8_setup,

	.setup			= ksz_setup,

	.phy_read		= ksz_phy_read16,

	.phy_write		= ksz_phy_write16,

	.phylink_get_caps	= ksz_phylink_get_caps,
@@ -1534,6 +1515,7 @@ static void ksz8_switch_exit(struct ksz_device *dev) 
}



static const struct ksz_dev_ops ksz8_dev_ops = {

	.setup = ksz8_setup,

	.get_port_addr = ksz8_get_port_addr,

	.cfg_port_member = ksz8_cfg_port_member,

	.flush_dyn_mac_table = ksz8_flush_dyn_mac_table,

drivers/net/dsa/microchip/ksz9477.c

+2 −20
Original line number Diff line number Diff line
@@ -1271,17 +1271,6 @@ static int ksz9477_setup(struct dsa_switch *ds) 
	struct ksz_device *dev = ds->priv;

	int ret = 0;



	dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),

				       dev->info->num_vlans, GFP_KERNEL);

	if (!dev->vlan_cache)

		return -ENOMEM;



	ret = dev->dev_ops->reset(dev);

	if (ret) {

		dev_err(ds->dev, "failed to reset switch\n");

		return ret;

	}



	/* Required for port partitioning. */

	ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY,

		      true);
@@ -1298,8 +1287,6 @@ static int ksz9477_setup(struct dsa_switch *ds) 
	if (ret)

		return ret;



	dev->dev_ops->config_cpu_port(ds);



	ksz_cfg(dev, REG_SW_MAC_CTRL_1, MULTICAST_STORM_DISABLE, true);



	/* queue based egress rate limit */
@@ -1311,18 +1298,12 @@ static int ksz9477_setup(struct dsa_switch *ds) 
	/* start switch */

	ksz_cfg(dev, REG_SW_OPERATION, SW_START, true);



	dev->dev_ops->enable_stp_addr(dev);



	ksz_init_mib_timer(dev);



	ds->configure_vlan_while_not_filtering = false;



	return 0;

}



static const struct dsa_switch_ops ksz9477_switch_ops = {

	.get_tag_protocol	= ksz_get_tag_protocol,

	.setup			= ksz9477_setup,

	.setup			= ksz_setup,

	.phy_read		= ksz_phy_read16,

	.phy_write		= ksz_phy_write16,

	.phylink_mac_link_down	= ksz_mac_link_down,
@@ -1408,6 +1389,7 @@ static void ksz9477_switch_exit(struct ksz_device *dev) 
}



static const struct ksz_dev_ops ksz9477_dev_ops = {

	.setup = ksz9477_setup,

	.get_port_addr = ksz9477_get_port_addr,

	.cfg_port_member = ksz9477_cfg_port_member,

	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,

drivers/net/dsa/microchip/ksz_common.c

+34 −0
Original line number Diff line number Diff line
@@ -607,6 +607,40 @@ static void ksz_update_port_member(struct ksz_device *dev, int port) 
	dev->dev_ops->cfg_port_member(dev, port, port_member | cpu_port);

}



int ksz_setup(struct dsa_switch *ds)

{

	struct ksz_device *dev = ds->priv;

	int ret;



	dev->vlan_cache = devm_kcalloc(dev->dev, sizeof(struct vlan_table),

				       dev->info->num_vlans, GFP_KERNEL);

	if (!dev->vlan_cache)

		return -ENOMEM;



	ret = dev->dev_ops->reset(dev);

	if (ret) {

		dev_err(ds->dev, "failed to reset switch\n");

		return ret;

	}



	dev->dev_ops->config_cpu_port(ds);



	dev->dev_ops->enable_stp_addr(dev);



	ksz_init_mib_timer(dev);



	ds->configure_vlan_while_not_filtering = false;



	if (dev->dev_ops->setup) {

		ret = dev->dev_ops->setup(ds);

		if (ret)

			return ret;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ksz_setup);



static void port_r_cnt(struct ksz_device *dev, int port)

{

	struct ksz_port_mib *mib = &dev->ports[port].mib;

drivers/net/dsa/microchip/ksz_common.h

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ struct alu_struct { 
};



struct ksz_dev_ops {

	int (*setup)(struct dsa_switch *ds);

	u32 (*get_port_addr)(int port, int offset);

	void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member);

	void (*flush_dyn_mac_table)(struct ksz_device *dev, int port);
@@ -229,6 +230,7 @@ extern const struct ksz_chip_data ksz_switch_chips[]; 


/* Common DSA access functions */



int ksz_setup(struct dsa_switch *ds);

int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg);

int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);

u32 ksz_get_phy_flags(struct dsa_switch *ds, int port);