From 3d61e23ad1f24e53358f445cd55784e8cf2b08e9 Mon Sep 17 00:00:00 2001

From: Alejandro Lucero <alejandro.lucero@netronome.com>

Date: Thu, 5 Apr 2018 15:42:47 +0100

Subject: [PATCH 3/3] net/nfp: remove files

New CPP interface makes NSPU interface obsolete. These files are

not needed anymore.

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>

(cherry picked from commit 70217f1d8dc1f87d0b1d70b08cd3199a46f49a47)

---

 drivers/net/nfp/nfp_net_eth.h |  82 ------

 drivers/net/nfp/nfp_nfpu.c    | 108 -------

 drivers/net/nfp/nfp_nfpu.h    |  55 ----

 drivers/net/nfp/nfp_nspu.c    | 642 ------------------------------------------

 drivers/net/nfp/nfp_nspu.h    |  83 ------

 5 files changed, 970 deletions(-)

 delete mode 100644 drivers/net/nfp/nfp_net_eth.h

 delete mode 100644 drivers/net/nfp/nfp_nfpu.c

 delete mode 100644 drivers/net/nfp/nfp_nfpu.h

 delete mode 100644 drivers/net/nfp/nfp_nspu.c

 delete mode 100644 drivers/net/nfp/nfp_nspu.h

diff --git a/drivers/net/nfp/nfp_net_eth.h b/drivers/net/nfp/nfp_net_eth.h

deleted file mode 100644

index af57f03c5..000000000

--- a/drivers/net/nfp/nfp_net_eth.h

+++ /dev/null

@@ -1,82 +0,0 @@

-/*

- * Copyright (c) 2017 Netronome Systems, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *  this list of conditions and the following disclaimer.

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *  notice, this list of conditions and the following disclaimer in the

- *  documentation and/or other materials provided with the distribution

- *

- * 3. Neither the name of the copyright holder nor the names of its

- *  contributors may be used to endorse or promote products derived from this

- *  software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-

-/*

- * vim:shiftwidth=8:noexpandtab

- *

- * @file dpdk/pmd/nfp_net_eth.h

- *

- * Netronome NFP_NET PDM driver

- */

-

-union eth_table_entry {

-	struct {

-		uint64_t port;

-		uint64_t state;

-		uint8_t mac_addr[6];

-		uint8_t resv[2];

-		uint64_t control;

-	};

-	uint64_t raw[4];

-};

-

-#ifndef BIT_ULL

-#define BIT_ULL(a) (1ULL << (a))

-#endif

-

-#define NSP_ETH_NBI_PORT_COUNT          24

-#define NSP_ETH_MAX_COUNT               (2 * NSP_ETH_NBI_PORT_COUNT)

-#define NSP_ETH_TABLE_SIZE   (NSP_ETH_MAX_COUNT * sizeof(union eth_table_entry))

-

-#define NSP_ETH_PORT_LANES              0xf

-#define NSP_ETH_PORT_INDEX              0xff00

-#define NSP_ETH_PORT_LABEL              0x3f000000000000

-#define NSP_ETH_PORT_PHYLABEL           0xfc0000000000000

-

-#define NSP_ETH_PORT_LANES_MASK         rte_cpu_to_le_64(NSP_ETH_PORT_LANES)

-

-#define NSP_ETH_STATE_CONFIGURED        BIT_ULL(0)

-#define NSP_ETH_STATE_ENABLED           BIT_ULL(1)

-#define NSP_ETH_STATE_TX_ENABLED        BIT_ULL(2)

-#define NSP_ETH_STATE_RX_ENABLED        BIT_ULL(3)

-#define NSP_ETH_STATE_RATE              0xf00

-#define NSP_ETH_STATE_INTERFACE         0xff000

-#define NSP_ETH_STATE_MEDIA             0x300000

-#define NSP_ETH_STATE_OVRD_CHNG         BIT_ULL(22)

-#define NSP_ETH_STATE_ANEG              0x3800000

-

-#define NSP_ETH_CTRL_CONFIGURED         BIT_ULL(0)

-#define NSP_ETH_CTRL_ENABLED            BIT_ULL(1)

-#define NSP_ETH_CTRL_TX_ENABLED         BIT_ULL(2)

-#define NSP_ETH_CTRL_RX_ENABLED         BIT_ULL(3)

-#define NSP_ETH_CTRL_SET_RATE           BIT_ULL(4)

