regex/mlx5: support dequeue

[dpdk.git] / drivers / regex / mlx5 / mlx5_regex.c

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index ce2216b..4cfd9d0 100644 (file)
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -17,11 +17,15 @@
 
 #include "mlx5_regex.h"
 #include "mlx5_regex_utils.h"
+#include "mlx5_rxp_csrs.h"
 
 int mlx5_regex_logtype;
 
 const struct rte_regexdev_ops mlx5_regexdev_ops = {
        .dev_info_get = mlx5_regex_info_get,
+       .dev_configure = mlx5_regex_configure,
+       .dev_db_import = mlx5_regex_rules_db_import,
+       .dev_qp_setup = mlx5_regex_qp_setup,
 };
 
 static struct ibv_device *
@@ -51,6 +55,28 @@ mlx5_regex_get_ib_device_match(struct rte_pci_addr *addr)
        mlx5_glue->free_device_list(ibv_list);
        return ibv_match;
 }
+static int
+mlx5_regex_engines_status(struct ibv_context *ctx, int num_engines)
+{
+       uint32_t fpga_ident = 0;
+       int err;
+       int i;
+
+       for (i = 0; i < num_engines; i++) {
+               err = mlx5_devx_regex_register_read(ctx, i,
+                                                   MLX5_RXP_CSR_IDENTIFIER,
+                                                   &fpga_ident);
+               fpga_ident = (fpga_ident & (0x0000FFFF));
+               if (err || fpga_ident != MLX5_RXP_IDENTIFIER) {
+                       DRV_LOG(ERR, "Failed setup RXP %d err %d database "
+                               "memory 0x%x", i, err, fpga_ident);
+                       if (!err)
+                               err = EINVAL;
+                       return err;
+               }
+       }
+       return 0;
+}
 
 static void
 mlx5_regex_get_name(char *name, struct rte_pci_device *pci_dev __rte_unused)
@@ -97,6 +123,11 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                rte_errno = ENOTSUP;
                goto error;
        }
+       if (mlx5_regex_engines_status(ctx, 2)) {
+               DRV_LOG(ERR, "RegEx engine error.");
+               rte_errno = ENOMEM;
+               goto error;
+       }
        priv = rte_zmalloc("mlx5 regex device private", sizeof(*priv),
                           RTE_CACHE_LINE_SIZE);
        if (!priv) {
@@ -105,6 +136,9 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                goto error;
        }
        priv->ctx = ctx;
+       priv->nb_engines = 2; /* attr.regexp_num_of_engines */
+       /* Default RXP programming mode to Shared. */
+       priv->prog_mode = MLX5_RXP_SHARED_PROG_MODE;
        mlx5_regex_get_name(name, pci_dev);
        priv->regexdev = rte_regexdev_register(name);
        if (priv->regexdev == NULL) {
@@ -112,12 +146,39 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                rte_errno = rte_errno ? rte_errno : EINVAL;
                goto error;
        }
+       ret = mlx5_glue->devx_query_eqn(ctx, 0, &priv->eqn);
+       if (ret) {
+               DRV_LOG(ERR, "can't query event queue number.");
+               rte_errno = ENOMEM;
+               goto error;
+       }
+       priv->uar = mlx5_glue->devx_alloc_uar(ctx, 0);
+       if (!priv->uar) {
+               DRV_LOG(ERR, "can't allocate uar.");
+               rte_errno = ENOMEM;
+               goto error;
+       }
+       priv->pd = mlx5_glue->alloc_pd(ctx);
+       if (!priv->pd) {
+               DRV_LOG(ERR, "can't allocate pd.");
+               rte_errno = ENOMEM;
+               goto error;
+       }
        priv->regexdev->dev_ops = &mlx5_regexdev_ops;
+       priv->regexdev->enqueue = mlx5_regexdev_enqueue;
+       priv->regexdev->dequeue = mlx5_regexdev_dequeue;
        priv->regexdev->device = (struct rte_device *)pci_dev;
        priv->regexdev->data->dev_private = priv;
+       priv->regexdev->state = RTE_REGEXDEV_READY;
        return 0;
 
 error:
+       if (priv->pd)
+               mlx5_glue->dealloc_pd(priv->pd);
+       if (priv->uar)
+               mlx5_glue->devx_free_uar(priv->uar);
+       if (priv->regexdev)
+               rte_regexdev_unregister(priv->regexdev);
        if (ctx)
                mlx5_glue->close_device(ctx);
        if (priv)
@@ -138,6 +199,12 @@ mlx5_regex_pci_remove(struct rte_pci_device *pci_dev)
                return 0;
        priv = dev->data->dev_private;
        if (priv) {
+               if (priv->pd)
+                       mlx5_glue->dealloc_pd(priv->pd);
+               if (priv->uar)
+                       mlx5_glue->devx_free_uar(priv->uar);
+               if (priv->regexdev)
+                       rte_regexdev_unregister(priv->regexdev);
                if (priv->ctx)
                        mlx5_glue->close_device(priv->ctx);
                if (priv->regexdev)