mlx5: Rename the vport number enums for host PF and VF

Rename the vport number enums MLX5_VPORT_PF to MLX5_VPORT_HOST_PF and
MLX5_VPORT_FIRST_VF to MLX5_VPORT_FIRST_HOST_VF to indicate that these
vport indices represent the host PF and its VFs. This prepares the code
for upcoming support of an additional PF type.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260428053851.220089-2-tariqt@nvidia.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c
index 5b4482dd627436c6d4aaba722a85e2856572d003..5a79e834ddea0c15b0b634a13de66acc1adff0cc 100644 (file)
--- a/drivers/infiniband/hw/mlx5/counters.c
+++ b/drivers/infiniband/hw/mlx5/counters.c
@@ -697,7 +697,7 @@ static void mlx5_ib_fill_counters(struct mlx5_ib_dev *dev,
                                  u32 port_num)
 {
        bool is_vport = is_mdev_switchdev_mode(dev->mdev) &&
-                       port_num != MLX5_VPORT_PF;
+                       port_num != MLX5_VPORT_HOST_PF;
        const struct mlx5_ib_counter *names;
        int j = 0, i, size;
 
@@ -802,7 +802,7 @@ static int __mlx5_ib_alloc_counters(struct mlx5_ib_dev *dev,
                                    struct mlx5_ib_counters *cnts, u32 port_num)
 {
        bool is_vport = is_mdev_switchdev_mode(dev->mdev) &&
-                       port_num != MLX5_VPORT_PF;
+                       port_num != MLX5_VPORT_HOST_PF;
        u32 num_counters, num_op_counters = 0, size;
 
        size = is_vport ? ARRAY_SIZE(vport_basic_q_cnts) :

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
index e1d11326af1bbdab8d5d63631ad86edc2135db76..8a79764345e7e3521a79dd61c2d4bd61154a8175 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
@@ -13,7 +13,8 @@ mlx5_esw_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_item_i
 
 static bool mlx5_esw_devlink_port_supported(struct mlx5_eswitch *esw, u16 vport_num)
 {
-       return (mlx5_core_is_ecpf(esw->dev) && vport_num == MLX5_VPORT_PF) ||
+       return (mlx5_core_is_ecpf(esw->dev) &&
+               vport_num == MLX5_VPORT_HOST_PF) ||
               mlx5_eswitch_is_vf_vport(esw, vport_num) ||
               mlx5_core_is_ec_vf_vport(esw->dev, vport_num);
 }
@@ -35,7 +36,7 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_set(struct mlx5_eswitch *
        if (external)
                controller_num = dev->priv.eswitch->offloads.host_number + 1;
 
-       if (vport_num == MLX5_VPORT_PF) {
+       if (vport_num == MLX5_VPORT_HOST_PF) {
                memcpy(dl_port->attrs.switch_id.id, ppid.id, ppid.id_len);
                dl_port->attrs.switch_id.id_len = ppid.id_len;
                devlink_port_attrs_pci_pf_set(dl_port, controller_num, pfnum, external);
@@ -216,7 +217,7 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, struct mlx
        if (err)
                goto rate_err;
 
-       if (vport_num == MLX5_VPORT_PF) {
+       if (vport_num == MLX5_VPORT_HOST_PF) {
                err = mlx5_esw_devlink_port_res_register(esw,
                                                         &dl_port->dl_port);
                if (err)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
index da10e04777cf74e5d059a49a348e380d807d32b3..8b12c3ae0cf791b1330a14dbdfba70595314ff73 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
@@ -209,7 +209,7 @@ static int esw_ipsec_vf_offload_set_bytype(struct mlx5_eswitch *esw, struct mlx5
        struct mlx5_core_dev *dev = esw->dev;
        int err;
 
-       if (vport->vport == MLX5_VPORT_PF)
+       if (vport->vport == MLX5_VPORT_HOST_PF)
                return -EOPNOTSUPP;
 
        if (type == MLX5_ESW_VPORT_IPSEC_CRYPTO_OFFLOAD) {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 123c96716a544de0ea7ac1716043409abb228da7..80ba360347e7c2fa53931d444865f894826eed7e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -926,7 +926,7 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
        /* Sync with current vport context */
        vport->enabled_events = enabled_events;
        vport->enabled = true;
-       if (vport->vport != MLX5_VPORT_PF &&
+       if (vport->vport != MLX5_VPORT_HOST_PF &&
            (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled))
                esw->enabled_ipsec_vf_count++;
 
@@ -979,7 +979,7 @@ void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
            MLX5_CAP_GEN(esw->dev, vhca_resource_manager))
                mlx5_esw_vport_vhca_id_unmap(esw, vport);
 
-       if (vport->vport != MLX5_VPORT_PF &&
+       if (vport->vport != MLX5_VPORT_HOST_PF &&
            (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled))
                esw->enabled_ipsec_vf_count--;
 
@@ -1314,7 +1314,7 @@ int mlx5_esw_host_pf_enable_hca(struct mlx5_core_dev *dev)
        if (!mlx5_core_is_ecpf(dev) || !mlx5_esw_allowed(esw))
                return 0;
 
-       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);
+       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_HOST_PF);
        if (IS_ERR(vport))
                return PTR_ERR(vport);
 
@@ -1340,7 +1340,7 @@ int mlx5_esw_host_pf_disable_hca(struct mlx5_core_dev *dev)
        if (!mlx5_core_is_ecpf(dev) || !mlx5_esw_allowed(esw))
                return 0;
 
-       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);
+       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_HOST_PF);
        if (IS_ERR(vport))
                return PTR_ERR(vport);
 
@@ -1368,7 +1368,7 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,
 
        /* Enable PF vport */
        if (pf_needed && mlx5_esw_host_functions_enabled(esw->dev)) {
-               ret = mlx5_eswitch_load_pf_vf_vport(esw, MLX5_VPORT_PF,
+               ret = mlx5_eswitch_load_pf_vf_vport(esw, MLX5_VPORT_HOST_PF,
                                                    enabled_events);
                if (ret)
                        return ret;
@@ -1423,7 +1423,7 @@ ecpf_err:
                mlx5_esw_host_pf_disable_hca(esw->dev);
 pf_hca_err:
        if (pf_needed && mlx5_esw_host_functions_enabled(esw->dev))
-               mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_PF);
+               mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_HOST_PF);
        return ret;
 }
 
@@ -1450,7 +1450,7 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw)
        if ((mlx5_core_is_ecpf_esw_manager(esw->dev) ||
             esw->mode == MLX5_ESWITCH_LEGACY) &&
            mlx5_esw_host_functions_enabled(esw->dev))
-               mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_PF);
+               mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_HOST_PF);
 }
 
 static void mlx5_eswitch_get_devlink_param(struct mlx5_eswitch *esw)
@@ -1822,7 +1822,7 @@ static int mlx5_query_hca_cap_host_pf(struct mlx5_core_dev *dev, void *out)
 
        MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);
        MLX5_SET(query_hca_cap_in, in, op_mod, opmod);
-       MLX5_SET(query_hca_cap_in, in, function_id, MLX5_VPORT_PF);
+       MLX5_SET(query_hca_cap_in, in, function_id, MLX5_VPORT_HOST_PF);
        MLX5_SET(query_hca_cap_in, in, other_function, true);
        return mlx5_cmd_exec_inout(dev, query_hca_cap, in, out);
 }
@@ -1914,10 +1914,10 @@ static int mlx5_esw_vports_init(struct mlx5_eswitch *esw)
        xa_init(&esw->vports);
 
        if (mlx5_esw_host_functions_enabled(dev)) {
-               err = mlx5_esw_vport_alloc(esw, idx, MLX5_VPORT_PF);
+               err = mlx5_esw_vport_alloc(esw, idx, MLX5_VPORT_HOST_PF);
                if (err)
                        goto err;
-               if (esw->first_host_vport == MLX5_VPORT_PF)
+               if (esw->first_host_vport == MLX5_VPORT_HOST_PF)
                        xa_set_mark(&esw->vports, idx, MLX5_ESW_VPT_HOST_FN);
                idx++;
                for (i = 0; i < mlx5_core_max_vfs(dev); i++) {
@@ -2195,7 +2195,7 @@ bool mlx5_eswitch_is_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)
 
 bool mlx5_eswitch_is_pf_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)
 {
-       return vport_num == MLX5_VPORT_PF ||
+       return vport_num == MLX5_VPORT_HOST_PF ||
                mlx5_eswitch_is_vf_vport(esw, vport_num);
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 5128f5020daec9f1e89d863b6716c3d4f41d6caa..f6a23930f30805dcfe43a2f17bb683bd58d5ab91 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -684,7 +684,7 @@ static inline bool mlx5_esw_is_owner(struct mlx5_eswitch *esw, u16 vport_num,
 static inline u16 mlx5_eswitch_first_host_vport_num(struct mlx5_core_dev *dev)
 {
        return mlx5_core_is_ecpf_esw_manager(dev) ?
-               MLX5_VPORT_PF : MLX5_VPORT_FIRST_VF;
+               MLX5_VPORT_HOST_PF : MLX5_VPORT_FIRST_HOST_VF;
 }
 
 static inline bool mlx5_eswitch_is_funcs_handler(const struct mlx5_core_dev *dev)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index a078d06f456739d66a88523f547df38e0fbd5019..c32335df6b641914ddb24de01f1293f78921dc2a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1216,9 +1216,10 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
 
        if (mlx5_core_is_ecpf_esw_manager(peer_dev) &&
            mlx5_esw_host_functions_enabled(peer_dev)) {
-               peer_vport = mlx5_eswitch_get_vport(peer_esw, MLX5_VPORT_PF);
+               peer_vport = mlx5_eswitch_get_vport(peer_esw,
+                                                   MLX5_VPORT_HOST_PF);
                esw_set_peer_miss_rule_source_port(esw, peer_esw, spec,
-                                                  MLX5_VPORT_PF);
+                                                  MLX5_VPORT_HOST_PF);
 
                flow = mlx5_add_flow_rules(mlx5_eswitch_get_slow_fdb(esw),
                                           spec, &flow_act, &dest, 1);
@@ -1300,7 +1301,8 @@ add_ecpf_flow_err:
 
        if (mlx5_core_is_ecpf_esw_manager(peer_dev) &&
            mlx5_esw_host_functions_enabled(peer_dev)) {
-               peer_vport = mlx5_eswitch_get_vport(peer_esw, MLX5_VPORT_PF);
+               peer_vport = mlx5_eswitch_get_vport(peer_esw,
+                                                   MLX5_VPORT_HOST_PF);
                mlx5_del_flow_rules(flows[peer_vport->index]);
        }
 add_pf_flow_err:
@@ -1342,7 +1344,8 @@ static void esw_del_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
 
        if (mlx5_core_is_ecpf_esw_manager(peer_dev) &&
            mlx5_esw_host_functions_enabled(peer_dev)) {
-               peer_vport = mlx5_eswitch_get_vport(peer_esw, MLX5_VPORT_PF);
+               peer_vport = mlx5_eswitch_get_vport(peer_esw,
+                                                   MLX5_VPORT_HOST_PF);
                mlx5_del_flow_rules(flows[peer_vport->index]);
        }
 
@@ -4435,7 +4438,7 @@ static bool
 mlx5_eswitch_vport_has_rep(const struct mlx5_eswitch *esw, u16 vport_num)
 {
        /* Currently, only ECPF based device has representor for host PF. */
-       if (vport_num == MLX5_VPORT_PF &&
+       if (vport_num == MLX5_VPORT_HOST_PF &&
            (!mlx5_core_is_ecpf_esw_manager(esw->dev) ||
             !mlx5_esw_host_functions_enabled(esw->dev)))
                return false;
@@ -4791,7 +4794,7 @@ int mlx5_devlink_pf_port_fn_state_get(struct devlink_port *port,
        const u32 *query_out;
        bool pf_disabled;
 
-       if (vport->vport != MLX5_VPORT_PF) {
+       if (vport->vport != MLX5_VPORT_HOST_PF) {
                NL_SET_ERR_MSG_MOD(extack, "State get is not supported for VF");
                return -EOPNOTSUPP;
        }
@@ -4820,7 +4823,7 @@ int mlx5_devlink_pf_port_fn_state_set(struct devlink_port *port,
        struct mlx5_vport *vport = mlx5_devlink_port_vport_get(port);
        struct mlx5_core_dev *dev;
 
-       if (vport->vport != MLX5_VPORT_PF) {
+       if (vport->vport != MLX5_VPORT_HOST_PF) {
                NL_SET_ERR_MSG_MOD(extack, "State set is not supported for VF");
                return -EOPNOTSUPP;
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c
index d8e382b9fa61e04bd5f73212a20c2e4f1907245b..6dc3b11b792699d7dc37f34bda8e716ed5d3d300 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c
@@ -50,7 +50,7 @@ static int hws_vport_add_gvmi(struct mlx5hws_context *ctx, u16 vport)
 static bool hws_vport_is_esw_mgr_vport(struct mlx5hws_context *ctx, u16 vport)
 {
        return ctx->caps->is_ecpf ? vport == MLX5_VPORT_ECPF :
-                                   vport == MLX5_VPORT_PF;
+                                   vport == MLX5_VPORT_HOST_PF;
 }
 
 int mlx5hws_vport_get_gvmi(struct mlx5hws_context *ctx, u16 vport, u16 *vport_gvmi)

diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h
index 67256e776566c6bf5b646aaa48f9d63153124631..3b29a3c6794da8bb557ed42f529d29b871d3e83b 100644 (file)
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@ -217,7 +217,7 @@ static inline bool is_mdev_switchdev_mode(struct mlx5_core_dev *dev)
 static inline u16 mlx5_eswitch_manager_vport(struct mlx5_core_dev *dev)
 {
        return mlx5_core_is_ecpf_esw_manager(dev) ?
-               MLX5_VPORT_ECPF : MLX5_VPORT_PF;
+               MLX5_VPORT_ECPF : MLX5_VPORT_HOST_PF;
 }
 
 #endif

diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h
index dfa2fe32217af0860826539a36b796a0f84f1e03..90641f67da468acf64402653bcab9fb900ee9785 100644 (file)
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
@@ -51,8 +51,8 @@ enum {
 
 /* Vport number for each function must keep unchanged */
 enum {
-       MLX5_VPORT_PF                   = 0x0,
-       MLX5_VPORT_FIRST_VF             = 0x1,
+       MLX5_VPORT_HOST_PF              = 0x0,
+       MLX5_VPORT_FIRST_HOST_VF        = 0x1,
        MLX5_VPORT_ECPF                 = 0xfffe,
        MLX5_VPORT_UPLINK               = 0xffff
 };