mlxsw: spectrum: Add support for traps specific to Spectrum-1

On Spectrum-1, timestamps for PTP packets are delivered through queues
of ingress and egress timestamps. There are two event traps
corresponding to activity on each of those queues. This mechanism is
absent on Spectrum-2, and therefore the traps should only be registered
on Spectrum-1.

Carry a chip-specific listener array in mlxsw_sp->listeners and
listeners_count. Register listeners from that array in
mlxsw_sp_traps_init(). Add a new listener array for Spectrum-1 traps and
configure the newly-added mlxsw_sp->listeners with this array.

The listener array is empty for now, the events will be added in a later
patch.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 0119efe0ea7a86939d83bc48818952f7fc60bebb..91486193454aa45d95e566bb6966377f0b64b439 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4114,6 +4114,9 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = {
        MLXSW_SP_RXL_NO_MARK(NVE_DECAP_ARP, TRAP_TO_CPU, ARP, false),
 };
 
+static const struct mlxsw_listener mlxsw_sp1_listener[] = {
+};
+
 static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core)
 {
        char qpcr_pl[MLXSW_REG_QPCR_LEN];
@@ -4302,12 +4305,28 @@ static int mlxsw_sp_traps_init(struct mlxsw_sp *mlxsw_sp)
        if (err)
                return err;
 
-       return mlxsw_sp_traps_register(mlxsw_sp, mlxsw_sp_listener,
-                                      ARRAY_SIZE(mlxsw_sp_listener));
+       err = mlxsw_sp_traps_register(mlxsw_sp, mlxsw_sp_listener,
+                                     ARRAY_SIZE(mlxsw_sp_listener));
+       if (err)
+               return err;
+
+       err = mlxsw_sp_traps_register(mlxsw_sp, mlxsw_sp->listeners,
+                                     mlxsw_sp->listeners_count);
+       if (err)
+               goto err_extra_traps_init;
+
+       return 0;
+
+err_extra_traps_init:
+       mlxsw_sp_traps_unregister(mlxsw_sp, mlxsw_sp_listener,
+                                 ARRAY_SIZE(mlxsw_sp_listener));
+       return err;
 }
 
 static void mlxsw_sp_traps_fini(struct mlxsw_sp *mlxsw_sp)
 {
+       mlxsw_sp_traps_unregister(mlxsw_sp, mlxsw_sp->listeners,
+                                 mlxsw_sp->listeners_count);
        mlxsw_sp_traps_unregister(mlxsw_sp, mlxsw_sp_listener,
                                  ARRAY_SIZE(mlxsw_sp_listener));
 }
@@ -4566,6 +4585,8 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->sb_vals = &mlxsw_sp1_sb_vals;
        mlxsw_sp->port_type_speed_ops = &mlxsw_sp1_port_type_speed_ops;
        mlxsw_sp->ptp_ops = &mlxsw_sp1_ptp_ops;
+       mlxsw_sp->listeners = mlxsw_sp1_listener;
+       mlxsw_sp->listeners_count = ARRAY_SIZE(mlxsw_sp1_listener);
 
        return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);
 }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 84f4276193b3676485bb9443dec338e6605d20f0..9136a86dc55f7546e6d6c627d74b38e6def2e66a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -175,6 +175,8 @@ struct mlxsw_sp {
        const struct mlxsw_sp_sb_vals *sb_vals;
        const struct mlxsw_sp_port_type_speed_ops *port_type_speed_ops;
        const struct mlxsw_sp_ptp_ops *ptp_ops;
+       const struct mlxsw_listener *listeners;
+       size_t listeners_count;
 };
 
 static inline struct mlxsw_sp_upper *