mlxsw: Move "used_kvd_sizes" check to mlxsw_pci_config_profile

The check should be done directly in mlxsw_pci_config_profile, as for
other profile items. Also, be consistent in naming with the rest and
rename to "used_kvd_sizes".

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>

3 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index 0d6452699364..ff9daa09341d 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -235,8 +235,7 @@ struct mlxsw_config_profile {
                 used_max_pkey:1,
                 used_ar_sec:1,
                 used_adaptive_routing_group_cap:1,
-                used_kvd_split_data:1; /* indicate for the kvd's values */
-
+                used_kvd_sizes:1;
         u8      max_vepa_channels;
         u16     max_mid;
         u16     max_pgt;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index e30c6ce3dcb4..5ab068aec033 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -1164,7 +1164,7 @@ static int mlxsw_pci_config_profile(struct mlxsw_pci *mlxsw_pci, char *mbox,
                 mlxsw_cmd_mbox_config_profile_adaptive_routing_group_cap_set(
                         mbox, profile->adaptive_routing_group_cap);
         }
-        if (MLXSW_RES_VALID(res, KVD_SIZE)) {
+        if (profile->used_kvd_sizes && MLXSW_RES_VALID(res, KVD_SIZE)) {
                 err = mlxsw_pci_profile_get_kvd_sizes(mlxsw_pci, profile, res);
                 if (err)
                         return err;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index d503cdbeae29..12062aab13c5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3793,7 +3793,7 @@ static const struct mlxsw_config_profile mlxsw_sp_config_profile = {
         .max_ib_mc                      = 0,
         .used_max_pkey                  = 1,
         .max_pkey                       = 0,
-        .used_kvd_split_data            = 1,
+        .used_kvd_sizes                 = 1,
         .kvd_hash_single_parts          = 59,
         .kvd_hash_double_parts          = 41,
         .kvd_linear_size                = MLXSW_SP_KVD_LINEAR_SIZE,
@@ -3934,8 +3934,7 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core *mlxsw_core,
         int err;
 
         if (!MLXSW_CORE_RES_VALID(mlxsw_core, KVD_SINGLE_MIN_SIZE) ||
-            !MLXSW_CORE_RES_VALID(mlxsw_core, KVD_DOUBLE_MIN_SIZE) ||
-            !profile->used_kvd_split_data)
+            !MLXSW_CORE_RES_VALID(mlxsw_core, KVD_DOUBLE_MIN_SIZE))
                 return -EIO;
 
         /* The hash part is what left of the kvd without the