net/qede/base: revise tunnel APIs/structs

[dpdk.git] / drivers / net / mlx5 / mlx5.c

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index c258e43..b7eb9b5 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -84,6 +84,12 @@
 /* Device parameter to enable multi-packet send WQEs. */
 #define MLX5_TXQ_MPW_EN "txq_mpw_en"
 
+/* Device parameter to include 2 dsegs in the title WQEBB. */
+#define MLX5_TXQ_MPW_HDR_DSEG_EN "txq_mpw_hdr_dseg_en"
+
+/* Device parameter to limit the size of inlining packet. */
+#define MLX5_TXQ_MAX_INLINE_LEN "txq_max_inline_len"
+
 /* Device parameter to enable hardware TSO offload. */
 #define MLX5_TSO "tso"
 
@@ -227,6 +233,8 @@ static const struct eth_dev_ops mlx5_dev_ops = {
        .filter_ctrl = mlx5_dev_filter_ctrl,
        .rx_descriptor_status = mlx5_rx_descriptor_status,
        .tx_descriptor_status = mlx5_tx_descriptor_status,
+       .rx_queue_intr_enable = mlx5_rx_intr_enable,
+       .rx_queue_intr_disable = mlx5_rx_intr_disable,
 };
 
 static struct {
@@ -294,7 +302,11 @@ mlx5_args_check(const char *key, const char *val, void *opaque)
        } else if (strcmp(MLX5_TXQS_MIN_INLINE, key) == 0) {
                priv->txqs_inline = tmp;
        } else if (strcmp(MLX5_TXQ_MPW_EN, key) == 0) {
-               priv->mps &= !!tmp; /* Enable MPW only if HW supports */
+               priv->mps = !!tmp ? priv->mps : MLX5_MPW_DISABLED;
+       } else if (strcmp(MLX5_TXQ_MPW_HDR_DSEG_EN, key) == 0) {
+               priv->mpw_hdr_dseg = !!tmp;
+       } else if (strcmp(MLX5_TXQ_MAX_INLINE_LEN, key) == 0) {
+               priv->inline_max_packet_sz = tmp;
        } else if (strcmp(MLX5_TSO, key) == 0) {
                priv->tso = !!tmp;
        } else {
@@ -323,6 +335,8 @@ mlx5_args(struct priv *priv, struct rte_devargs *devargs)
                MLX5_TXQ_INLINE,
                MLX5_TXQS_MIN_INLINE,
                MLX5_TXQ_MPW_EN,
+               MLX5_TXQ_MPW_HDR_DSEG_EN,
+               MLX5_TXQ_MAX_INLINE_LEN,
                MLX5_TSO,
                NULL,
        };
@@ -377,6 +391,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
        struct ibv_device_attr device_attr;
        unsigned int sriov;
        unsigned int mps;
+       unsigned int tunnel_en;
        int idx;
        int i;
 
@@ -395,10 +410,8 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
        list = ibv_get_device_list(&i);
        if (list == NULL) {
                assert(errno);
-               if (errno == ENOSYS) {
-                       WARN("cannot list devices, is ib_uverbs loaded?");
-                       return 0;
-               }
+               if (errno == ENOSYS)
+                       ERROR("cannot list devices, is ib_uverbs loaded?");
                return -errno;
        }
        assert(i >= 0);
@@ -431,21 +444,29 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                 * as all ConnectX-5 devices.
                 */
                switch (pci_dev->id.device_id) {
+               case PCI_DEVICE_ID_MELLANOX_CONNECTX4:
+                       tunnel_en = 1;
+                       mps = MLX5_MPW_DISABLED;
+                       break;
                case PCI_DEVICE_ID_MELLANOX_CONNECTX4LX:
+                       mps = MLX5_MPW;
+                       break;
                case PCI_DEVICE_ID_MELLANOX_CONNECTX5:
                case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
                case PCI_DEVICE_ID_MELLANOX_CONNECTX5EX:
                case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
-                       mps = 1;
+                       tunnel_en = 1;
+                       mps = MLX5_MPW_ENHANCED;
                        break;
                default:
-                       mps = 0;
+                       mps = MLX5_MPW_DISABLED;
                }
                INFO("PCI information matches, using device \"%s\""
-                    " (SR-IOV: %s, MPS: %s)",
+                    " (SR-IOV: %s, %sMPS: %s)",
                     list[i]->name,
                     sriov ? "true" : "false",
-                    mps ? "true" : "false");
+                    mps == MLX5_MPW_ENHANCED ? "Enhanced " : "",
+                    mps != MLX5_MPW_DISABLED ? "true" : "false");
                attr_ctx = ibv_open_device(list[i]);
                err = errno;
                break;
@@ -454,11 +475,11 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                ibv_free_device_list(list);
                switch (err) {
                case 0:
-                       WARN("cannot access device, is mlx5_ib loaded?");
-                       return 0;
+                       ERROR("cannot access device, is mlx5_ib loaded?");
+                       return -ENODEV;
                case EINVAL:
-                       WARN("cannot use device, are drivers up to date?");
-                       return 0;
+                       ERROR("cannot use device, are drivers up to date?");
+                       return -EINVAL;
                }
                assert(err > 0);
                return -err;
@@ -540,7 +561,15 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                priv->pd = pd;
                priv->mtu = ETHER_MTU;
                priv->mps = mps; /* Enable MPW by default if supported. */
+               /* Set default values for Enhanced MPW, a.k.a MPWv2. */
+               if (mps == MLX5_MPW_ENHANCED) {
+                       priv->mpw_hdr_dseg = 0;
+                       priv->txqs_inline = MLX5_EMPW_MIN_TXQS;
+                       priv->inline_max_packet_sz = MLX5_EMPW_MAX_INLINE_LEN;
+                       priv->txq_inline = MLX5_WQE_SIZE_MAX - MLX5_WQE_SIZE;
+               }
                priv->cqe_comp = 1; /* Enable compression by default. */
+               priv->tunnel_en = tunnel_en;
                err = mlx5_args(priv, pci_dev->device.devargs);
                if (err) {
                        ERROR("failed to process device arguments: %s",
@@ -606,6 +635,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                              "with TSO. MPS disabled");
                        priv->mps = 0;
                }
+               INFO("%sMPS is %s",
+                    priv->mps == MLX5_MPW_ENHANCED ? "Enhanced " : "",
+                    priv->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
                /* Allocate and register default RSS hash keys. */
                priv->rss_conf = rte_calloc(__func__, hash_rxq_init_n,
                                            sizeof((*priv->rss_conf)[0]), 0);