eal: remove deprecated coherent IO memory barriers

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

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 99b32f6..9f68a5c 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -484,11 +484,11 @@ rxq_sync_cq(struct mlx5_rxq_data *rxq)
                cqe->op_own = MLX5_CQE_INVALIDATE;
        }
        /* Resync CQE and WQE (WQ in RESET state). */
-       rte_cio_wmb();
+       rte_io_wmb();
        *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci);
-       rte_cio_wmb();
+       rte_io_wmb();
        *rxq->rq_db = rte_cpu_to_be_32(0);
-       rte_cio_wmb();
+       rte_io_wmb();
 }
 
 /**
@@ -547,7 +547,7 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx)
        eth_rx_burst_t pkt_burst = dev->rx_pkt_burst;
        int ret;
 
-       if (dev->data->rx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, idx)) {
                DRV_LOG(ERR, "Hairpin queue can't be stopped");
                rte_errno = EINVAL;
                return -EINVAL;
@@ -606,12 +606,12 @@ mlx5_rx_queue_start_primary(struct rte_eth_dev *dev, uint16_t idx)
                rte_errno = errno;
                return ret;
        }
-       rte_cio_wmb();
+       rte_io_wmb();
        *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci);
-       rte_cio_wmb();
-       /* Reset RQ consumer before moving queue to READY state. */
+       rte_io_wmb();
+       /* Reset RQ consumer before moving queue ro READY state. */
        *rxq->rq_db = rte_cpu_to_be_32(0);
-       rte_cio_wmb();
+       rte_io_wmb();
        ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, true);
        if (ret) {
                DRV_LOG(ERR, "Cannot change Rx WQ state to READY:  %s",
@@ -644,7 +644,7 @@ mlx5_rx_queue_start(struct rte_eth_dev *dev, uint16_t idx)
 {
        int ret;
 
-       if (dev->data->rx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, idx)) {
                DRV_LOG(ERR, "Hairpin queue can't be started");
                rte_errno = EINVAL;
                return -EINVAL;
@@ -2005,6 +2005,78 @@ error:
        return 0;
 }
 
+/**
+ * Create a drop Rx Hash queue.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ *
+ * @return
+ *   The Verbs/DevX object initialized, NULL otherwise and rte_errno is set.
+ */
+struct mlx5_hrxq *
+mlx5_drop_action_create(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_hrxq *hrxq = NULL;
+       int ret;
+
+       if (priv->drop_queue.hrxq) {
+               rte_atomic32_inc(&priv->drop_queue.hrxq->refcnt);
+               return priv->drop_queue.hrxq;
+       }
+       hrxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq), 0, SOCKET_ID_ANY);
+       if (!hrxq) {
+               DRV_LOG(WARNING,
+                       "Port %u cannot allocate memory for drop queue.",
+                       dev->data->port_id);
+               rte_errno = ENOMEM;
+               goto error;
+       }
+       priv->drop_queue.hrxq = hrxq;
+       hrxq->ind_table = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq->ind_table),
+                                     0, SOCKET_ID_ANY);
+       if (!hrxq->ind_table) {
+               rte_errno = ENOMEM;
+               goto error;
+       }
+       ret = priv->obj_ops.drop_action_create(dev);
+       if (ret < 0)
+               goto error;
+       rte_atomic32_set(&hrxq->refcnt, 1);
+       return hrxq;
+error:
+       if (hrxq) {
+               if (hrxq->ind_table)
+                       mlx5_free(hrxq->ind_table);
+               priv->drop_queue.hrxq = NULL;
+               mlx5_free(hrxq);
+       }
+       return NULL;
+}
+
+/**
+ * Release a drop hash Rx queue.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ */
+void
+mlx5_drop_action_destroy(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_hrxq *hrxq = priv->drop_queue.hrxq;
+
+       if (rte_atomic32_dec_and_test(&hrxq->refcnt)) {
+               priv->obj_ops.drop_action_destroy(dev);
+               mlx5_free(priv->drop_queue.rxq);
+               mlx5_free(hrxq->ind_table);
+               mlx5_free(hrxq);
+               priv->drop_queue.rxq = NULL;
+               priv->drop_queue.hrxq = NULL;
+       }
+}
+
 /**
  * Verify the Rx Queue list is empty
  *