net/mlx5: probe host PF representor with sub-function

To simplify BlueField HPF representor(vf[-1]) probe, this patch allows
probe it with "sf" syntax: "sf[-1]".

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index a2cfa50..2d5bcab 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -710,11 +710,15 @@ mlx5_representor_match(struct mlx5_dev_spawn_data *spawn,
        struct mlx5_switch_info *switch_info = &spawn->info;
        unsigned int p, f;
        uint16_t id;
-       uint16_t repr_id = mlx5_representor_id_encode(switch_info);
+       uint16_t repr_id = mlx5_representor_id_encode(switch_info,
+                                                     eth_da->type);
 
        switch (eth_da->type) {
        case RTE_ETH_REPRESENTOR_SF:
-               if (switch_info->name_type != MLX5_PHYS_PORT_NAME_TYPE_PFSF) {
+               if (!(spawn->info.port_name == -1 &&
+                     switch_info->name_type ==
+                               MLX5_PHYS_PORT_NAME_TYPE_PFHPF) &&
+                   switch_info->name_type != MLX5_PHYS_PORT_NAME_TYPE_PFSF) {
                        rte_errno = EBUSY;
                        return false;
                }
@@ -742,7 +746,8 @@ mlx5_representor_match(struct mlx5_dev_spawn_data *spawn,
                if (spawn->pf_bond < 0) {
                        /* For non-LAG mode, allow and ignore pf. */
                        switch_info->pf_num = eth_da->ports[p];
-                       repr_id = mlx5_representor_id_encode(switch_info);
+                       repr_id = mlx5_representor_id_encode(switch_info,
+                                                            eth_da->type);
                }
                for (f = 0; f < eth_da->nb_representor_ports; ++f) {
                        id = MLX5_REPRESENTOR_ID
@@ -1107,7 +1112,8 @@ err_secondary:
        priv->vport_id = switch_info->representor ?
                         switch_info->port_name + 1 : -1;
 #endif
-       priv->representor_id = mlx5_representor_id_encode(switch_info);
+       priv->representor_id = mlx5_representor_id_encode(switch_info,
+                                                         eth_da->type);
        /*
         * Look for sibling devices in order to reuse their switch domain
         * if any, otherwise allocate one.

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 412b6cb..6faba4f 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1066,7 +1066,8 @@ int mlx5_representor_info_get(struct rte_eth_dev *dev,
                ((repr_id) & 0xfff)
 #define MLX5_REPRESENTOR_TYPE(repr_id) \
                (((repr_id) >> 12) & 3)
-uint16_t mlx5_representor_id_encode(const struct mlx5_switch_info *info);
+uint16_t mlx5_representor_id_encode(const struct mlx5_switch_info *info,
+                                   enum rte_eth_representor_type hpf_type);
 int mlx5_fw_version_get(struct rte_eth_dev *dev, char *fw_ver,
                        size_t fw_size);
 int mlx5_dev_infos_get(struct rte_eth_dev *dev,

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 4f97a69..564d713 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -363,12 +363,15 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
  *
  * @param info
  *   Port switch info.
+ * @param hpf_type
+ *   Use this type if port is HPF.
  *
  * @return
  *   Encoded representor ID.
  */
 uint16_t
-mlx5_representor_id_encode(const struct mlx5_switch_info *info)
+mlx5_representor_id_encode(const struct mlx5_switch_info *info,
+                          enum rte_eth_representor_type hpf_type)
 {
        enum rte_eth_representor_type type = RTE_ETH_REPRESENTOR_VF;
        uint16_t repr = info->port_name;
@@ -377,8 +380,10 @@ mlx5_representor_id_encode(const struct mlx5_switch_info *info)
                return UINT16_MAX;
        if (info->name_type == MLX5_PHYS_PORT_NAME_TYPE_PFSF)
                type = RTE_ETH_REPRESENTOR_SF;
-       if (info->name_type == MLX5_PHYS_PORT_NAME_TYPE_PFHPF)
+       if (info->name_type == MLX5_PHYS_PORT_NAME_TYPE_PFHPF) {
+               type = hpf_type;
                repr = UINT16_MAX;
+       }
        return MLX5_REPRESENTOR_ID(info->pf_num, type, repr);
 }
 
@@ -403,7 +408,7 @@ mlx5_representor_info_get(struct rte_eth_dev *dev,
                          struct rte_eth_representor_info *info)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       int n_type = 3; /* Number of representor types, VF, HPF and SF. */
+       int n_type = 4; /* Representor types, VF, HPF@VF, SF and HPF@SF. */
        int n_pf = 2; /* Number of PFs. */
        int i = 0, pf;
 
@@ -424,7 +429,7 @@ mlx5_representor_info_get(struct rte_eth_dev *dev,
                snprintf(info->ranges[i].name,
                         sizeof(info->ranges[i].name), "pf%dvf", pf);
                i++;
-               /* HPF range. */
+               /* HPF range of VF type. */
                info->ranges[i].type = RTE_ETH_REPRESENTOR_VF;
                info->ranges[i].controller = 0;
                info->ranges[i].pf = pf;
@@ -448,6 +453,18 @@ mlx5_representor_info_get(struct rte_eth_dev *dev,
                snprintf(info->ranges[i].name,
                         sizeof(info->ranges[i].name), "pf%dsf", pf);
                i++;
+               /* HPF range of SF type. */
+               info->ranges[i].type = RTE_ETH_REPRESENTOR_SF;
+               info->ranges[i].controller = 0;
+               info->ranges[i].pf = pf;
+               info->ranges[i].vf = UINT16_MAX;
+               info->ranges[i].id_base =
+                       MLX5_REPRESENTOR_ID(pf, info->ranges[i].type, -1);
+               info->ranges[i].id_end =
+                       MLX5_REPRESENTOR_ID(pf, info->ranges[i].type, -1);
+               snprintf(info->ranges[i].name,
+                        sizeof(info->ranges[i].name), "pf%dsf", pf);
+               i++;
        }
 out:
        return n_type * n_pf;