mlxsw: spectrum_acl: Add initial Spectrum-2 ACL implementation
authorJiri Pirko <jiri@mellanox.com>
Wed, 18 Jul 2018 08:14:44 +0000 (11:14 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2018 17:13:14 +0000 (02:13 +0900)
Utilize only C-TCAM for now. Do very minimal A-TCAM initialization in
order to make C-TCAM work.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/Makefile
drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c [new file with mode: 0644]
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c [new file with mode: 0644]
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h

index e1b72e1a0c2a0b9ca43445ae913edf1848c0553f..4a1069166119833ad646a2f8c19fefbc652aa39d 100644 (file)
@@ -18,7 +18,8 @@ mlxsw_spectrum-objs           := spectrum.o spectrum_buffers.o \
                                   spectrum1_kvdl.o spectrum2_kvdl.o \
                                   spectrum_kvdl.o \
                                   spectrum_acl_tcam.o spectrum_acl_ctcam.o \
-                                  spectrum1_acl_tcam.o \
+                                  spectrum_acl_atcam.o \
+                                  spectrum1_acl_tcam.o spectrum2_acl_tcam.o \
                                   spectrum_acl.o \
                                   spectrum_flower.o spectrum_cnt.o \
                                   spectrum_fid.o spectrum_ipip.o \
index 75ebf5e6b9e109f14275ac33fddf4676623b3d7f..9a473628831e7d09122cce92f6027ebfa139b9ce 100644 (file)
@@ -430,6 +430,12 @@ char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block)
 }
 EXPORT_SYMBOL(mlxsw_afa_block_first_set);
 
+char *mlxsw_afa_block_cur_set(struct mlxsw_afa_block *block)
+{
+       return block->cur_set->ht_key.enc_actions;
+}
+EXPORT_SYMBOL(mlxsw_afa_block_cur_set);
+
 u32 mlxsw_afa_block_first_kvdl_index(struct mlxsw_afa_block *block)
 {
        /* First set is never in KVD linear. So the first set
index 1c7db26e7942f686ecacca7d849659fcb8955ec2..69628582fb4baffef2df4f349eb5e3d93f4fcc7f 100644 (file)
@@ -67,6 +67,7 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa);
 void mlxsw_afa_block_destroy(struct mlxsw_afa_block *block);
 int mlxsw_afa_block_commit(struct mlxsw_afa_block *block);
 char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block);
+char *mlxsw_afa_block_cur_set(struct mlxsw_afa_block *block);
 u32 mlxsw_afa_block_first_kvdl_index(struct mlxsw_afa_block *block);
 int mlxsw_afa_block_activity_get(struct mlxsw_afa_block *block, bool *activity);
 int mlxsw_afa_block_continue(struct mlxsw_afa_block *block);
index f51831e337577918bdf5b6f18be8fad3a1595017..0160589615429098bd1af4c698e1b129c2a56c5f 100644 (file)
@@ -646,6 +646,9 @@ struct mlxsw_sp_acl_tcam_ops {
 /* spectrum1_acl_tcam.c */
 extern const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops;
 
+/* spectrum2_acl_tcam.c */
+extern const struct mlxsw_sp_acl_tcam_ops mlxsw_sp2_acl_tcam_ops;
+
 /* spectrum_acl_flex_actions.c */
 extern const struct mlxsw_afa_ops mlxsw_sp1_act_afa_ops;
 extern const struct mlxsw_afa_ops mlxsw_sp2_act_afa_ops;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c
new file mode 100644 (file)
index 0000000..d7f1fb3
--- /dev/null
@@ -0,0 +1,222 @@
+/*
+ * drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c
+ * Copyright (c) 2018 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2018 Jiri Pirko <jiri@mellanox.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+
+#include "spectrum.h"
+#include "spectrum_acl_tcam.h"
+#include "core_acl_flex_actions.h"
+
+struct mlxsw_sp2_acl_tcam {
+       u32 kvdl_index;
+       unsigned int kvdl_count;
+};
+
+struct mlxsw_sp2_acl_tcam_region {
+       struct mlxsw_sp_acl_ctcam_region cregion;
+};
+
+struct mlxsw_sp2_acl_tcam_chunk {
+       struct mlxsw_sp_acl_ctcam_chunk cchunk;
+};
+
+struct mlxsw_sp2_acl_tcam_entry {
+       struct mlxsw_sp_acl_ctcam_entry centry;
+       struct mlxsw_afa_block *act_block;
+};
+
+static int mlxsw_sp2_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, void *priv,
+                                  struct mlxsw_sp_acl_tcam *_tcam)
+{
+       struct mlxsw_sp2_acl_tcam *tcam = priv;
+       struct mlxsw_afa_block *afa_block;
+       char pefa_pl[MLXSW_REG_PEFA_LEN];
+       char pgcr_pl[MLXSW_REG_PGCR_LEN];
+       char *enc_actions;
+       int i;
+       int err;
+
+       tcam->kvdl_count = _tcam->max_regions;
+       err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,
+                                 tcam->kvdl_count, &tcam->kvdl_index);
+       if (err)
+               return err;
+
+       /* Create flex action block, set default action (continue)
+        * but don't commit. We need just the current set encoding
+        * to be written using PEFA register to all indexes for all regions.
+        */
+       afa_block = mlxsw_afa_block_create(mlxsw_sp->afa);
+       if (!afa_block) {
+               err = -ENOMEM;
+               goto err_afa_block;
+       }
+       err = mlxsw_afa_block_continue(afa_block);
+       if (WARN_ON(err))
+               goto err_afa_block_continue;
+       enc_actions = mlxsw_afa_block_cur_set(afa_block);
+
+       for (i = 0; i < tcam->kvdl_count; i++) {
+               mlxsw_reg_pefa_pack(pefa_pl, tcam->kvdl_index + i,
+                                   true, enc_actions);
+               err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pefa), pefa_pl);
+               if (err)
+                       goto err_pefa_write;
+       }
+       mlxsw_reg_pgcr_pack(pgcr_pl, tcam->kvdl_index);
+       err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pgcr), pgcr_pl);
+       if (err)
+               goto err_pgcr_write;
+
+       mlxsw_afa_block_destroy(afa_block);
+       return 0;
+
+err_pgcr_write:
+err_pefa_write:
+err_afa_block_continue:
+       mlxsw_afa_block_destroy(afa_block);
+err_afa_block:
+       mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,
+                          tcam->kvdl_count, tcam->kvdl_index);
+       return err;
+}
+
+static void mlxsw_sp2_acl_tcam_fini(struct mlxsw_sp *mlxsw_sp, void *priv)
+{
+       struct mlxsw_sp2_acl_tcam *tcam = priv;
+
+       mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,
+                          tcam->kvdl_count, tcam->kvdl_index);
+}
+
+static int
+mlxsw_sp2_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv,
+                              struct mlxsw_sp_acl_tcam_region *_region)
+{
+       struct mlxsw_sp2_acl_tcam_region *region = region_priv;
+       int err;
+
+       err = mlxsw_sp_acl_atcam_region_init(mlxsw_sp, _region);
+       if (err)
+               return err;
+       return mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &region->cregion,
+                                             _region);
+}
+
+static void
+mlxsw_sp2_acl_tcam_region_fini(struct mlxsw_sp *mlxsw_sp, void *region_priv)
+{
+       struct mlxsw_sp2_acl_tcam_region *region = region_priv;
+
+       mlxsw_sp_acl_ctcam_region_fini(&region->cregion);
+}
+
+static int
+mlxsw_sp2_acl_tcam_region_associate(struct mlxsw_sp *mlxsw_sp,
+                                   struct mlxsw_sp_acl_tcam_region *region)
+{
+       return mlxsw_sp_acl_atcam_region_associate(mlxsw_sp, region->id);
+}
+
+static void mlxsw_sp2_acl_tcam_chunk_init(void *region_priv, void *chunk_priv,
+                                         unsigned int priority)
+{
+       struct mlxsw_sp2_acl_tcam_region *region = region_priv;
+       struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;
+
+       mlxsw_sp_acl_ctcam_chunk_init(&region->cregion, &chunk->cchunk,
+                                     priority);
+}
+
+static void mlxsw_sp2_acl_tcam_chunk_fini(void *chunk_priv)
+{
+       struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;
+
+       mlxsw_sp_acl_ctcam_chunk_fini(&chunk->cchunk);
+}
+
+static int mlxsw_sp2_acl_tcam_entry_add(struct mlxsw_sp *mlxsw_sp,
+                                       void *region_priv, void *chunk_priv,
+                                       void *entry_priv,
+                                       struct mlxsw_sp_acl_rule_info *rulei)
+{
+       struct mlxsw_sp2_acl_tcam_region *region = region_priv;
+       struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;
+       struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;
+
+       entry->act_block = rulei->act_block;
+       return mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &region->cregion,
+                                           &chunk->cchunk, &entry->centry,
+                                           rulei, true);
+}
+
+static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp,
+                                        void *region_priv, void *chunk_priv,
+                                        void *entry_priv)
+{
+       struct mlxsw_sp2_acl_tcam_region *region = region_priv;
+       struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;
+       struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;
+
+       mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &region->cregion,
+                                    &chunk->cchunk, &entry->centry);
+}
+
+static int
+mlxsw_sp2_acl_tcam_entry_activity_get(struct mlxsw_sp *mlxsw_sp,
+                                     void *region_priv, void *entry_priv,
+                                     bool *activity)
+{
+       struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;
+
+       return mlxsw_afa_block_activity_get(entry->act_block, activity);
+}
+
+const struct mlxsw_sp_acl_tcam_ops mlxsw_sp2_acl_tcam_ops = {
+       .key_type               = MLXSW_REG_PTAR_KEY_TYPE_FLEX2,
+       .priv_size              = sizeof(struct mlxsw_sp2_acl_tcam),
+       .init                   = mlxsw_sp2_acl_tcam_init,
+       .fini                   = mlxsw_sp2_acl_tcam_fini,
+       .region_priv_size       = sizeof(struct mlxsw_sp2_acl_tcam_region),
+       .region_init            = mlxsw_sp2_acl_tcam_region_init,
+       .region_fini            = mlxsw_sp2_acl_tcam_region_fini,
+       .region_associate       = mlxsw_sp2_acl_tcam_region_associate,
+       .chunk_priv_size        = sizeof(struct mlxsw_sp2_acl_tcam_chunk),
+       .chunk_init             = mlxsw_sp2_acl_tcam_chunk_init,
+       .chunk_fini             = mlxsw_sp2_acl_tcam_chunk_fini,
+       .entry_priv_size        = sizeof(struct mlxsw_sp2_acl_tcam_entry),
+       .entry_add              = mlxsw_sp2_acl_tcam_entry_add,
+       .entry_del              = mlxsw_sp2_acl_tcam_entry_del,
+       .entry_activity_get     = mlxsw_sp2_acl_tcam_entry_activity_get,
+};
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
new file mode 100644 (file)
index 0000000..b1b3b0e
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
+ * Copyright (c) 2018 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2018 Jiri Pirko <jiri@mellanox.com>
+ * Copyright (c) 2018 Ido Schimmel <idosch@mellanox.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include "reg.h"
+#include "core.h"
+#include "spectrum.h"
+#include "spectrum_acl_tcam.h"
+
+int mlxsw_sp_acl_atcam_region_associate(struct mlxsw_sp *mlxsw_sp,
+                                       u16 region_id)
+{
+       char perar_pl[MLXSW_REG_PERAR_LEN];
+       /* For now, just assume that every region has 12 key blocks */
+       u16 hw_region = region_id * 3;
+       u64 max_regions;
+
+       max_regions = MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_MAX_REGIONS);
+       if (hw_region >= max_regions)
+               return -ENOBUFS;
+
+       mlxsw_reg_perar_pack(perar_pl, region_id, hw_region);
+       return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(perar), perar_pl);
+}
+
+static int mlxsw_sp_acl_atcam_region_param_init(struct mlxsw_sp *mlxsw_sp,
+                                               u16 region_id)
+{
+       char percr_pl[MLXSW_REG_PERCR_LEN];
+
+       mlxsw_reg_percr_pack(percr_pl, region_id);
+       return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(percr), percr_pl);
+}
+
+static int
+mlxsw_sp_acl_atcam_region_erp_init(struct mlxsw_sp *mlxsw_sp,
+                                  u16 region_id)
+{
+       char pererp_pl[MLXSW_REG_PERERP_LEN];
+
+       mlxsw_reg_pererp_pack(pererp_pl, region_id);
+       return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pererp), pererp_pl);
+}
+
+int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
+                                  struct mlxsw_sp_acl_tcam_region *region)
+{
+       int err;
+
+       err = mlxsw_sp_acl_atcam_region_associate(mlxsw_sp, region->id);
+       if (err)
+               return err;
+       err = mlxsw_sp_acl_atcam_region_param_init(mlxsw_sp, region->id);
+       if (err)
+               return err;
+       err = mlxsw_sp_acl_atcam_region_erp_init(mlxsw_sp, region->id);
+       if (err)
+               return err;
+
+       return 0;
+}
index cef769764505b62b1f45b7580bd1af0414608ff4..68551da2221d98fb10de519e2a0437fe1d6bf849 100644 (file)
@@ -143,4 +143,9 @@ mlxsw_sp_acl_ctcam_entry_offset(struct mlxsw_sp_acl_ctcam_entry *centry)
        return centry->parman_item.index;
 }
 
+int mlxsw_sp_acl_atcam_region_associate(struct mlxsw_sp *mlxsw_sp,
+                                       u16 region_id);
+int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
+                                  struct mlxsw_sp_acl_tcam_region *region);
+
 #endif