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

net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by ksz_dev_ops 



At present, P_STP_CTRL register value is passed as parameter to
ksz_port_stp_state from the individual dsa_switch_ops hooks. This patch
update the function to retrieve the register value through the
ksz_chip_data member.
And add the static to ksz_update_port_member since it is not called
outside the ksz_common.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 00a298bb

drivers/net/dsa/microchip/ksz8795.c

+2 −7
Original line number Diff line number Diff line
@@ -920,11 +920,6 @@ static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member) 
	ksz_pwrite8(dev, port, P_MIRROR_CTRL, data);

}



static void ksz8_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)

{

	ksz_port_stp_state_set(ds, port, state, P_STP_CTRL);

}



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

{

	u8 learn[DSA_MAX_PORTS];
@@ -1240,7 +1235,7 @@ static void ksz8_config_cpu_port(struct dsa_switch *ds) 
	for (i = 0; i < dev->phy_port_cnt; i++) {

		p = &dev->ports[i];



		ksz8_port_stp_state_set(ds, i, BR_STATE_DISABLED);

		ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED);



		/* Last port may be disabled. */

		if (i == dev->phy_port_cnt)
@@ -1389,7 +1384,7 @@ static const struct dsa_switch_ops ksz8_switch_ops = { 
	.get_sset_count		= ksz_sset_count,

	.port_bridge_join	= ksz_port_bridge_join,

	.port_bridge_leave	= ksz_port_bridge_leave,

	.port_stp_state_set	= ksz8_port_stp_state_set,

	.port_stp_state_set	= ksz_port_stp_state_set,

	.port_fast_age		= ksz_port_fast_age,

	.port_vlan_filtering	= ksz_port_vlan_filtering,

	.port_vlan_add		= ksz_port_vlan_add,

drivers/net/dsa/microchip/ksz9477.c

+2 −8
Original line number Diff line number Diff line
@@ -344,12 +344,6 @@ static void ksz9477_cfg_port_member(struct ksz_device *dev, int port, 
	ksz_pwrite32(dev, port, REG_PORT_VLAN_MEMBERSHIP__4, member);

}



static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,

				       u8 state)

{

	ksz_port_stp_state_set(ds, port, state, P_STP_CTRL);

}



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

{

	u8 data;
@@ -1237,7 +1231,7 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds) 
			continue;

		p = &dev->ports[i];



		ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED);

		ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED);

		p->on = 1;

		if (i < dev->phy_port_cnt)

			p->phy = 1;
@@ -1315,7 +1309,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { 
	.get_sset_count		= ksz_sset_count,

	.port_bridge_join	= ksz_port_bridge_join,

	.port_bridge_leave	= ksz_port_bridge_leave,

	.port_stp_state_set	= ksz9477_port_stp_state_set,

	.port_stp_state_set	= ksz_port_stp_state_set,

	.port_fast_age		= ksz_port_fast_age,

	.port_vlan_filtering	= ksz_port_vlan_filtering,

	.port_vlan_add		= ksz_port_vlan_add,

drivers/net/dsa/microchip/ksz_common.c

+18 −4
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x02,

		.supports_mii = {false, false, false, false, true},

		.supports_rmii = {false, false, false, false, true},

		.supports_rgmii = {false, false, false, false, true},
@@ -183,6 +184,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x02,

		.supports_mii = {false, false, false, false, true},

		.supports_rmii = {false, false, false, false, true},

		.supports_rgmii = {false, false, false, false, true},
@@ -201,6 +203,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x02,

		.supports_mii = {false, false, false, false, true},

		.supports_rmii = {false, false, false, false, true},

		.supports_rgmii = {false, false, false, false, true},
@@ -218,6 +221,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz88xx_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x02,

		.supports_mii = {false, false, true},

		.supports_rmii = {false, false, true},

		.internal_phy = {true, true, false},
@@ -235,6 +239,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   false, true, false},

		.supports_rmii	= {false, false, false, false,
@@ -257,6 +262,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   false, true, true},

		.supports_rmii	= {false, false, false, false,
@@ -278,6 +284,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii = {false, false, true},

		.supports_rmii = {false, false, true},

		.supports_rgmii = {false, false, true},
@@ -296,6 +303,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   false, true, true},

		.supports_rmii	= {false, false, false, false,
@@ -317,6 +325,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii = {false, false, false, false, true},

		.supports_rmii = {false, false, false, false, true},

		.supports_rgmii = {false, false, false, false, true},
@@ -334,6 +343,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii = {false, false, false, false, true, true},

		.supports_rmii = {false, false, false, false, true, true},

		.supports_rgmii = {false, false, false, false, true, true},
@@ -351,6 +361,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   true, true, false, false},

		.supports_rmii	= {false, false, false, false,
@@ -372,6 +383,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   true, true, false, false},

		.supports_rmii	= {false, false, false, false,
@@ -393,6 +405,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.stp_ctrl_reg = 0x0B04,

		.supports_mii	= {false, false, false, false,

				   true, true, false, false},

		.supports_rmii	= {false, false, false, false,
@@ -532,7 +545,7 @@ void ksz_get_strings(struct dsa_switch *ds, int port, 
}

EXPORT_SYMBOL_GPL(ksz_get_strings);



void ksz_update_port_member(struct ksz_device *dev, int port)

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

{

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

	struct dsa_switch *ds = dev->ds;
@@ -589,7 +602,6 @@ void ksz_update_port_member(struct ksz_device *dev, int port) 


	dev->dev_ops->cfg_port_member(dev, port, port_member | cpu_port);

}

EXPORT_SYMBOL_GPL(ksz_update_port_member);



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

{
@@ -890,12 +902,14 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) 
}

EXPORT_SYMBOL_GPL(ksz_enable_port);



void ksz_port_stp_state_set(struct dsa_switch *ds, int port,

			    u8 state, int reg)

void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)

{

	struct ksz_device *dev = ds->priv;

	struct ksz_port *p;

	u8 data;

	int reg;



	reg = dev->info->stp_ctrl_reg;



	ksz_pread8(dev, port, reg, &data);

	data &= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);

drivers/net/dsa/microchip/ksz_common.h

+2 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct ksz_chip_data { 
	const struct ksz_mib_names *mib_names;

	int mib_cnt;

	u8 reg_mib_cnt;

	int stp_ctrl_reg;

	bool supports_mii[KSZ_MAX_NUM_PORTS];

	bool supports_rmii[KSZ_MAX_NUM_PORTS];

	bool supports_rgmii[KSZ_MAX_NUM_PORTS];
@@ -207,7 +208,6 @@ void ksz_switch_remove(struct ksz_device *dev); 
int ksz8_switch_register(struct ksz_device *dev);

int ksz9477_switch_register(struct ksz_device *dev);



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

void ksz_init_mib_timer(struct ksz_device *dev);

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

void ksz_get_stats64(struct dsa_switch *ds, int port,
@@ -229,8 +229,7 @@ int ksz_port_bridge_join(struct dsa_switch *ds, int port, 
			 struct netlink_ext_ack *extack);

void ksz_port_bridge_leave(struct dsa_switch *ds, int port,

			   struct dsa_bridge bridge);

void ksz_port_stp_state_set(struct dsa_switch *ds, int port,

			    u8 state, int reg);

void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state);

void ksz_port_fast_age(struct dsa_switch *ds, int port);

int ksz_port_fdb_dump(struct dsa_switch *ds, int port, dsa_fdb_dump_cb_t *cb,

		      void *data);