-#define NSP_ETH_CTRL_SET_LANES          BIT_ULL(5)

-#define NSP_ETH_CTRL_SET_ANEG           BIT_ULL(6)

diff --git a/drivers/net/nfp/nfp_nfpu.c b/drivers/net/nfp/nfp_nfpu.c

deleted file mode 100644

index f11afef35..000000000

--- a/drivers/net/nfp/nfp_nfpu.c

+++ /dev/null

@@ -1,108 +0,0 @@

-#include <stdlib.h>

-#include <stdio.h>

-#include <string.h>

-#include <unistd.h>

-#include <errno.h>

-#include <sys/file.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-#include <sys/types.h>

-

-#include <rte_bus_pci.h>

-#include <rte_malloc.h>

-

-#include "nfp_nfpu.h"

-

-/* PF BAR and expansion BAR for the NSP interface */

-#define NFP_CFG_PCIE_BAR        0

-#define NFP_CFG_EXP_BAR         7

-

-#define NFP_CFG_EXP_BAR_CFG_BASE	0x30000

-

-/* There could be other NFP userspace tools using the NSP interface.

- * Make sure there is no other process using it and locking the access for

- * avoiding problems.

- */

-static int

-nspv_aquire_process_lock(nfpu_desc_t *desc)

-{

-	int rc;

-	struct flock lock;

-	char lockname[30];

-

-	memset(&lock, 0, sizeof(lock));

-

-	snprintf(lockname, sizeof(lockname), "/var/lock/nfp%d", desc->nfp);

-

-	/* Using S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH */

-	desc->lock = open(lockname, O_RDWR | O_CREAT, 0666);

-

-	if (desc->lock < 0)

-		return desc->lock;

-

-	lock.l_type = F_WRLCK;

-	lock.l_whence = SEEK_SET;

-	rc = -1;

-	while (rc != 0) {

-		rc = fcntl(desc->lock, F_SETLK, &lock);

-		if (rc < 0) {

-			if ((errno != EAGAIN) && (errno != EACCES)) {

-				close(desc->lock);

-				return rc;

-			}

-		}

-	}

-

-	return 0;

-}

-

-int

-nfpu_open(struct rte_pci_device *pci_dev, nfpu_desc_t *desc, int nfp)

-{

-	void *cfg_base, *mem_base;

-	size_t barsz;

-	int ret = 0;

-	int i = 0;

-

-	desc->nfp = nfp;

-

-	ret = nspv_aquire_process_lock(desc);

-	if (ret)

-		return -1;

-

-	barsz = pci_dev->mem_resource[0].len;

-

-	/* barsz in log2 */

-	while (barsz >>= 1)

-		i++;

-

-	barsz = i;

-

-	/* Sanity check: we can assume any bar size less than 1MB an error */

-	if (barsz < 20)

-		return -1;

-

-	/* Getting address for NFP expansion BAR registers */

-	cfg_base = pci_dev->mem_resource[0].addr;

-	cfg_base = (uint8_t *)cfg_base + NFP_CFG_EXP_BAR_CFG_BASE;

-

-	/* Getting address for NFP NSP interface registers */

-	mem_base = pci_dev->mem_resource[0].addr;

-	mem_base = (uint8_t *)mem_base + (NFP_CFG_EXP_BAR << (barsz - 3));

-

-

-	desc->nspu = rte_malloc("nfp nspu", sizeof(nspu_desc_t), 0);

-	nfp_nspu_init(desc->nspu, desc->nfp, NFP_CFG_PCIE_BAR, barsz,

-		      NFP_CFG_EXP_BAR, cfg_base, mem_base);

-

-	return ret;

-}

-

-int

-nfpu_close(nfpu_desc_t *desc)

-{

-	rte_free(desc->nspu);

-	close(desc->lock);

-	unlink("/var/lock/nfp0");

-	return 0;

-}

diff --git a/drivers/net/nfp/nfp_nfpu.h b/drivers/net/nfp/nfp_nfpu.h

deleted file mode 100644

index e56fa099d..000000000

--- a/drivers/net/nfp/nfp_nfpu.h

+++ /dev/null

@@ -1,55 +0,0 @@

-/*

- * Copyright (c) 2017 Netronome Systems, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *  this list of conditions and the following disclaimer.

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *  notice, this list of conditions and the following disclaimer in the

- *  documentation and/or other materials provided with the distribution

- *

- * 3. Neither the name of the copyright holder nor the names of its

- *  contributors may be used to endorse or promote products derived from this

- *  software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-

-/*

- * vim:shiftwidth=8:noexpandtab

- *

- * @file dpdk/pmd/nfp_nfpu.h

- *

- * Netronome NFP_NET PDM driver

- */

