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

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

net: dsa: mv88e6xxx: rework ATU Flush operation 



These Marvell switches have 4 operations to flush or (re)move, all or
only non-static MAC addresses, from the entire set of databases or from
just a particular one.

The value of the EntryState bits will determine if the operation is
either a Flush (0x0) or a Move (0xF).

When moving entries from one port to another, entries will be removed if
the destination port is 0xF.

This patch renames these operations for consistency, add a new generic
_mv88e6xxx_atu_flush_move function, and change _mv88e6xxx_flush_fid to
use it.

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

drivers/net/dsa/mv88e6xxx.c

+40 −9
Original line number Diff line number Diff line
@@ -1070,19 +1070,50 @@ static int _mv88e6xxx_atu_data_write(struct dsa_switch *ds, 
	return _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_DATA, data);

}



static int _mv88e6xxx_flush_fid(struct dsa_switch *ds, int fid)

static int _mv88e6xxx_atu_flush_move(struct dsa_switch *ds,

				     struct mv88e6xxx_atu_entry *entry,

				     bool static_too)

{

	int ret;

	int op;

	int err;



	ret = _mv88e6xxx_atu_wait(ds);

	if (ret < 0)

		return ret;

	err = _mv88e6xxx_atu_wait(ds);

	if (err)

		return err;



	ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_FID, fid);

	if (ret < 0)

		return ret;

	err = _mv88e6xxx_atu_data_write(ds, entry);

	if (err)

		return err;



	if (entry->fid) {

		err = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_FID,

					   entry->fid);

		if (err)

			return err;



		op = static_too ? GLOBAL_ATU_OP_FLUSH_MOVE_ALL_DB :

			GLOBAL_ATU_OP_FLUSH_MOVE_NON_STATIC_DB;

	} else {

		op = static_too ? GLOBAL_ATU_OP_FLUSH_MOVE_ALL :

			GLOBAL_ATU_OP_FLUSH_MOVE_NON_STATIC;

	}



	return _mv88e6xxx_atu_cmd(ds, op);

}



	return _mv88e6xxx_atu_cmd(ds, GLOBAL_ATU_OP_FLUSH_NON_STATIC_DB);

static int _mv88e6xxx_atu_flush(struct dsa_switch *ds, u16 fid, bool static_too)

{

	struct mv88e6xxx_atu_entry entry = {

		.fid = fid,

		.state = 0, /* EntryState bits must be 0 */

	};



	return _mv88e6xxx_atu_flush_move(ds, &entry, static_too);

}



static int _mv88e6xxx_flush_fid(struct dsa_switch *ds, int fid)

{

	return _mv88e6xxx_atu_flush(ds, fid, false);

}



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

drivers/net/dsa/mv88e6xxx.h

+4 −4
Original line number Diff line number Diff line
@@ -226,12 +226,12 @@ 
#define GLOBAL_ATU_OP		0x0b

#define GLOBAL_ATU_OP_BUSY	BIT(15)

#define GLOBAL_ATU_OP_NOP		(0 << 12)

#define GLOBAL_ATU_OP_FLUSH_ALL		((1 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_NON_STATIC	((2 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_MOVE_ALL		((1 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_MOVE_NON_STATIC	((2 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_LOAD_DB		((3 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_GET_NEXT_DB	((4 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_DB		((5 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_NON_STATIC_DB ((6 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_MOVE_ALL_DB		((5 << 12) | GLOBAL_ATU_OP_BUSY)

#define GLOBAL_ATU_OP_FLUSH_MOVE_NON_STATIC_DB ((6 << 12) | GLOBAL_ATU_OP_BUSY)

#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)