mlxsw: Add option to choose trap group

Currently, we set the trap group to pre-determined option, based on whether
it is an rx or event trap.
This commit adds a possibility to chose the trap group, so it can be set
to different values in the following patches.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index b5b5b367d25c3dbc97ef0f79b5ca6172ece186df..d663b8e98c911349ab082b142f8a25dcee18c799 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -103,7 +103,8 @@ struct mlxsw_listener {
        bool is_event;
 };
 
-#define MLXSW_RXL(_func, _trap_id, _action, _is_ctrl, _unreg_action)   \
+#define MLXSW_RXL(_func, _trap_id, _action, _is_ctrl, _trap_group,     \
+                 _unreg_action)                                        \
        {                                                               \
                .trap_id = MLXSW_TRAP_ID_##_trap_id,                    \
                .u.rx_listener =                                        \
@@ -114,23 +115,23 @@ struct mlxsw_listener {
                },                                                      \
                .action = MLXSW_REG_HPKT_ACTION_##_action,              \
                .unreg_action = MLXSW_REG_HPKT_ACTION_##_unreg_action,  \
-               .trap_group = MLXSW_REG_HTGT_TRAP_GROUP_RX,             \
+               .trap_group = MLXSW_REG_HTGT_TRAP_GROUP_##_trap_group,  \
                .is_ctrl = _is_ctrl,                                    \
                .is_event = false,                                      \
        }
 
-#define MLXSW_EVENTL(_func, _trap_id)                          \
-       {                                                       \
-               .trap_id = MLXSW_TRAP_ID_##_trap_id,            \
-               .u.event_listener =                             \
-               {                                               \
-                       .func = _func,                          \
-                       .trap_id = MLXSW_TRAP_ID_##_trap_id,    \
-               },                                              \
-               .action = MLXSW_REG_HPKT_ACTION_TRAP_TO_CPU,    \
-               .trap_group = MLXSW_REG_HTGT_TRAP_GROUP_EMAD,   \
-               .is_ctrl = false,                               \
-               .is_event = true,                               \
+#define MLXSW_EVENTL(_func, _trap_id, _trap_group)                     \
+       {                                                               \
+               .trap_id = MLXSW_TRAP_ID_##_trap_id,                    \
+               .u.event_listener =                                     \
+               {                                                       \
+                       .func = _func,                                  \
+                       .trap_id = MLXSW_TRAP_ID_##_trap_id,            \
+               },                                                      \
+               .action = MLXSW_REG_HPKT_ACTION_TRAP_TO_CPU,            \
+               .trap_group = MLXSW_REG_HTGT_TRAP_GROUP_##_trap_group,  \
+               .is_ctrl = false,                                       \
+               .is_event = true,                                       \
        }
 
 int mlxsw_core_rx_listener_register(struct mlxsw_core *mlxsw_core,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 3582e3f2901bfdbdff03c947d11bf7eb249a00ae..44243a4294c9fbb9f4cb97e3a71a951262c59f13 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2731,16 +2731,16 @@ static void mlxsw_sp_rx_listener_mark_func(struct sk_buff *skb, u8 local_port,
 }
 
 #define MLXSW_SP_RXL_NO_MARK(_trap_id, _action, _is_ctrl)              \
-       MLXSW_RXL(mlxsw_sp_rx_listener_no_mark_func, _trap_id, _action, \
-                 _is_ctrl, DISCARD)
+       MLXSW_RXL(mlxsw_sp_rx_listener_no_mark_func, _trap_id, _action, \
+                 _is_ctrl, RX, DISCARD)
 
 #define MLXSW_SP_RXL_MARK(_trap_id, _action, _is_ctrl)                 \
        MLXSW_RXL(mlxsw_sp_rx_listener_mark_func, _trap_id, _action,    \
-                 _is_ctrl, DISCARD)
+                 _is_ctrl, RX, DISCARD)
 
 static const struct mlxsw_listener mlxsw_sp_listener[] = {
        /* Events */
-       MLXSW_EVENTL(mlxsw_sp_pude_event_func, PUDE),
+       MLXSW_EVENTL(mlxsw_sp_pude_event_func, PUDE, EMAD),
        /* L2 traps */
        MLXSW_SP_RXL_NO_MARK(STP, TRAP_TO_CPU, true),
        MLXSW_SP_RXL_NO_MARK(LACP, TRAP_TO_CPU, true),

diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchib.c b/drivers/net/ethernet/mellanox/mlxsw/switchib.c
index 847cbbfe854c3b65686d257096a0441c5d889cab..b798711a9c78bda5ec5b4f0a6797b305ba4613a1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/switchib.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchib.c
@@ -409,7 +409,7 @@ static void mlxsw_sib_pude_event_func(const struct mlxsw_reg_info *reg,
 }
 
 static const struct mlxsw_listener mlxsw_sib_listener[] = {
-       MLXSW_EVENTL(mlxsw_sib_pude_event_func, PUDE),
+       MLXSW_EVENTL(mlxsw_sib_pude_event_func, PUDE, EMAD),
 };
 
 static int mlxsw_sib_taps_init(struct mlxsw_sib *mlxsw_sib)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index a15875675c48263b45bf32128fc5b80aff83ea44..1bcb391a35f8f0682997aaf4897208669b4193da 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1450,10 +1450,10 @@ err_port_module_info_get:
 
 #define MLXSW_SX_RXL(_trap_id)                                         \
        MLXSW_RXL(mlxsw_sx_rx_listener_func, _trap_id, TRAP_TO_CPU,     \
-                 false, FORWARD)
+                 false, RX, FORWARD)
 
 static const struct mlxsw_listener mlxsw_sx_listener[] = {
-       MLXSW_EVENTL(mlxsw_sx_pude_event_func, PUDE),
+       MLXSW_EVENTL(mlxsw_sx_pude_event_func, PUDE, EMAD),
        MLXSW_SX_RXL(FDB_MC),
        MLXSW_SX_RXL(STP),
        MLXSW_SX_RXL(LACP),