raw/ioat: move xstats functions to common file

The xstats functions can be used by all ioat devices so move them from the
ioat_rawdev.c file to ioat_common.c, and add the function prototypes to the
internal header file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>

diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index b5cea2fda0b3ca9a3f37e1fa8be8d4e6d466526d..142e171bc9766bb2ddf4a13737bd3497360bdf2a 100644 (file)
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -5,9 +5,68 @@
 #include <rte_rawdev_pmd.h>
 #include <rte_memzone.h>
 #include <rte_common.h>
+#include <rte_string_fns.h>
 
 #include "ioat_private.h"
 
+static const char * const xstat_names[] = {
+               "failed_enqueues", "successful_enqueues",
+               "copies_started", "copies_completed"
+};
+
+int
+ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
+               uint64_t values[], unsigned int n)
+{
+       const struct rte_ioat_rawdev *ioat = dev->dev_private;
+       const uint64_t *stats = (const void *)&ioat->xstats;
+       unsigned int i;
+
+       for (i = 0; i < n; i++) {
+               if (ids[i] > sizeof(ioat->xstats)/sizeof(*stats))
+                       values[i] = 0;
+               else
+                       values[i] = stats[ids[i]];
+       }
+       return n;
+}
+
+int
+ioat_xstats_get_names(const struct rte_rawdev *dev,
+               struct rte_rawdev_xstats_name *names,
+               unsigned int size)
+{
+       unsigned int i;
+
+       RTE_SET_USED(dev);
+       if (size < RTE_DIM(xstat_names))
+               return RTE_DIM(xstat_names);
+
+       for (i = 0; i < RTE_DIM(xstat_names); i++)
+               strlcpy(names[i].name, xstat_names[i], sizeof(names[i]));
+
+       return RTE_DIM(xstat_names);
+}
+
+int
+ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
+{
+       struct rte_ioat_rawdev *ioat = dev->dev_private;
+       uint64_t *stats = (void *)&ioat->xstats;
+       unsigned int i;
+
+       if (!ids) {
+               memset(&ioat->xstats, 0, sizeof(ioat->xstats));
+               return 0;
+       }
+
+       for (i = 0; i < nb_ids; i++)
+               if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+                       stats[ids[i]] = 0;
+
+       return 0;
+}
+
 int
 idxd_rawdev_close(struct rte_rawdev *dev __rte_unused)
 {

diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index 0f80d60bf610e7612ba19a5d75a64eb5cac4b676..ab9a3e6cceddb7dd1b87ffb0f4a4fc04d23c4d41 100644 (file)
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -53,6 +53,16 @@ struct idxd_rawdev {
        } u;
 };
 
+int ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
+               uint64_t values[], unsigned int n);
+
+int ioat_xstats_get_names(const struct rte_rawdev *dev,
+               struct rte_rawdev_xstats_name *names,
+               unsigned int size);
+
+int ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids,
+               uint32_t nb_ids);
+
 extern int idxd_rawdev_create(const char *name, struct rte_device *dev,
                       const struct idxd_rawdev *idxd,
                       const struct rte_rawdev_ops *ops);

diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 4ea913fff1c5e3d39c6d97a6c70ac7f70ea4c2d7..dd2543c809ac56e4d6bf08967ab3596411920a29 100644 (file)
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -122,64 +122,6 @@ ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
        return 0;
 }
 
-static const char * const xstat_names[] = {
-               "failed_enqueues", "successful_enqueues",
-               "copies_started", "copies_completed"
-};
-
-static int
-ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
-               uint64_t values[], unsigned int n)
-{
-       const struct rte_ioat_rawdev *ioat = dev->dev_private;
-       const uint64_t *stats = (const void *)&ioat->xstats;
-       unsigned int i;
-
-       for (i = 0; i < n; i++) {
-               if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
-                       values[i] = stats[ids[i]];
-               else
-                       values[i] = 0;
-       }
-       return n;
-}
-
-static int
-ioat_xstats_get_names(const struct rte_rawdev *dev,
-               struct rte_rawdev_xstats_name *names,
-               unsigned int size)
-{
-       unsigned int i;
-
-       RTE_SET_USED(dev);
-       if (size < RTE_DIM(xstat_names))
-               return RTE_DIM(xstat_names);
-
-       for (i = 0; i < RTE_DIM(xstat_names); i++)
-               strlcpy(names[i].name, xstat_names[i], sizeof(names[i]));
-
-       return RTE_DIM(xstat_names);
-}
-
-static int
-ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
-{
-       struct rte_ioat_rawdev *ioat = dev->dev_private;
-       uint64_t *stats = (void *)&ioat->xstats;
-       unsigned int i;
-
-       if (!ids) {
-               memset(&ioat->xstats, 0, sizeof(ioat->xstats));
-               return 0;
-       }
-
-       for (i = 0; i < nb_ids; i++)
-               if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
-                       stats[ids[i]] = 0;
-
-       return 0;
-}
-
 static int
 ioat_dev_close(struct rte_rawdev *dev __rte_unused)
 {