net/i40e: fix port start during config restore

[dpdk.git] / drivers / crypto / caam_jr / caam_jr_uio.c

diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index d94101c..b1bb44c 100644 (file)
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -23,11 +23,6 @@
 #include <caam_jr_pvt.h>
 #include <caam_jr_log.h>
 
-/* RTA header files */
-#include <hw/desc/common.h>
-#include <hw/desc/algo.h>
-#include <hw/desc/ipsec.h>
-
 /* Prefix path to sysfs directory where UIO device attributes are exported.
  * Path for UIO device X is /sys/class/uio/uioX
  */
@@ -284,11 +279,11 @@ uio_map_registers(int uio_device_fd, int uio_device_id,
        memset(uio_map_size_str, 0, sizeof(uio_map_size_str));
 
        /* Compose string: /sys/class/uio/uioX */
-       sprintf(uio_sys_root, "%s/%s%d", SEC_UIO_DEVICE_SYS_ATTR_PATH,
-               "uio", uio_device_id);
+       snprintf(uio_sys_root, sizeof(uio_sys_root), "%s/%s%d",
+                       SEC_UIO_DEVICE_SYS_ATTR_PATH, "uio", uio_device_id);
        /* Compose string: maps/mapY */
-       sprintf(uio_sys_map_subdir, "%s%d", SEC_UIO_DEVICE_SYS_MAP_ATTR,
-               uio_map_id);
+       snprintf(uio_sys_map_subdir, sizeof(uio_sys_map_subdir), "%s%d",
+                       SEC_UIO_DEVICE_SYS_MAP_ATTR, uio_map_id);
 
        /* Read first (and only) line from file
         * /sys/class/uio/uioX/maps/mapY/size
@@ -362,8 +357,8 @@ free_job_ring(uint32_t uio_fd)
                        job_ring->register_base_addr,
                        (unsigned long)job_ring->map_size, strerror(errno));
        } else
-               CAAM_JR_DEBUG("  JR UIO memory unmapped at %p",
-                               job_ring->register_base_addr);
+               CAAM_JR_DEBUG("JR UIO memory is unmapped");
+
        job_ring->register_base_addr = NULL;
 }
 
@@ -389,9 +384,8 @@ uio_job_ring *config_job_ring(void)
 
        /* Find UIO device created by SEC kernel driver for this job ring. */
        memset(uio_device_file_name, 0, sizeof(uio_device_file_name));
-
-       sprintf(uio_device_file_name, "%s%d", SEC_UIO_DEVICE_FILE_NAME,
-               job_ring->uio_minor_number);
+       snprintf(uio_device_file_name, sizeof(uio_device_file_name), "%s%d",
+                       SEC_UIO_DEVICE_FILE_NAME, job_ring->uio_minor_number);
 
        /* Open device file */
        job_ring->uio_fd = open(uio_device_file_name, O_RDWR);
@@ -446,7 +440,11 @@ sec_configure(void)
                        ret = file_read_first_line(SEC_UIO_DEVICE_SYS_ATTR_PATH,
                                        dir->d_name, "name", uio_name);
                        CAAM_JR_INFO("sec device uio name: %s", uio_name);
-                       SEC_ASSERT(ret == 0, -1, "file_read_first_line failed");
+                       if (ret != 0) {
+                               CAAM_JR_ERR("file_read_first_line failed\n");
+                               closedir(d);
+                               return -1;
+                       }
 
                        if (file_name_match_extract(uio_name,
                                                SEC_UIO_DEVICE_NAME,