From: Alejandro Lucero <alejandro.lucero@netronome.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 05/16] nfp: add nsp fw upload command
Date: Thu, 24 Aug 2017 17:20:11 +0100 [thread overview]
Message-ID: <1503591622-16232-6-git-send-email-alejandro.lucero@netronome.com> (raw)
In-Reply-To: <1503591622-16232-1-git-send-email-alejandro.lucero@netronome.com>
Using NSPU interface for fw upload. Firmware file needs to be
installed in specific path inside system firmware directory.
NSPU buffer is used for writing the firmware before sending the
command.
Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
drivers/net/nfp/nfp_nspu.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-
drivers/net/nfp/nfp_nspu.h | 1 +
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/drivers/net/nfp/nfp_nspu.c b/drivers/net/nfp/nfp_nspu.c
index dbb5305..57ee45f 100644
--- a/drivers/net/nfp/nfp_nspu.c
+++ b/drivers/net/nfp/nfp_nspu.c
@@ -3,6 +3,9 @@
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <rte_log.h>
@@ -38,7 +41,8 @@
#define NSP_STATUS_MINOR(x) (int)(((x) >> 32) & 0xfff)
/* NSP commands */
-#define NSP_CMD_RESET 1
+#define NSP_CMD_RESET 1
+#define NSP_CMD_FW_LOAD 6
#define NSP_BUFFER_CFG_SIZE_MASK (0xff)
@@ -304,3 +308,63 @@
return res;
}
+
+#define DEFAULT_FW_PATH "/lib/firmware/netronome"
+#define DEFAULT_FW_FILENAME "nic_dpdk_default.nffw"
+
+int
+nfp_fw_upload(nspu_desc_t *nspu_desc)
+{
+ int fw_f;
+ char *fw_buf;
+ char filename[100];
+ struct stat file_stat;
+ off_t fsize, bytes;
+ ssize_t size;
+ int ret;
+
+ size = nspu_desc->buf_size;
+
+ sprintf(filename, "%s/%s", DEFAULT_FW_PATH, DEFAULT_FW_FILENAME);
+ fw_f = open(filename, O_RDONLY);
+ if (fw_f < 0) {
+ RTE_LOG(INFO, PMD, "Firmware file %s/%s not found.",
+ DEFAULT_FW_PATH, DEFAULT_FW_FILENAME);
+ return -ENOENT;
+ }
+
+ fstat(fw_f, &file_stat);
+
+ fsize = file_stat.st_size;
+ RTE_LOG(DEBUG, PMD, "Firmware file with size: %" PRIu64 "\n",
+ (uint64_t)fsize);
+
+ if (fsize > (off_t)size) {
+ RTE_LOG(INFO, PMD, "fw file too big: %" PRIu64
+ " bytes (%" PRIu64 " max)",
+ (uint64_t)fsize, (uint64_t)size);
+ return -EINVAL;
+ }
+
+ fw_buf = malloc((size_t)size);
+ if (!fw_buf) {
+ RTE_LOG(INFO, PMD, "malloc failed for fw buffer");
+ return -ENOMEM;
+ }
+ memset(fw_buf, 0, size);
+
+ bytes = read(fw_f, fw_buf, fsize);
+ if (bytes != fsize) {
+ RTE_LOG(INFO, PMD, "Reading fw to buffer failed.\n"
+ "Just %" PRIu64 " of %" PRIu64 " bytes read.",
+ (uint64_t)bytes, (uint64_t)fsize);
+ free(fw_buf);
+ return -EIO;
+ }
+
+ ret = nspu_command(nspu_desc, NSP_CMD_FW_LOAD, 0, 1, fw_buf, 0, bytes);
+
+ free(fw_buf);
+
+ return ret;
+}
diff --git a/drivers/net/nfp/nfp_nspu.h b/drivers/net/nfp/nfp_nspu.h
index a142eb3..6e1c25f 100644
--- a/drivers/net/nfp/nfp_nspu.h
+++ b/drivers/net/nfp/nfp_nspu.h
@@ -73,3 +73,4 @@ int nfp_nspu_init(nspu_desc_t *desc, int nfp, int pcie_bar, size_t pcie_barsz,
int exp_bar, void *exp_bar_cfg_base, void *exp_bar_mmap);
int nfp_nsp_get_abi_version(nspu_desc_t *desc, int *major, int *minor);
int nfp_fw_reset(nspu_desc_t *nspu_desc);
+int nfp_fw_upload(nspu_desc_t *nspu_desc);
--
1.9.1
next prev parent reply other threads:[~2017-08-24 16:20 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 16:20 [dpdk-dev] [PATCH 00/16] nfp: add pf support Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 01/16] nfp: add nsp user space interface Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 02/16] nfp: add specific pf probe function Alejandro Lucero
2017-08-28 16:42 ` Ferruh Yigit
2017-08-31 9:23 ` Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 03/16] nfp: add support for new pci id Alejandro Lucero
2017-08-28 16:43 ` Ferruh Yigit
2017-08-31 9:08 ` Alejandro Lucero
2017-08-31 9:13 ` Ferruh Yigit
2017-08-31 9:24 ` Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 04/16] nfp: add nsp support for commands Alejandro Lucero
2017-08-24 16:20 ` Alejandro Lucero [this message]
2017-08-28 16:42 ` [dpdk-dev] [PATCH 05/16] nfp: add nsp fw upload command Ferruh Yigit
2017-08-31 9:04 ` Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 06/16] nfp: add nsp symbol resolution command Alejandro Lucero
2017-08-28 16:42 ` Ferruh Yigit
2017-08-31 9:35 ` Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 07/16] nfp: add fw upload logic Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 08/16] nfp: add support for vnic config bar mapping Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 09/16] nfp: add support for vNIC rx/tx bar mappings Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 10/16] nfp: support pf devices inside pmd initialization Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 11/16] nfp: allocate eth_dev from pf probe function Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 12/16] nfp: support pf multiport Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 13/16] nfp: add nsp support for hw link configuration Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 14/16] nfp: add support for hw port " Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 15/16] nfp: read pf port mac addr using nsp Alejandro Lucero
2017-08-24 16:20 ` [dpdk-dev] [PATCH 16/16] doc: update nfp with pf support information Alejandro Lucero
2017-08-28 16:42 ` [dpdk-dev] [PATCH 00/16] nfp: add pf support Ferruh Yigit
2017-08-31 9:00 ` Alejandro Lucero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1503591622-16232-6-git-send-email-alejandro.lucero@netronome.com \
--to=alejandro.lucero@netronome.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).