From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9671A0506 for ; Tue, 29 Mar 2022 17:42:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7C8D40141; Tue, 29 Mar 2022 17:42:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5882B40141 for ; Tue, 29 Mar 2022 17:42:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648568535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vfqBuZrNU51HUrSLWZj0KFSXtFlT9OAH0AhkalCJz4g=; b=OiRGcJEn3/ALgjfmhJdB4CoVgGcLKdP+G6q8tmopC/M14YWwJfaGUYppXNvPCEUYAB4Vjd F2ij6yrO+sWlshYNNLrGdbKpVTBV9GFvb0EpNUy0ePLfomWmv7HRza7OE3aJ7vlozrkmb+ C//9/iHjFiv6DpKvH888HKYe9Sj0068= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-Ydb1z6qXOIyWb7V0crrR2g-1; Tue, 29 Mar 2022 11:41:57 -0400 X-MC-Unique: Ydb1z6qXOIyWb7V0crrR2g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C54153800E9E; Tue, 29 Mar 2022 15:41:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECBE72166B3F; Tue, 29 Mar 2022 15:41:49 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: Kevin Traynor , rasland@nvidia.com, getelson@nvidia.com, viacheslavo@nvidia.com Subject: [PATCH 21.11] Revert "net/mlx5: fix flex item availability" Date: Tue, 29 Mar 2022 16:41:16 +0100 Message-Id: <20220329154116.151735-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- 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 -#include #include #include 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