mlxsw: spectrum_acl: Convert mlxsw_afk_create args to ops

Since the flex keys for Spectrum-2 differ not only in blocks definitions
but also in encoding layout, prepare for the implementation and pass
Spectrum/Spectrum-2 specific ops down to mlxsw_afk_create.

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>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/Makefile b/drivers/net/ethernet/mellanox/mlxsw/Makefile
index 54f1de4..981e621 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/Makefile
+++ b/drivers/net/ethernet/mellanox/mlxsw/Makefile
@@ -22,6 +22,7 @@ mlxsw_spectrum-objs           := spectrum.o spectrum_buffers.o \
                                   spectrum_flower.o spectrum_cnt.o \
                                   spectrum_fid.o spectrum_ipip.o \
                                   spectrum_acl_flex_actions.o \
+                                  spectrum_acl_flex_keys.o \
                                   spectrum1_mr_tcam.o \
                                   spectrum_mr_tcam.o spectrum_mr.o \
                                   spectrum_qdisc.o spectrum_span.o

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
index b32a009..098665e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
@@ -43,6 +43,7 @@
 struct mlxsw_afk {
        struct list_head key_info_list;
        unsigned int max_blocks;
+       const struct mlxsw_afk_ops *ops;
        const struct mlxsw_afk_block *blocks;
        unsigned int blocks_count;
 };
@@ -69,8 +70,7 @@ static bool mlxsw_afk_blocks_check(struct mlxsw_afk *mlxsw_afk)
 }
 
 struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,
-                                  const struct mlxsw_afk_block *blocks,
-                                  unsigned int blocks_count)
+                                  const struct mlxsw_afk_ops *ops)
 {
        struct mlxsw_afk *mlxsw_afk;
 
@@ -79,8 +79,9 @@ struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,
                return NULL;
        INIT_LIST_HEAD(&mlxsw_afk->key_info_list);
        mlxsw_afk->max_blocks = max_blocks;
-       mlxsw_afk->blocks = blocks;
-       mlxsw_afk->blocks_count = blocks_count;
+       mlxsw_afk->ops = ops;
+       mlxsw_afk->blocks = ops->blocks;
+       mlxsw_afk->blocks_count = ops->blocks_count;
        WARN_ON(!mlxsw_afk_blocks_check(mlxsw_afk));
        return mlxsw_afk;
 }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h
index 154eccd..6d3817d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h
@@ -216,9 +216,13 @@ mlxsw_afk_element_usage_subset(struct mlxsw_afk_element_usage *elusage_small,
 
 struct mlxsw_afk;
 
+struct mlxsw_afk_ops {
+       const struct mlxsw_afk_block *blocks;
+       unsigned int blocks_count;
+};
+
 struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,
-                                  const struct mlxsw_afk_block *blocks,
-                                  unsigned int blocks_count);
+                                  const struct mlxsw_afk_ops *ops);
 void mlxsw_afk_destroy(struct mlxsw_afk *mlxsw_afk);
 
 struct mlxsw_afk_key_info;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 5f5b476..64c4259 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3623,6 +3623,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,
 
        mlxsw_sp->kvdl_ops = &mlxsw_sp1_kvdl_ops;
        mlxsw_sp->afa_ops = &mlxsw_sp1_act_afa_ops;
+       mlxsw_sp->afk_ops = &mlxsw_sp1_afk_ops;
        mlxsw_sp->mr_tcam_ops = &mlxsw_sp1_mr_tcam_ops;
        mlxsw_sp->acl_tcam_ops = &mlxsw_sp1_acl_tcam_ops;
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 9a53dd6..aa07f5b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -173,6 +173,7 @@ struct mlxsw_sp {
        } span;
        const struct mlxsw_sp_kvdl_ops *kvdl_ops;
        const struct mlxsw_afa_ops *afa_ops;
+       const struct mlxsw_afk_ops *afk_ops;
        const struct mlxsw_sp_mr_tcam_ops *mr_tcam_ops;
        const struct mlxsw_sp_acl_tcam_ops *acl_tcam_ops;
 };
@@ -639,6 +640,9 @@ extern const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops;
 /* spectrum_acl_flex_actions.c */
 extern const struct mlxsw_afa_ops mlxsw_sp1_act_afa_ops;
 
+/* spectrum_acl_flex_keys.c */
+extern const struct mlxsw_afk_ops mlxsw_sp1_afk_ops;
+
 /* spectrum_flower.c */
 int mlxsw_sp_flower_replace(struct mlxsw_sp *mlxsw_sp,
                            struct mlxsw_sp_acl_block *block,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
index 5f71d65..217621d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
@@ -49,7 +49,6 @@
 #include "core_acl_flex_keys.h"
 #include "core_acl_flex_actions.h"
 #include "spectrum_acl_tcam.h"
-#include "spectrum_acl_flex_keys.h"
 
 struct mlxsw_sp_acl {
        struct mlxsw_sp *mlxsw_sp;
@@ -838,8 +837,7 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp)
        acl->mlxsw_sp = mlxsw_sp;
        acl->afk = mlxsw_afk_create(MLXSW_CORE_RES_GET(mlxsw_sp->core,
                                                       ACL_FLEX_KEYS),
-                                   mlxsw_sp1_afk_blocks,
-                                   MLXSW_SP1_AFK_BLOCKS_COUNT);
+                                   mlxsw_sp->afk_ops);
        if (!acl->afk) {
                err = -ENOMEM;
                goto err_afk_create;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
similarity index 92%
rename from drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h
rename to drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
index a120c0d..4ed9a52 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
@@ -1,7 +1,7 @@
 /*
- * drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h
- * Copyright (c) 2017 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2017 Jiri Pirko <jiri@mellanox.com>
+ * drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
+ * Copyright (c) 2017-2018 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2017-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:
@@ -32,9 +32,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MLXSW_SPECTRUM_ACL_FLEX_KEYS_H
-#define _MLXSW_SPECTRUM_ACL_FLEX_KEYS_H
-
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include "spectrum.h"
+#include "item.h"
 #include "core_acl_flex_keys.h"
 
 static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_l2_dmac[] = {
@@ -126,6 +127,7 @@ static const struct mlxsw_afk_block mlxsw_sp1_afk_blocks[] = {
        MLXSW_AFK_BLOCK(0xB0, mlxsw_sp_afk_element_info_packet_type),
 };
 
-#define MLXSW_SP1_AFK_BLOCKS_COUNT ARRAY_SIZE(mlxsw_sp1_afk_blocks)
-
-#endif
+const struct mlxsw_afk_ops mlxsw_sp1_afk_ops = {
+       .blocks         = mlxsw_sp1_afk_blocks,
+       .blocks_count   = ARRAY_SIZE(mlxsw_sp1_afk_blocks),
+};