UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlxsw: reg: Extend mlxsw_reg_mpat_pack() 

To support encapsulated SPAN, extend mlxsw_reg_mpat_pack() with a field
to set the SPAN type.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Machata 2018-02-27 14:53:40 +01:00 committed by David S. Miller
parent 0d6cd3fcbc
commit 1da93eb466
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/mellanox/mlxsw/reg.h
View File

@ -6868,7 +6868,8 @@ MLXSW_ITEM32(reg, mpat, eth_rspan_sip4, 0x5C, 0, 32);
MLXSW_ITEM_BUF(reg, mpat, eth_rspan_sip6, 0x50, 16); MLXSW_ITEM_BUF(reg, mpat, eth_rspan_sip6, 0x50, 16);
static inline void mlxsw_reg_mpat_pack(char *payload, u8 pa_id, static inline void mlxsw_reg_mpat_pack(char *payload, u8 pa_id,
u16 system_port, bool e) u16 system_port, bool e,
enum mlxsw_reg_mpat_span_type span_type)
{ {
MLXSW_REG_ZERO(mpat, payload); MLXSW_REG_ZERO(mpat, payload);
mlxsw_reg_mpat_pa_id_set(payload, pa_id); mlxsw_reg_mpat_pa_id_set(payload, pa_id);
@ -6876,6 +6877,7 @@ static inline void mlxsw_reg_mpat_pack(char *payload, u8 pa_id,
mlxsw_reg_mpat_e_set(payload, e); mlxsw_reg_mpat_e_set(payload, e);
mlxsw_reg_mpat_qos_set(payload, 1); mlxsw_reg_mpat_qos_set(payload, 1);
mlxsw_reg_mpat_be_set(payload, 1); mlxsw_reg_mpat_be_set(payload, 1);
mlxsw_reg_mpat_span_type_set(payload, span_type);
} }
static inline void mlxsw_reg_mpat_eth_rspan_pack(char *payload, u16 vid) static inline void mlxsw_reg_mpat_eth_rspan_pack(char *payload, u16 vid)

6
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
View File

@ -93,7 +93,8 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp_port *port)
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, index, local_port, true,
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;
@ -111,7 +112,8 @@ static void mlxsw_sp_span_entry_destroy(struct mlxsw_sp *mlxsw_sp,
char mpat_pl[MLXSW_REG_MPAT_LEN]; char mpat_pl[MLXSW_REG_MPAT_LEN];
int pa_id = span_entry->id; int pa_id = span_entry->id;
mlxsw_reg_mpat_pack(mpat_pl, pa_id, local_port, false); mlxsw_reg_mpat_pack(mpat_pl, pa_id, local_port, false,
MLXSW_REG_MPAT_SPAN_TYPE_LOCAL_ETH);
mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpat), mpat_pl); mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpat), mpat_pl);
} }