-

-/*

- * NFP User interface creates a window for talking with NFP NSP processor

- */

-

-

-#include <rte_bus_pci.h>

-#include "nfp_nspu.h"

-

-typedef struct {

-	int nfp;

-	int lock;

-	nspu_desc_t *nspu;

-} nfpu_desc_t;

-

-int nfpu_open(struct rte_pci_device *pci_dev, nfpu_desc_t *desc, int nfp);

-int nfpu_close(nfpu_desc_t *desc);

diff --git a/drivers/net/nfp/nfp_nspu.c b/drivers/net/nfp/nfp_nspu.c

deleted file mode 100644

index f90898321..000000000

--- a/drivers/net/nfp/nfp_nspu.c

+++ /dev/null

@@ -1,642 +0,0 @@

-#include <stdlib.h>

-#include <stdio.h>

-#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>

-#include <rte_byteorder.h>

-

-#include "nfp_nfpu.h"

-

-#define CFG_EXP_BAR_ADDR_SZ     1

-#define CFG_EXP_BAR_MAP_TYPE	1

-

-#define EXP_BAR_TARGET_SHIFT     23

-#define EXP_BAR_LENGTH_SHIFT     27 /* 0=32, 1=64 bit increment */

-#define EXP_BAR_MAP_TYPE_SHIFT   29 /* Bulk BAR map */

-

-/* 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

-#define NFP_NET_PF_HW_QUEUES_EXP_BAR    5

-

-/*

- * This is an NFP internal address used for configuring properly an NFP

- * expansion BAR.

- */

-#define MEM_CMD_BASE_ADDR       0x8100000000

-

-/* NSP interface registers */

-#define NSP_BASE                (MEM_CMD_BASE_ADDR + 0x22100)

-#define NSP_STATUS              0x00

-#define NSP_COMMAND             0x08

-#define NSP_BUFFER		0x10

-#define NSP_DEFAULT_BUF         0x18

-#define NSP_DEFAULT_BUF_CFG  0x20

-

-#define NSP_MAGIC                0xab10

-#define NSP_STATUS_MAGIC(x)      (((x) >> 48) & 0xffff)

-#define NSP_STATUS_MAJOR(x)      (int)(((x) >> 44) & 0xf)

-#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_READ_ETH_TABLE          7

-#define NSP_CMD_WRITE_ETH_TABLE         8

-#define NSP_CMD_GET_SYMBOL             14

-

-#define NSP_BUFFER_CFG_SIZE_MASK	(0xff)

-

-#define NSP_REG_ADDR(d, off, reg) ((uint8_t *)(d)->mem_base + (off) + (reg))

-#define NSP_REG_VAL(p) (*(uint64_t *)(p))

-

-/*

- * An NFP expansion BAR is configured for allowing access to a specific NFP

- * target:

- *

- *  IN:

- *	desc: struct with basic NSP addresses to work with

- *	expbar: NFP PF expansion BAR index to configure

- *	tgt: NFP target to configure access

- *	addr: NFP target address

- *

- *  OUT:

- *	pcie_offset: NFP PCI BAR offset to work with

- */

-static void

-nfp_nspu_mem_bar_cfg(nspu_desc_t *desc, int expbar, int tgt,

-		     uint64_t addr, uint64_t *pcie_offset)

-{

-	uint64_t x, y, barsz;

-	uint32_t *expbar_ptr;

-

-	barsz = desc->barsz;

-

-	/*

-	 * NFP CPP address to configure. This comes from NFP 6000

-	 * datasheet document based on Bulk mapping.

-	 */

-	x = (addr >> (barsz - 3)) << (21 - (40 - (barsz - 3)));

-	x |= CFG_EXP_BAR_MAP_TYPE << EXP_BAR_MAP_TYPE_SHIFT;

-	x |= CFG_EXP_BAR_ADDR_SZ << EXP_BAR_LENGTH_SHIFT;

-	x |= tgt << EXP_BAR_TARGET_SHIFT;

-

-	/* Getting expansion bar configuration register address */

-	expbar_ptr = (uint32_t *)desc->cfg_base;

-	/* Each physical PCI BAR has 8 NFP expansion BARs */

-	expbar_ptr += (desc->pcie_bar * 8) + expbar;

-

-	/* Writing to the expansion BAR register */

-	*expbar_ptr = (uint32_t)x;

-

-	/* Getting the pcie offset to work with from userspace */

-	y = addr & ((uint64_t)(1 << (barsz - 3)) - 1);

-	*pcie_offset = y;

-}

