net/nfp: fix null pointer check

[dpdk.git] / drivers / net / nfp / nfp_nspu.c

diff --git a/drivers/net/nfp/nfp_nspu.c b/drivers/net/nfp/nfp_nspu.c
index 56fd063..0b415fc 100644 (file)
--- a/drivers/net/nfp/nfp_nspu.c
+++ b/drivers/net/nfp/nfp_nspu.c
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 
 #include <rte_log.h>
+#include <rte_byteorder.h>
 
 #include "nfp_nfpu.h"
 
@@ -45,9 +46,11 @@
 #define NSP_STATUS_MINOR(x)      (int)(((x) >> 32) & 0xfff)
 
 /* NSP commands */
-#define NSP_CMD_RESET          1
-#define NSP_CMD_FW_LOAD        6
-#define NSP_CMD_GET_SYMBOL     14
+#define NSP_CMD_RESET                   1
+#define NSP_CMD_FW_LOAD                 6
+#define NSP_CMD_READ_ETH_TABLE          7
+#define NSP_CMD_WRITE_ETH_TABLE         8
+#define NSP_CMD_GET_SYMBOL             14
 
 #define NSP_BUFFER_CFG_SIZE_MASK       (0xff)
 
@@ -338,7 +341,12 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                return -ENOENT;
        }
 
-       fstat(fw_f, &file_stat);
+       if (fstat(fw_f, &file_stat) < 0) {
+               RTE_LOG(INFO, PMD, "Firmware file %s/%s size is unknown",
+                       DEFAULT_FW_PATH, DEFAULT_FW_FILENAME);
+               close(fw_f);
+               return -ENOENT;
+       }
 
        fsize = file_stat.st_size;
        RTE_LOG(DEBUG, PMD, "Firmware file with size: %" PRIu64 "\n",
@@ -348,12 +356,14 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                RTE_LOG(INFO, PMD, "fw file too big: %" PRIu64
                                   " bytes (%" PRIu64 " max)",
                                  (uint64_t)fsize, (uint64_t)size);
+               close(fw_f);
                return -EINVAL;
        }
 
        fw_buf = malloc((size_t)size);
        if (!fw_buf) {
                RTE_LOG(INFO, PMD, "malloc failed for fw buffer");
+               close(fw_f);
                return -ENOMEM;
        }
        memset(fw_buf, 0, size);
@@ -364,12 +374,14 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                                   "Just %" PRIu64 " of %" PRIu64 " bytes read.",
                                   (uint64_t)bytes, (uint64_t)fsize);
                free(fw_buf);
+               close(fw_f);
                return -EIO;
        }
 
        ret = nspu_command(nspu_desc, NSP_CMD_FW_LOAD, 0, 1, fw_buf, 0, bytes);
 
        free(fw_buf);
+       close(fw_f);
 
        return ret;
 }
@@ -408,6 +420,9 @@ nfp_nspu_set_bar_from_symbl(nspu_desc_t *desc, const char *symbl,
        int ret = 0;
 
        sym_buf = malloc(desc->buf_size);
+       if (!sym_buf)
+               return -ENOMEM;
+
        strncpy(sym_buf, symbl, strlen(symbl));
        ret = nspu_command(desc, NSP_CMD_GET_SYMBOL, 1, 1, sym_buf,
                           NFP_SYM_DESC_LEN, strlen(symbl));
@@ -528,3 +543,97 @@ nfp_nsp_map_queues_bar(nspu_desc_t *desc, uint64_t *pcie_offset)
        /* This is the pcie offset to use by the host */
        *pcie_offset |= ((NFP_NET_PF_HW_QUEUES_EXP_BAR & 0x7) << (27 - 3));
 }
+
+int
+nfp_nsp_eth_config(nspu_desc_t *desc, int port, int up)
+{
+       union eth_table_entry *entries, *entry;
+       int modified;
+       int ret, idx;
+       int i;
+
+       idx = port;
+
+       RTE_LOG(INFO, PMD, "Hw ethernet port %d configure...\n", port);
+       rte_spinlock_lock(&desc->nsp_lock);
+       entries = malloc(NSP_ETH_TABLE_SIZE);
+       if (!entries) {
+               rte_spinlock_unlock(&desc->nsp_lock);
+               return -ENOMEM;
+       }
+
+       ret = nspu_command(desc, NSP_CMD_READ_ETH_TABLE, 1, 0, entries,
+                          NSP_ETH_TABLE_SIZE, 0);
+       if (ret) {
+               rte_spinlock_unlock(&desc->nsp_lock);
+               return ret;
+       }
+
+       entry = entries;
+
+       for (i = 0; i < NSP_ETH_MAX_COUNT; i++) {
+               /* ports in use do not appear sequentially in the table */
+               if (!(entry->port & NSP_ETH_PORT_LANES_MASK)) {
+                       /* entry not in use */
+                       entry++;
+                       continue;
+               }
+               if (idx == 0)
+                       break;
+               idx--;
+               entry++;
+       }
+
+       if (i == NSP_ETH_MAX_COUNT) {
+               rte_spinlock_unlock(&desc->nsp_lock);
+               return -EINVAL;
+       }
+
+       if (up && !(entry->state & NSP_ETH_STATE_CONFIGURED)) {
+               entry->control |= NSP_ETH_STATE_CONFIGURED;
+               modified = 1;
+       }
+
+       if (!up && (entry->state & NSP_ETH_STATE_CONFIGURED)) {
+               entry->control &= ~NSP_ETH_STATE_CONFIGURED;
+               modified = 1;
+       }
+
+       if (modified) {
+               ret = nspu_command(desc, NSP_CMD_WRITE_ETH_TABLE, 0, 1, entries,
+                                  0, NSP_ETH_TABLE_SIZE);
+               if (!ret)
+                       RTE_LOG(INFO, PMD,
+                               "Hw ethernet port %d configure done\n", port);
+               else
+                       RTE_LOG(INFO, PMD,
+                               "Hw ethernet port %d configure failed\n", port);
+       }
+       rte_spinlock_unlock(&desc->nsp_lock);
+       return ret;
+}
+
+int
+nfp_nsp_eth_read_table(nspu_desc_t *desc, union eth_table_entry **table)
+{
+       int ret;
+
+       if (!table)
+               return -EINVAL;
+
+       RTE_LOG(INFO, PMD, "Reading hw ethernet table...\n");
+
+       /* port 0 allocates the eth table and read it using NSPU */
+       *table = malloc(NSP_ETH_TABLE_SIZE);
+       if (!*table)
+               return -ENOMEM;
+
+       ret = nspu_command(desc, NSP_CMD_READ_ETH_TABLE, 1, 0, *table,
+                          NSP_ETH_TABLE_SIZE, 0);
+       if (ret)
+               return ret;
+
+       RTE_LOG(INFO, PMD, "Done\n");
+
+       return 0;
+}