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

Commit fd231c82 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: rework FDB add/del operations 



Add a mv88e6xxx_atu_entry structure and a low level function for the ATU
Load operation, and provide FDB add and delete wrappers functions.

This implementation handles the eventual trunk mapping. If the related
bit is set, then the ATU data register would contain the trunk ID, and
not the port vector.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a778e1b

drivers/net/dsa/mv88e6xxx.c

+57 −12
Original line number Diff line number Diff line
@@ -1214,29 +1214,74 @@ static int _mv88e6xxx_atu_mac_read(struct dsa_switch *ds, unsigned char *addr) 
	return 0;

}



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

				    const unsigned char *addr, int state)

static int _mv88e6xxx_atu_load(struct dsa_switch *ds,

			       struct mv88e6xxx_atu_entry *entry)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	u8 fid = ps->fid[port];

	u16 reg = 0;

	int ret;



	ret = _mv88e6xxx_atu_wait(ds);

	if (ret < 0)

		return ret;



	ret = _mv88e6xxx_atu_mac_write(ds, addr);

	ret = _mv88e6xxx_atu_mac_write(ds, entry->mac);

	if (ret < 0)

		return ret;



	ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_DATA,

				   (0x10 << port) | state);

	if (ret)

	if (entry->state != GLOBAL_ATU_DATA_STATE_UNUSED) {

		unsigned int mask, shift;



		if (entry->trunk) {

			reg |= GLOBAL_ATU_DATA_TRUNK;

			mask = GLOBAL_ATU_DATA_TRUNK_ID_MASK;

			shift = GLOBAL_ATU_DATA_TRUNK_ID_SHIFT;

		} else {

			mask = GLOBAL_ATU_DATA_PORT_VECTOR_MASK;

			shift = GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT;

		}



		reg |= (entry->portv_trunkid << shift) & mask;

	}



	reg |= entry->state & GLOBAL_ATU_DATA_STATE_MASK;



	ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_DATA, reg);

	if (ret < 0)

		return ret;



	ret = _mv88e6xxx_atu_cmd(ds, fid, GLOBAL_ATU_OP_LOAD_DB);

	return _mv88e6xxx_atu_cmd(ds, entry->fid, GLOBAL_ATU_OP_LOAD_DB);

}



static int _mv88e6xxx_port_vid_to_fid(struct dsa_switch *ds, int port, u16 vid)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);



	if (vid == 0)

		return ps->fid[port];



	return -ENOENT;

}



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

				    const unsigned char *addr, u16 vid,

				    u8 state)

{

	struct mv88e6xxx_atu_entry entry = { 0 };

	int ret;



	ret = _mv88e6xxx_port_vid_to_fid(ds, port, vid);

	if (ret < 0)

		return ret;



	entry.fid = ret;

	entry.state = state;

	ether_addr_copy(entry.mac, addr);

	if (state != GLOBAL_ATU_DATA_STATE_UNUSED) {

		entry.trunk = false;

		entry.portv_trunkid = BIT(port);

	}



	return _mv88e6xxx_atu_load(ds, &entry);

}



int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,
@@ -1249,7 +1294,7 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port, 
	int ret;



	mutex_lock(&ps->smi_mutex);

	ret = __mv88e6xxx_port_fdb_cmd(ds, port, addr, state);

	ret = _mv88e6xxx_port_fdb_load(ds, port, addr, vid, state);

	mutex_unlock(&ps->smi_mutex);



	return ret;
@@ -1262,7 +1307,7 @@ int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port, 
	int ret;



	mutex_lock(&ps->smi_mutex);

	ret = __mv88e6xxx_port_fdb_cmd(ds, port, addr,

	ret = _mv88e6xxx_port_fdb_load(ds, port, addr, vid,

				       GLOBAL_ATU_DATA_STATE_UNUSED);

	mutex_unlock(&ps->smi_mutex);

drivers/net/dsa/mv88e6xxx.h

+10 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ 
#define GLOBAL_ATU_OP_GET_CLR_VIOLATION	  ((7 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_DATA		0x0c

#define GLOBAL_ATU_DATA_TRUNK			BIT(15)

#define GLOBAL_ATU_DATA_TRUNK_ID_MASK		0x00f0

#define GLOBAL_ATU_DATA_TRUNK_ID_SHIFT		4

#define GLOBAL_ATU_DATA_PORT_VECTOR_MASK	0x3ff0

#define GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT	4

#define GLOBAL_ATU_DATA_STATE_MASK		0x0f
@@ -316,6 +318,14 @@ 
#define GLOBAL2_QOS_WEIGHT	0x1c

#define GLOBAL2_MISC		0x1d



struct mv88e6xxx_atu_entry {

	u16	fid;

	u8	state;

	bool	trunk;

	u16	portv_trunkid;

	u8	mac[ETH_ALEN];

};



struct mv88e6xxx_priv_state {

	/* When using multi-chip addressing, this mutex protects

	 * access to the indirect access registers.  (In single-chip