Commit 4b7da3d8 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: sja1105: Use the LOCKEDS bit for SJA1105 E/T as well 



It looks like the FDB dump taken from first-generation switches also
contains information on whether entries are static or not. So use that
instead of searching through the driver's tables.

Fixes: d7637782 ("net: dsa: sja1105: Implement is_static for FDB entries on E/T")
Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d7c7d94

drivers/net/dsa/sja1105/sja1105_dynamic_config.c

+13 −1
Original line number Diff line number Diff line
@@ -277,6 +277,18 @@ sja1105et_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd, 
			SJA1105ET_SIZE_L2_LOOKUP_ENTRY, op);

}



static size_t sja1105et_dyn_l2_lookup_entry_packing(void *buf, void *entry_ptr,

						    enum packing_op op)

{

	struct sja1105_l2_lookup_entry *entry = entry_ptr;

	u8 *cmd = buf + SJA1105ET_SIZE_L2_LOOKUP_ENTRY;

	const int size = SJA1105_SIZE_DYN_CMD;



	sja1105_packing(cmd, &entry->lockeds, 28, 28, size, op);



	return sja1105et_l2_lookup_entry_packing(buf, entry_ptr, op);

}



static void

sja1105et_mgmt_route_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,

				 enum packing_op op)
@@ -477,7 +489,7 @@ sja1105et_general_params_entry_packing(void *buf, void *entry_ptr, 
/* SJA1105E/T: First generation */

struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {

	[BLK_IDX_L2_LOOKUP] = {

		.entry_packing = sja1105et_l2_lookup_entry_packing,

		.entry_packing = sja1105et_dyn_l2_lookup_entry_packing,

		.cmd_packing = sja1105et_l2_lookup_cmd_packing,

		.access = (OP_READ | OP_WRITE | OP_DEL),

		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,

drivers/net/dsa/sja1105/sja1105_main.c

+0 −15
Original line number Diff line number Diff line
@@ -1254,21 +1254,6 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port, 
			continue;

		u64_to_ether_addr(l2_lookup.macaddr, macaddr);



		/* On SJA1105 E/T, the switch doesn't implement the LOCKEDS

		 * bit, so it doesn't tell us whether a FDB entry is static

		 * or not.

		 * But, of course, we can find out - we're the ones who added

		 * it in the first place.

		 */

		if (priv->info->device_id == SJA1105E_DEVICE_ID ||

		    priv->info->device_id == SJA1105T_DEVICE_ID) {

			int match;



			match = sja1105_find_static_fdb_entry(priv, port,

							      &l2_lookup);

			l2_lookup.lockeds = (match >= 0);

		}



		/* We need to hide the dsa_8021q VLANs from the user. */

		if (!dsa_port_is_vlan_filtering(&ds->ports[port]))

			l2_lookup.vlanid = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE