raw/ioat: create device on probe and destroy on release

Add the create/destroy driver functions so that we can actually allocate
a rawdev and destroy it when done. No rawdev API functions are actually
implemented at this point.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Jiayu Hu <jiayu.hu@intel.com>
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>

diff --git a/doc/guides/rawdevs/ioat_rawdev.rst b/doc/guides/rawdevs/ioat_rawdev.rst
index 1a4b0e0..4b7fe8a 100644 (file)
--- a/doc/guides/rawdevs/ioat_rawdev.rst
+++ b/doc/guides/rawdevs/ioat_rawdev.rst
@@ -72,3 +72,14 @@ them to a suitable DPDK-supported kernel driver. When querying the status
 of the devices, they will appear under the category of "Misc (rawdev)
 devices", i.e. the command ``dpdk-devbind.py --status-dev misc`` can be
 used to see the state of those devices alone.
+
+Device Probing and Initialization
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once bound to a suitable kernel device driver, the HW devices will be found
+as part of the PCI scan done at application initialization time. No vdev
+parameters need to be passed to create or initialize the device.
+
+Once probed successfully, the device will appear as a ``rawdev``, that is a
+"raw device type" inside DPDK, and can be accessed using APIs from the
+``rte_rawdev`` library.

diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 07f6d8d..86b5b2a 100644 (file)
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2019 Intel Corporation
  */
 
+#include <rte_cycles.h>
 #include <rte_bus_pci.h>
 #include <rte_rawdev_pmd.h>
 
@@ -36,15 +37,120 @@ static struct rte_pci_driver ioat_pmd_drv;
 static int
 ioat_rawdev_create(const char *name, struct rte_pci_device *dev)
 {
-       RTE_SET_USED(name);
-       RTE_SET_USED(dev);
+       static const struct rte_rawdev_ops ioat_rawdev_ops = {
+       };
+
+       struct rte_rawdev *rawdev = NULL;
+       struct rte_ioat_rawdev *ioat = NULL;
+       const struct rte_memzone *mz = NULL;
+       char mz_name[RTE_MEMZONE_NAMESIZE];
+       int ret = 0;
+       int retry = 0;
+
+       if (!name) {
+               IOAT_PMD_ERR("Invalid name of the device!");
+               ret = -EINVAL;
+               goto cleanup;
+       }
+
+       /* Allocate device structure */
+       rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct rte_ioat_rawdev),
+                                        dev->device.numa_node);
+       if (rawdev == NULL) {
+               IOAT_PMD_ERR("Unable to allocate raw device");
+               ret = -ENOMEM;
+               goto cleanup;
+       }
+
+       snprintf(mz_name, sizeof(mz_name), "rawdev%u_private", rawdev->dev_id);
+       mz = rte_memzone_reserve(mz_name, sizeof(struct rte_ioat_rawdev),
+                       dev->device.numa_node, RTE_MEMZONE_IOVA_CONTIG);
+       if (mz == NULL) {
+               IOAT_PMD_ERR("Unable to reserve memzone for private data\n");
+               ret = -ENOMEM;
+               goto cleanup;
+       }
+
+       rawdev->dev_private = mz->addr;
+       rawdev->dev_ops = &ioat_rawdev_ops;
+       rawdev->device = &dev->device;
+       rawdev->driver_name = dev->device.driver->name;
+
+       ioat = rawdev->dev_private;
+       ioat->rawdev = rawdev;
+       ioat->mz = mz;
+       ioat->regs = dev->mem_resource[0].addr;
+       ioat->ring_size = 0;
+       ioat->desc_ring = NULL;
+       ioat->status_addr = ioat->mz->iova +
+                       offsetof(struct rte_ioat_rawdev, status);
+
+       /* do device initialization - reset and set error behaviour */
+       if (ioat->regs->chancnt != 1)
+               IOAT_PMD_ERR("%s: Channel count == %d\n", __func__,
+                               ioat->regs->chancnt);
+
+       if (ioat->regs->chanctrl & 0x100) { /* locked by someone else */
+               IOAT_PMD_WARN("%s: Channel appears locked\n", __func__);
+               ioat->regs->chanctrl = 0;
+       }
+
+       ioat->regs->chancmd = RTE_IOAT_CHANCMD_SUSPEND;
+       rte_delay_ms(1);
+       ioat->regs->chancmd = RTE_IOAT_CHANCMD_RESET;
+       rte_delay_ms(1);
+       while (ioat->regs->chancmd & RTE_IOAT_CHANCMD_RESET) {
+               ioat->regs->chainaddr = 0;
+               rte_delay_ms(1);
+               if (++retry >= 200) {
+                       IOAT_PMD_ERR("%s: cannot reset device. CHANCMD=0x%"PRIx8", CHANSTS=0x%"PRIx64", CHANERR=0x%"PRIx32"\n",
+                                       __func__,
+                                       ioat->regs->chancmd,
+                                       ioat->regs->chansts,
+                                       ioat->regs->chanerr);
+                       ret = -EIO;
+               }
+       }
+       ioat->regs->chanctrl = RTE_IOAT_CHANCTRL_ANY_ERR_ABORT_EN |
+                       RTE_IOAT_CHANCTRL_ERR_COMPLETION_EN;
+
        return 0;
+
+cleanup:
+       if (rawdev)
+               rte_rawdev_pmd_release(rawdev);
+
+       return ret;
 }
 
 static int
 ioat_rawdev_destroy(const char *name)
 {
-       RTE_SET_USED(name);
+       int ret;
+       struct rte_rawdev *rdev;
+
+       if (!name) {
+               IOAT_PMD_ERR("Invalid device name");
+               return -EINVAL;
+       }
+
+       rdev = rte_rawdev_pmd_get_named_dev(name);
+       if (!rdev) {
+               IOAT_PMD_ERR("Invalid device name (%s)", name);
+               return -EINVAL;
+       }
+
+       if (rdev->dev_private != NULL) {
+               struct rte_ioat_rawdev *ioat = rdev->dev_private;
+               rdev->dev_private = NULL;
+               rte_memzone_free(ioat->mz);
+       }
+
+       /* rte_rawdev_close is called by pmd_release */
+       ret = rte_rawdev_pmd_release(rdev);
+       if (ret)
+               IOAT_PMD_DEBUG("Device cleanup failed");
+
        return 0;
 }
 

diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h b/drivers/raw/ioat/rte_ioat_rawdev.h
index e774064..f83d26e 100644 (file)
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -14,6 +14,10 @@
  * @b EXPERIMENTAL: these structures and APIs may change without prior notice
  */
 
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_ioat_spec.h>
+
 /** Name of the device driver */
 #define IOAT_PMD_RAWDEV_NAME rawdev_ioat
 /** String reported as the device driver name by rte_rawdev_info_get() */
@@ -21,4 +25,24 @@
 /** Name used to adjust the log level for this driver */
 #define IOAT_PMD_LOG_NAME "rawdev.ioat"
 
+/**
+ * @internal
+ * Structure representing a device instance
+ */
+struct rte_ioat_rawdev {
+       struct rte_rawdev *rawdev;
+       const struct rte_memzone *mz;
+       const struct rte_memzone *desc_mz;
+
+       volatile struct rte_ioat_registers *regs;
+       phys_addr_t status_addr;
+       phys_addr_t ring_addr;
+
+       unsigned short ring_size;
+       struct rte_ioat_generic_hw_desc *desc_ring;
+
+       /* to report completions, the device will write status back here */
+       volatile uint64_t status __rte_cache_aligned;
+};
+
 #endif