-

-/*

- * Configuring an expansion bar for accessing NSP userspace interface. This

- * function configures always the same expansion bar, which implies access to

- * previously configured NFP target is lost.

- */

-static void

-nspu_xlate(nspu_desc_t *desc, uint64_t addr, uint64_t *pcie_offset)

-{

-	nfp_nspu_mem_bar_cfg(desc, desc->exp_bar, NFP_NSP_TARGET, addr,

-			     pcie_offset);

-}

-

-int

-nfp_nsp_get_abi_version(nspu_desc_t *desc, int *major, int *minor)

-{

-	uint64_t pcie_offset;

-	uint64_t nsp_reg;

-

-	nspu_xlate(desc, NSP_BASE, &pcie_offset);

-	nsp_reg = NSP_REG_VAL(NSP_REG_ADDR(desc, pcie_offset, NSP_STATUS));

-

-	if (NSP_STATUS_MAGIC(nsp_reg) != NSP_MAGIC)

-		return -1;

-

-	*major = NSP_STATUS_MAJOR(nsp_reg);

-	*minor = NSP_STATUS_MINOR(nsp_reg);

-

-	return 0;

-}

-

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

-{

-	uint64_t offset, buffaddr;

-	uint64_t nsp_reg;

-

-	desc->nfp = nfp;

-	desc->pcie_bar = pcie_bar;

-	desc->exp_bar = exp_bar;

-	desc->barsz = pcie_barsz;

-	desc->windowsz = 1 << (desc->barsz - 3);

-	desc->cfg_base = exp_bar_cfg_base;

-	desc->mem_base = exp_bar_mmap;

-

-	nspu_xlate(desc, NSP_BASE, &offset);

-

-	/*

-	 * Other NSPU clients can use other buffers. Let's tell NSPU we use the

-	 * default buffer.

-	 */

-	buffaddr = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_DEFAULT_BUF));

-	NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_BUFFER)) = buffaddr;

-

-	/* NFP internal addresses are 40 bits. Clean all other bits here */

-	buffaddr = buffaddr & (((uint64_t)1 << 40) - 1);

-	desc->bufaddr = buffaddr;

-

-	/* Lets get information about the buffer */

-	nsp_reg = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_DEFAULT_BUF_CFG));

-

-	/* Buffer size comes in MBs. Coversion to bytes */

-	desc->buf_size = ((size_t)nsp_reg & NSP_BUFFER_CFG_SIZE_MASK) << 20;

-

-	return 0;

-}

-

-#define NSPU_NFP_BUF(addr, base, off) \

-	(*(uint64_t *)((uint8_t *)(addr)->mem_base + ((base) | (off))))

-

-#define NSPU_HOST_BUF(base, off) (*(uint64_t *)((uint8_t *)(base) + (off)))

-

-static int

-nspu_buff_write(nspu_desc_t *desc, void *buffer, size_t size)

-{

-	uint64_t pcie_offset, pcie_window_base, pcie_window_offset;

-	uint64_t windowsz = desc->windowsz;

-	uint64_t buffaddr, j, i = 0;

-	int ret = 0;

-

-	if (size > desc->buf_size)

-		return -1;

-

-	buffaddr = desc->bufaddr;

-	windowsz = desc->windowsz;

-

-	while (i < size) {

-		/* Expansion bar reconfiguration per window size */

-		nspu_xlate(desc, buffaddr + i, &pcie_offset);

-		pcie_window_base = pcie_offset & (~(windowsz - 1));

-		pcie_window_offset = pcie_offset & (windowsz - 1);

-		for (j = pcie_window_offset; ((j < windowsz) && (i < size));

-		     j += 8) {

-			NSPU_NFP_BUF(desc, pcie_window_base, j) =

-				NSPU_HOST_BUF(buffer, i);

-			i += 8;

-		}

-	}

-

-	return ret;

-}

-

-static int

-nspu_buff_read(nspu_desc_t *desc, void *buffer, size_t size)

