diff options
| author |   Petr Machata <petrm@mellanox.com> | 2018-02-27 14:53:40 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-27 14:46:26 -0500 |
| commit | 1da93eb466dc6f8a92e0316fd983ee8a3338db4c (patch) | |
| tree | a6b2229e9867b25e56f94835860f276a6dd8fc13 /drivers/net | |
| parent | mlxsw: reg: Add SPAN encapsulation to MPAT register (diff) | |
| download | linux-dev-1da93eb466dc6f8a92e0316fd983ee8a3338db4c.tar.xz linux-dev-1da93eb466dc6f8a92e0316fd983ee8a3338db4c.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index 2aaccbac3ed1..cb5f77f09f8e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -6868,7 +6868,8 @@ MLXSW_ITEM32(reg, mpat, eth_rspan_sip4, 0x5C, 0, 32); MLXSW_ITEM_BUF(reg, mpat, eth_rspan_sip6, 0x50, 16); 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_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_qos_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) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c index c3bec37d71ed..1433d4890b88 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -93,7 +93,8 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp_port *port) return NULL; /* 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); if (err) 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]; 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); } |