d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/nfp: add FW upload logic

Browse Source 
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 <alejandro.lucero@netronome.com>
This commit is contained in:
Alejandro Lucero 2017-09-01 15:12:10 +01:00 committed by Ferruh Yigit
parent dd63df2bff
commit 1e37fb52c6
3 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/nfp/nfp_net.c
View File

@ -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:

48
drivers/net/nfp/nfp_nspu.c
View File

@ -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 @@ nfp_nspu_set_bar_from_symbl(nspu_desc_t *desc, const char *symbl,
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;
}

6
drivers/net/nfp/nfp_nspu.h
View File

@ -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);