[PATCH 21.11] Revert "net/mlx5: fix flex item availability"

[PATCH 21.11] Revert "net/mlx5: fix flex item availability"

[Kevin Traynor]

This reverts commit 48fe9efaf2fb974e3f805eb7c54440ec3818a4b6.

This patch seems to be causing a build failure [0] in the CI [1] with
meson on Windows.

Revert for now and it can be reapplied at a later time when it is fixed.

[0]
[531/617] Compiling C object
drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj.
FAILED: drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj
clang @drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj.rsp
../drivers/net/mlx5/mlx5_flow.c:9867:23: error: incomplete definition of
type 'struct rte_pci_device'
         switch (priv->pci_dev->id.device_id) {
                 ~~~~~~~~~~~~~^
..\drivers\net/mlx5/mlx5.h:154:9: note: forward declaration of 'struct
rte_pci_device'
         struct rte_pci_device *pci_dev; /**< Backend PCI device. */
                ^
1 error generated.

[1]
https://lab.dpdk.org/results/dashboard/tarballs/19198/#env-27

Cc: rasland@nvidia.com
Cc: getelson@nvidia.com
Cc: viacheslavo@nvidia.com
Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
 drivers/common/mlx5/linux/mlx5_common_os.h |  1 -
 drivers/net/mlx5/mlx5_flow.c               | 17 -----------------
 2 files changed, 18 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h
index a6190a34e6..edf356a30a 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -10,5 +10,4 @@
 
 #include <rte_pci.h>
-#include <rte_bus_pci.h>
 #include <rte_debug.h>
 #include <rte_atomic.h>
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index cf4646e187..e603e39447 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -9926,25 +9926,8 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev,
 {
 	static const char err_msg[] = "flex item creation unsupported";
-	struct mlx5_priv *priv = dev->data->dev_private;
 	struct rte_flow_attr attr = { .transfer = 0 };
 	const struct mlx5_flow_driver_ops *fops =
 			flow_get_drv_ops(flow_get_drv_type(dev, &attr));
 
-	if (!priv->pci_dev) {
-		rte_flow_error_set(error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-				   "create flex item on PF only");
-		return NULL;
-	}
-	switch (priv->pci_dev->id.device_id) {
-	case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
-	case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
-		break;
-	default:
-		rte_flow_error_set(error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-				   "flex item available on BlueField ports only");
-		return NULL;
-	}
 	if (!fops->item_create) {
 		DRV_LOG(ERR, "port %u %s.", dev->data->port_id, err_msg);
-- 
2.34.1

Re: [PATCH 21.11] Revert "net/mlx5: fix flex item availability"

[Kevin Traynor]

On 29/03/2022 16:41, Kevin Traynor wrote:
> This reverts commit 48fe9efaf2fb974e3f805eb7c54440ec3818a4b6.
> 
> This patch seems to be causing a build failure [0] in the CI [1] with
> meson on Windows.
> 
> Revert for now and it can be reapplied at a later time when it is fixed.
> 
> [0]
> [531/617] Compiling C object
> drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj.
> FAILED: drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj
> clang @drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj.rsp
> ../drivers/net/mlx5/mlx5_flow.c:9867:23: error: incomplete definition of
> type 'struct rte_pci_device'
>           switch (priv->pci_dev->id.device_id) {
>                   ~~~~~~~~~~~~~^
> ..\drivers\net/mlx5/mlx5.h:154:9: note: forward declaration of 'struct
> rte_pci_device'
>           struct rte_pci_device *pci_dev; /**< Backend PCI device. */
>                  ^
> 1 error generated.
> 
> [1]
> https://lab.dpdk.org/results/dashboard/tarballs/19198/#env-27
> 
> Cc: rasland@nvidia.com
> Cc: getelson@nvidia.com
> Cc: viacheslavo@nvidia.com
> Signed-off-by: Kevin Traynor <ktraynor@redhat.com>


Applied.