From: Arkadi Sharshevsky <arka...@mellanox.com>

Connect current dpipe tables to resources. The tables are connected
in the following fashion:
1. IPv4 host - KVD hash single
2. IPv6 host - KVD hash double
3. Adjacency - KVD linear

Signed-off-by: Arkadi Sharshevsky <arka...@mellanox.com>
Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c   | 72 ++++++++++++++++++----
 1 file changed, 60 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c 
b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index 96fdba7..282fe82 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -774,11 +774,27 @@ static struct devlink_dpipe_table_ops mlxsw_sp_host4_ops 
= {
 static int mlxsw_sp_dpipe_host4_table_init(struct mlxsw_sp *mlxsw_sp)
 {
        struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
+       int err;
 
-       return devlink_dpipe_table_register(devlink,
-                                           MLXSW_SP_DPIPE_TABLE_NAME_HOST4,
-                                           &mlxsw_sp_host4_ops,
-                                           mlxsw_sp, false);
+       err = devlink_dpipe_table_register(devlink,
+                                          MLXSW_SP_DPIPE_TABLE_NAME_HOST4,
+                                          &mlxsw_sp_host4_ops,
+                                          mlxsw_sp, false);
+       if (err)
+               return err;
+
+       err = devlink_dpipe_table_resource_set(devlink,
+                                              MLXSW_SP_DPIPE_TABLE_NAME_HOST4,
+                                              
MLXSW_SP_RESOURCE_KVD_HASH_SINGLE);
+       if (err)
+               goto err_resource_set;
+
+       return 0;
+
+err_resource_set:
+       devlink_dpipe_table_unregister(devlink,
+                                      MLXSW_SP_DPIPE_TABLE_NAME_HOST4);
+       return err;
 }
 
 static void mlxsw_sp_dpipe_host4_table_fini(struct mlxsw_sp *mlxsw_sp)
@@ -832,11 +848,27 @@ static struct devlink_dpipe_table_ops mlxsw_sp_host6_ops 
= {
 static int mlxsw_sp_dpipe_host6_table_init(struct mlxsw_sp *mlxsw_sp)
 {
        struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
+       int err;
 
-       return devlink_dpipe_table_register(devlink,
-                                           MLXSW_SP_DPIPE_TABLE_NAME_HOST6,
-                                           &mlxsw_sp_host6_ops,
-                                           mlxsw_sp, false);
+       err = devlink_dpipe_table_register(devlink,
+                                          MLXSW_SP_DPIPE_TABLE_NAME_HOST6,
+                                          &mlxsw_sp_host6_ops,
+                                          mlxsw_sp, false);
+       if (err)
+               return err;
+
+       err = devlink_dpipe_table_resource_set(devlink,
+                                              MLXSW_SP_DPIPE_TABLE_NAME_HOST6,
+                                              
MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE);
+       if (err)
+               goto err_resource_set;
+
+       return 0;
+
+err_resource_set:
+       devlink_dpipe_table_unregister(devlink,
+                                      MLXSW_SP_DPIPE_TABLE_NAME_HOST6);
+       return err;
 }
 
 static void mlxsw_sp_dpipe_host6_table_fini(struct mlxsw_sp *mlxsw_sp)
@@ -1216,11 +1248,27 @@ static struct devlink_dpipe_table_ops 
mlxsw_sp_dpipe_table_adj_ops = {
 static int mlxsw_sp_dpipe_adj_table_init(struct mlxsw_sp *mlxsw_sp)
 {
        struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
+       int err;
 
-       return devlink_dpipe_table_register(devlink,
-                                           MLXSW_SP_DPIPE_TABLE_NAME_ADJ,
-                                           &mlxsw_sp_dpipe_table_adj_ops,
-                                           mlxsw_sp, false);
+       err = devlink_dpipe_table_register(devlink,
+                                          MLXSW_SP_DPIPE_TABLE_NAME_ADJ,
+                                          &mlxsw_sp_dpipe_table_adj_ops,
+                                          mlxsw_sp, false);
+       if (err)
+               return err;
+
+       err = devlink_dpipe_table_resource_set(devlink,
+                                              MLXSW_SP_DPIPE_TABLE_NAME_ADJ,
+                                              MLXSW_SP_RESOURCE_KVD_LINEAR);
+       if (err)
+               goto err_resource_set;
+
+       return 0;
+
+err_resource_set:
+       devlink_dpipe_table_unregister(devlink,
+                                      MLXSW_SP_DPIPE_TABLE_NAME_ADJ);
+       return err;
 }
 
 static void mlxsw_sp_dpipe_adj_table_fini(struct mlxsw_sp *mlxsw_sp)
-- 
2.9.5

Reply via email to