-{

-	uint64_t pcie_offset, pcie_window_base, pcie_window_offset;

-	uint64_t windowsz, i = 0, j;

-	uint64_t buffaddr;

-	int ret = 0;

-

-	if (size > desc->buf_size)

-		return -1;

-

-	buffaddr = desc->bufaddr;

-	windowsz = desc->windowsz;

-

-	while (i < size) {

-		/* Expansion bar reconfiguration per window size */

-		nspu_xlate(desc, buffaddr + i, &pcie_offset);

-		pcie_window_base = pcie_offset & (~(windowsz - 1));

-		pcie_window_offset = pcie_offset & (windowsz - 1);

-		for (j = pcie_window_offset; ((j < windowsz) && (i < size));

-		     j += 8) {

-			NSPU_HOST_BUF(buffer, i) =

-				NSPU_NFP_BUF(desc, pcie_window_base, j);

-			i += 8;

-		}

-	}

-

-	return ret;

-}

-

-static int

-nspu_command(nspu_desc_t *desc, uint16_t cmd, int read, int write,

-		 void *buffer, size_t rsize, size_t wsize)

-{

-	uint64_t status, cmd_reg;

-	uint64_t offset;

-	int retry = 0;

-	int retries = 120;

-	int ret = 0;

-

-	/* Same expansion BAR is used for different things */

-	nspu_xlate(desc, NSP_BASE, &offset);

-

-	status = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_STATUS));

-

-	while ((status & 0x1) && (retry < retries)) {

-		status = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_STATUS));

-		retry++;

-		sleep(1);

-	}

-

-	if (retry == retries)

-		return -1;

-

-	if (write) {

-		ret = nspu_buff_write(desc, buffer, wsize);

-		if (ret)

-			return ret;

-

-		/* Expansion BAR changes when writing the buffer */

-		nspu_xlate(desc, NSP_BASE, &offset);

-	}

-

-	NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_COMMAND)) =

-		(uint64_t)wsize << 32 | (uint64_t)cmd << 16 | 1;

-

-	retry = 0;

-

-	cmd_reg = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_COMMAND));

-	while ((cmd_reg & 0x1) && (retry < retries)) {

-		cmd_reg = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_COMMAND));

-		retry++;

-		sleep(1);

-	}

-	if (retry == retries)

-		return -1;

-

-	retry = 0;

-	status = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_STATUS));

-	while ((status & 0x1) && (retry < retries)) {

-		status = NSP_REG_VAL(NSP_REG_ADDR(desc, offset, NSP_STATUS));

-		retry++;

-		sleep(1);

-	}

-

-	if (retry == retries)

-		return -1;

-

-	ret = status & (0xff << 8);

-	if (ret)

-		return ret;

-

-	if (read) {

-		ret = nspu_buff_read(desc, buffer, rsize);

-		if (ret)

-			return ret;

-	}

-

-	return ret;

-}

-

-static int

-nfp_fw_reset(nspu_desc_t *nspu_desc)

-{

-	int res;

-

-	res = nspu_command(nspu_desc, NSP_CMD_RESET, 0, 0, 0, 0, 0);

-

-	if (res < 0)

-		RTE_LOG(INFO, PMD, "fw reset failed: error %d", res);

-

-	return res;

-}

-

-#define DEFAULT_FW_PATH       "/lib/firmware/netronome"

-#define DEFAULT_FW_FILENAME   "nic_dpdk_default.nffw"

-

-static 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;

-	}

-

-	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",

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

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

-

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

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

-}

-

-/* Firmware symbol descriptor size */

-#define NFP_SYM_DESC_LEN 40

-

-#define SYMBOL_DATA(b, off)     (*(int64_t *)((b) + (off)))

-#define SYMBOL_UDATA(b, off)     (*(uint64_t *)((b) + (off)))

-

-/* Firmware symbols contain information about how to access what they

- * represent. It can be as simple as an numeric variable declared at a

- * specific NFP memory, but it can also be more complex structures and

- * related to specific hardware functionalities or components. Target,

- * domain and address allow to create the BAR window for accessing such

- * hw object and size defines the length to map.

- *

- * A vNIC is a network interface implemented inside the NFP and using a

- * subset of device PCI BARs. Specific firmware symbols allow to map those

- * vNIC bars by host drivers like the NFP PMD.

- *

- * Accessing what the symbol represents implies to map the access through

- * a PCI BAR window. NFP expansion BARs are used in this regard through

- * the NSPU interface.

- */

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

-{

-	int64_t type;

-	int64_t target;

-	int64_t domain;

-	uint64_t addr;

-	char *sym_buf;

-	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,