Commit 3546b03f authored by Petr Machata's avatar Petr Machata Committed by David S. Miller

mlxsw: spectrum_span: Initialize span_entry.id eagerly

It is known statically ahead of time which SPAN entry will have which
ID. Just initialize it eagerly in mlxsw_sp_span_init(), don't wait until
the entry is actually created. This simplifies some code in
mlxsw_sp_span_entry_create()
Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98977089
...@@ -51,8 +51,12 @@ int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp) ...@@ -51,8 +51,12 @@ int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp)
if (!mlxsw_sp->span.entries) if (!mlxsw_sp->span.entries)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < mlxsw_sp->span.entries_count; i++) for (i = 0; i < mlxsw_sp->span.entries_count; i++) {
INIT_LIST_HEAD(&mlxsw_sp->span.entries[i].bound_ports_list); struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span.entries[i];
INIT_LIST_HEAD(&curr->bound_ports_list);
curr->id = i;
}
return 0; return 0;
} }
...@@ -72,34 +76,30 @@ void mlxsw_sp_span_fini(struct mlxsw_sp *mlxsw_sp) ...@@ -72,34 +76,30 @@ void mlxsw_sp_span_fini(struct mlxsw_sp *mlxsw_sp)
static struct mlxsw_sp_span_entry * static struct mlxsw_sp_span_entry *
mlxsw_sp_span_entry_create(struct mlxsw_sp_port *port) mlxsw_sp_span_entry_create(struct mlxsw_sp_port *port)
{ {
struct mlxsw_sp_span_entry *span_entry = NULL;
struct mlxsw_sp *mlxsw_sp = port->mlxsw_sp; struct mlxsw_sp *mlxsw_sp = port->mlxsw_sp;
struct mlxsw_sp_span_entry *span_entry;
char mpat_pl[MLXSW_REG_MPAT_LEN]; char mpat_pl[MLXSW_REG_MPAT_LEN];
u8 local_port = port->local_port; u8 local_port = port->local_port;
int index;
int i; int i;
int err; int err;
/* find a free entry to use */ /* find a free entry to use */
index = -1;
for (i = 0; i < mlxsw_sp->span.entries_count; i++) { for (i = 0; i < mlxsw_sp->span.entries_count; i++) {
if (!mlxsw_sp->span.entries[i].ref_count) { if (!mlxsw_sp->span.entries[i].ref_count) {
index = i;
span_entry = &mlxsw_sp->span.entries[i]; span_entry = &mlxsw_sp->span.entries[i];
break; break;
} }
} }
if (index < 0) if (!span_entry)
return NULL; return NULL;
/* create a new port analayzer entry for local_port */ /* create a new port analayzer entry for local_port */
mlxsw_reg_mpat_pack(mpat_pl, index, local_port, true, mlxsw_reg_mpat_pack(mpat_pl, span_entry->id, local_port, true,
MLXSW_REG_MPAT_SPAN_TYPE_LOCAL_ETH); MLXSW_REG_MPAT_SPAN_TYPE_LOCAL_ETH);
err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpat), mpat_pl); err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpat), mpat_pl);
if (err) if (err)
return NULL; return NULL;
span_entry->id = index;
span_entry->ref_count = 1; span_entry->ref_count = 1;
span_entry->local_port = local_port; span_entry->local_port = local_port;
return span_entry; return span_entry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment