common/cnxk: support bandwidth profile configure

[dpdk.git] / drivers / vdpa / mlx5 / mlx5_vdpa_virtq.c

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
index 332753f..f530646 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
@@ -103,13 +103,8 @@ mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv)
        for (i = 0; i < priv->nr_virtqs; i++) {
                virtq = &priv->virtqs[i];
                mlx5_vdpa_virtq_unset(virtq);
-               if (virtq->counters) {
+               if (virtq->counters)
                        claim_zero(mlx5_devx_cmd_destroy(virtq->counters));
-                       virtq->counters = NULL;
-                       memset(&virtq->reset, 0, sizeof(virtq->reset));
-               }
-               memset(virtq->err_time, 0, sizeof(virtq->err_time));
-               virtq->n_retry = 0;
        }
        for (i = 0; i < priv->num_lag_ports; i++) {
                if (priv->tiss[i]) {
@@ -126,6 +121,7 @@ mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv)
                priv->virtq_db_addr = NULL;
        }
        priv->features = 0;
+       memset(priv->virtqs, 0, sizeof(*virtq) * priv->nr_virtqs);
        priv->nr_virtqs = 0;
 }
 
@@ -446,6 +442,13 @@ mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv)
                DRV_LOG(ERR, "Failed to configure negotiated features.");
                return -1;
        }
+       if ((priv->features & (1ULL << VIRTIO_NET_F_CSUM)) == 0 &&
+           ((priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO4)) > 0 ||
+            (priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO6)) > 0)) {
+               /* Packet may be corrupted if TSO is enabled without CSUM. */
+               DRV_LOG(INFO, "TSO is enabled without CSUM, force CSUM.");
+               priv->features |= (1ULL << VIRTIO_NET_F_CSUM);
+       }
        if (nr_vring > priv->caps.max_num_virtio_queues * 2) {
                DRV_LOG(ERR, "Do not support more than %d virtqs(%d).",
                        (int)priv->caps.max_num_virtio_queues * 2,
@@ -500,7 +503,7 @@ mlx5_vdpa_virtq_is_modified(struct mlx5_vdpa_priv *priv,
                return -1;
        if (vq.size != virtq->vq_size || vq.kickfd != virtq->intr_handle.fd)
                return 1;
-       if (virtq->eqp.cq.cq) {
+       if (virtq->eqp.cq.cq_obj.cq) {
                if (vq.callfd != virtq->eqp.cq.callfd)
                        return 1;
        } else if (vq.callfd != -1) {