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

net: dsa: microchip: add the support for set_ageing_time 



KSZ9477 has the 11 bit ageing count value which is split across the two
registers. And LAN937x has the 20 bit ageing count which is also split
into two registers. Each count in the registers represents 1 second.
This patch add the support for ageing time for KSZ9477 and LAN937x
series of switch.

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

drivers/net/dsa/microchip/ksz9477.c

+25 −0
Original line number Diff line number Diff line
@@ -963,6 +963,31 @@ void ksz9477_get_caps(struct ksz_device *dev, int port, 
		config->mac_capabilities |= MAC_1000FD;

}



int ksz9477_set_ageing_time(struct ksz_device *dev, unsigned int msecs)

{

	u32 secs = msecs / 1000;

	u8 value;

	u8 data;

	int ret;



	value = FIELD_GET(SW_AGE_PERIOD_7_0_M, secs);



	ret = ksz_write8(dev, REG_SW_LUE_CTRL_3, value);

	if (ret < 0)

		return ret;



	data = FIELD_GET(SW_AGE_PERIOD_10_8_M, secs);



	ret = ksz_read8(dev, REG_SW_LUE_CTRL_0, &value);

	if (ret < 0)

		return ret;



	value &= ~SW_AGE_CNT_M;

	value |= FIELD_PREP(SW_AGE_CNT_M, data);



	return ksz_write8(dev, REG_SW_LUE_CTRL_0, value);

}



void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)

{

	struct dsa_switch *ds = dev->ds;

drivers/net/dsa/microchip/ksz9477.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ u32 ksz9477_get_port_addr(int port, int offset); 
void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member);

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

void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port);

int ksz9477_set_ageing_time(struct ksz_device *dev, unsigned int msecs);

int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data);

int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);

void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt);

drivers/net/dsa/microchip/ksz9477_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -189,8 +189,9 @@ 


#define SW_VLAN_ENABLE			BIT(7)

#define SW_DROP_INVALID_VID		BIT(6)

#define SW_AGE_CNT_M			0x7

#define SW_AGE_CNT_M			GENMASK(5, 3)

#define SW_AGE_CNT_S			3

#define SW_AGE_PERIOD_10_8_M		GENMASK(10, 8)

#define SW_RESV_MCAST_ENABLE		BIT(2)

#define SW_HASH_OPTION_M		0x03

#define SW_HASH_OPTION_CRC		1
@@ -225,6 +226,7 @@ 
#define SW_PRIO_LOWEST_DA_SA		3



#define REG_SW_LUE_CTRL_3		0x0313

#define SW_AGE_PERIOD_7_0_M		GENMASK(7, 0)



#define REG_SW_LUE_INT_STATUS		0x0314

#define REG_SW_LUE_INT_ENABLE		0x0315

drivers/net/dsa/microchip/ksz_common.c

+13 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { 
	.cfg_port_member = ksz9477_cfg_port_member,

	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,

	.port_setup = ksz9477_port_setup,

	.set_ageing_time = ksz9477_set_ageing_time,

	.r_phy = ksz9477_r_phy,

	.w_phy = ksz9477_w_phy,

	.r_mib_cnt = ksz9477_r_mib_cnt,
@@ -218,6 +219,7 @@ static const struct ksz_dev_ops lan937x_dev_ops = { 
	.cfg_port_member = ksz9477_cfg_port_member,

	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,

	.port_setup = lan937x_port_setup,

	.set_ageing_time = lan937x_set_ageing_time,

	.r_phy = lan937x_r_phy,

	.w_phy = lan937x_w_phy,

	.r_mib_cnt = ksz9477_r_mib_cnt,
@@ -1893,6 +1895,16 @@ static void ksz_port_fast_age(struct dsa_switch *ds, int port) 
	dev->dev_ops->flush_dyn_mac_table(dev, port);

}



static int ksz_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)

{

	struct ksz_device *dev = ds->priv;



	if (!dev->dev_ops->set_ageing_time)

		return -EOPNOTSUPP;



	return dev->dev_ops->set_ageing_time(dev, msecs);

}



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

			    const unsigned char *addr, u16 vid,

			    struct dsa_db db)
@@ -2475,6 +2487,7 @@ static const struct dsa_switch_ops ksz_switch_ops = { 
	.phylink_mac_link_up	= ksz_phylink_mac_link_up,

	.phylink_mac_link_down	= ksz_mac_link_down,

	.port_enable		= ksz_enable_port,

	.set_ageing_time	= ksz_set_ageing_time,

	.get_strings		= ksz_get_strings,

	.get_ethtool_stats	= ksz_get_ethtool_stats,

	.get_sset_count		= ksz_sset_count,

drivers/net/dsa/microchip/ksz_common.h

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct ksz_dev_ops { 
	void (*flush_dyn_mac_table)(struct ksz_device *dev, int port);

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

	void (*port_setup)(struct ksz_device *dev, int port, bool cpu_port);

	int (*set_ageing_time)(struct ksz_device *dev, unsigned int msecs);

	int (*r_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);

	int (*w_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 val);

	void (*r_mib_cnt)(struct ksz_device *dev, int port, u16 addr,