raw/ifpga: set monitor thread name

[dpdk.git] / drivers / raw / ifpga / ifpga_rawdev.c

diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 0385514..f2551be 100644 (file)
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -230,8 +230,9 @@ static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev,
        memset(link, 0, sizeof(link));
        memset(link1, 0, sizeof(link1));
        ret = readlink(path, link, (sizeof(link)-1));
-       if (ret == -1)
+       if ((ret < 0) || ((unsigned int)ret > (sizeof(link)-1)))
                return -1;
+       link[ret] = 0;   /* terminate string with null character */
        strlcpy(link1, link, sizeof(link1));
        memset(ifpga_dev->parent_bdf, 0, 16);
        point = strlen(link);
@@ -525,10 +526,10 @@ ifpga_monitor_start_func(void)
        int ret;
 
        if (ifpga_monitor_start == 0) {
-               ret = pthread_create(&ifpga_monitor_start_thread,
-                       NULL,
-                       ifpga_rawdev_gsd_handle, NULL);
-               if (ret) {
+               ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread,
+                                            "ifpga-monitor", NULL,
+                                            ifpga_rawdev_gsd_handle, NULL);
+               if (ret != 0) {
                        IFPGA_RAWDEV_PMD_ERR(
                                "Fail to create ifpga nonitor thread");
                        return -1;
@@ -785,7 +786,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
        int file_fd;
        int ret = 0;
        ssize_t buffer_size;
-       void *buffer;
+       void *buffer, *buf_to_free;
        u64 pr_error;
 
        if (!file_name)
@@ -817,6 +818,7 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
                ret = -ENOMEM;
                goto close_fd;
        }
+       buf_to_free = buffer;
 
        /*read the raw data*/
        if (buffer_size != read(file_fd, (void *)buffer, buffer_size)) {
@@ -834,8 +836,8 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
        }
 
 free_buffer:
-       if (buffer)
-               rte_free(buffer);
+       if (buf_to_free)
+               rte_free(buf_to_free);
 close_fd:
        close(file_fd);
        file_fd = 0;
@@ -1609,7 +1611,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = {
 RTE_PMD_REGISTER_PCI(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
 RTE_PMD_REGISTER_KMOD_DEP(ifpga_rawdev_pci_driver, "* igb_uio | uio_pci_generic | vfio-pci");
-RTE_LOG_REGISTER(ifpga_rawdev_logtype, driver.raw.init, NOTICE);
+RTE_LOG_REGISTER(ifpga_rawdev_logtype, pmd.raw.ifpga, NOTICE);
 
 static const char * const valid_args[] = {
 #define IFPGA_ARG_NAME         "ifpga"
@@ -1735,3 +1737,33 @@ RTE_PMD_REGISTER_PARAM_STRING(ifpga_rawdev_cfg,
        "ifpga=<string> "
        "port=<int> "
        "afu_bts=<path>");
+
+struct rte_pci_bus *ifpga_get_pci_bus(void)
+{
+       return rte_ifpga_rawdev_pmd.bus;
+}
+
+int ifpga_rawdev_partial_reconfigure(struct rte_rawdev *dev, int port,
+       const char *file)
+{
+       if (!dev) {
+               IFPGA_RAWDEV_PMD_ERR("Input parameter is invalid");
+               return -EINVAL;
+       }
+
+       return rte_fpga_do_pr(dev, port, file);
+}
+
+void ifpga_rawdev_cleanup(void)
+{
+       struct ifpga_rawdev *dev;
+       unsigned int i;
+
+       for (i = 0; i < IFPGA_RAWDEV_NUM; i++) {
+               dev = &ifpga_rawdevices[i];
+               if (dev->rawdev) {
+                       rte_rawdev_pmd_release(dev->rawdev);
+                       dev->rawdev = NULL;
+               }
+       }
+}