From: Alejandro Lucero Date: Fri, 1 Sep 2017 14:12:10 +0000 (+0100) Subject: net/nfp: add FW upload logic X-Git-Tag: spdx-start~1994 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=1e37fb52c6f4fe2820a7967d196cab39b332644b;p=dpdk.git net/nfp: add FW upload logic PMD will use this function for uploading the firmware. First, a symbol resolution is done for finding out if there is a firmware already there. If not, a NFP reset is called before using NSPU fw upload code. PMD PF probe function is now using this logic. Signed-off-by: Alejandro Lucero --- diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index ca481e4a44..506743d0ad 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2639,6 +2639,7 @@ static int nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, { nfpu_desc_t *nfpu_desc; nspu_desc_t *nspu_desc; + uint64_t offset_symbol; int major, minor; if (!dev) @@ -2669,6 +2670,8 @@ static int nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto no_abi; } + nfp_nsp_fw_setup(nspu_desc, "nfd_cfg_pf0_num_ports", &offset_symbol); + /* No port is created yet */ no_abi: diff --git a/drivers/net/nfp/nfp_nspu.c b/drivers/net/nfp/nfp_nspu.c index d80da80fe4..5a3ae0e7ee 100644 --- a/drivers/net/nfp/nfp_nspu.c +++ b/drivers/net/nfp/nfp_nspu.c @@ -21,6 +21,9 @@ /* NFP target for NSP access */ #define NFP_NSP_TARGET 7 +/* Expansion BARs for mapping PF vnic BARs */ +#define NFP_NET_PF_CFG_EXP_BAR 6 + /* * This is an NFP internal address used for configuring properly an NFP * expansion BAR. @@ -297,7 +300,7 @@ nspu_command(nspu_desc_t *desc, uint16_t cmd, int read, int write, return ret; } -int +static int nfp_fw_reset(nspu_desc_t *nspu_desc) { int res; @@ -313,7 +316,7 @@ nfp_fw_reset(nspu_desc_t *nspu_desc) #define DEFAULT_FW_PATH "/lib/firmware/netronome" #define DEFAULT_FW_FILENAME "nic_dpdk_default.nffw" -int +static int nfp_fw_upload(nspu_desc_t *nspu_desc) { int fw_f; @@ -391,7 +394,7 @@ nfp_fw_upload(nspu_desc_t *nspu_desc) * a PCI BAR window. NFP expansion BARs are used in this regard through * the NSPU interface. */ -int +static int nfp_nspu_set_bar_from_symbl(nspu_desc_t *desc, const char *symbl, uint32_t expbar, uint64_t *pcie_offset, ssize_t *size) @@ -454,3 +457,42 @@ clean: free(sym_buf); return ret; } + +int +nfp_nsp_fw_setup(nspu_desc_t *desc, const char *sym, uint64_t *pcie_offset) +{ + ssize_t bar0_sym_size; + + /* If the symbol resolution works, it implies a firmware app + * is already there. + */ + if (!nfp_nspu_set_bar_from_symbl(desc, sym, NFP_NET_PF_CFG_EXP_BAR, + pcie_offset, &bar0_sym_size)) + return 0; + + /* No firmware app detected or not the right one */ + RTE_LOG(INFO, PMD, "No firmware detected. Resetting NFP...\n"); + if (nfp_fw_reset(desc) < 0) { + RTE_LOG(ERR, PMD, "nfp fw reset failed\n"); + return -ENODEV; + } + + RTE_LOG(INFO, PMD, "Reset done.\n"); + RTE_LOG(INFO, PMD, "Uploading firmware...\n"); + + if (nfp_fw_upload(desc) < 0) { + RTE_LOG(ERR, PMD, "nfp fw upload failed\n"); + return -ENODEV; + } + + RTE_LOG(INFO, PMD, "Done.\n"); + + /* Now the symbol should be there */ + if (nfp_nspu_set_bar_from_symbl(desc, sym, NFP_NET_PF_CFG_EXP_BAR, + pcie_offset, &bar0_sym_size)) { + RTE_LOG(ERR, PMD, "nfp PF BAR symbol resolution failed\n"); + return -ENODEV; + } + + return 0; +} diff --git a/drivers/net/nfp/nfp_nspu.h b/drivers/net/nfp/nfp_nspu.h index 7734b4f836..c439700780 100644 --- a/drivers/net/nfp/nfp_nspu.h +++ b/drivers/net/nfp/nfp_nspu.h @@ -72,8 +72,4 @@ typedef struct { 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); -int nfp_nspu_set_bar_from_symbl(nspu_desc_t *desc, const char *symbl, - uint32_t expbar, uint64_t *pcie_offset, - ssize_t *size); +int nfp_nsp_fw_setup(nspu_desc_t *desc, const char *sym, uint64_t *pcie_offset);