Commit 9423d24b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

nfp: introduce dev_info static chip data 



In preparation for supporting new chip add a driver data structure
which will hold per-chip-version information such as register
offsets.

Plumb it through to the relevant functions (nfpcore and nfp_net).
For now only a very simple member holding chip names is added,
following commits will add more.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarFei Qin <fei.qin@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7ab7985d

drivers/net/ethernet/netronome/nfp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ nfp-objs := \ 
	    nfpcore/nfp6000_pcie.o \

	    nfpcore/nfp_cppcore.o \

	    nfpcore/nfp_cpplib.o \

	    nfpcore/nfp_dev.o \

	    nfpcore/nfp_hwinfo.o \

	    nfpcore/nfp_mip.o \

	    nfpcore/nfp_mutex.o \

drivers/net/ethernet/netronome/nfp/nfp_main.c

+9 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "nfpcore/nfp.h"

#include "nfpcore/nfp_cpp.h"

#include "nfpcore/nfp_dev.h"

#include "nfpcore/nfp_nffw.h"

#include "nfpcore/nfp_nsp.h"
@@ -34,15 +35,15 @@ static const char nfp_driver_name[] = "nfp"; 
static const struct pci_device_id nfp_pci_device_ids[] = {

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,

	},

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP5000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,

	},

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,

	},

	{ 0, } /* Required last entry. */

};
@@ -667,6 +668,7 @@ static int nfp_pf_find_rtsyms(struct nfp_pf *pf) 
static int nfp_pci_probe(struct pci_dev *pdev,

			 const struct pci_device_id *pci_id)

{

	const struct nfp_dev_info *dev_info;

	struct devlink *devlink;

	struct nfp_pf *pf;

	int err;
@@ -675,6 +677,8 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
	    pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000_VF)

		dev_warn(&pdev->dev, "Binding NFP VF device to the NFP PF driver, the VF driver is called 'nfp_netvf'\n");



	dev_info = &nfp_dev_info[pci_id->driver_data];



	err = pci_enable_device(pdev);

	if (err < 0)

		return err;
@@ -703,6 +707,7 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
	mutex_init(&pf->lock);

	pci_set_drvdata(pdev, pf);

	pf->pdev = pdev;

	pf->dev_info = dev_info;



	pf->wq = alloc_workqueue("nfp-%s", 0, 2, pci_name(pdev));

	if (!pf->wq) {
@@ -710,7 +715,7 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
		goto err_pci_priv_unset;

	}



	pf->cpp = nfp_cpp_from_nfp6000_pcie(pdev);

	pf->cpp = nfp_cpp_from_nfp6000_pcie(pdev, dev_info);

	if (IS_ERR(pf->cpp)) {

		err = PTR_ERR(pf->cpp);

		goto err_disable_msix;

drivers/net/ethernet/netronome/nfp/nfp_main.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct nfp_dumpspec { 
/**

 * struct nfp_pf - NFP PF-specific device structure

 * @pdev:		Backpointer to PCI device

 * @dev_info:		NFP ASIC params

 * @cpp:		Pointer to the CPP handle

 * @app:		Pointer to the APP handle

 * @data_vnic_bar:	Pointer to the CPP area for the data vNICs' BARs
@@ -88,6 +89,7 @@ struct nfp_dumpspec { 
 */

struct nfp_pf {

	struct pci_dev *pdev;

	const struct nfp_dev_info *dev_info;



	struct nfp_cpp *cpp;

drivers/net/ethernet/netronome/nfp/nfp_net.h

+5 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 


/* Forward declarations */

struct nfp_cpp;

struct nfp_dev_info;

struct nfp_eth_table_port;

struct nfp_net;

struct nfp_net_r_vector;
@@ -571,6 +572,7 @@ struct nfp_net_dp { 
/**

 * struct nfp_net - NFP network device structure

 * @dp:			Datapath structure

 * @dev_info:		NFP ASIC params

 * @id:			vNIC id within the PF (0 for VFs)

 * @fw_ver:		Firmware version

 * @cap:                Capabilities advertised by the Firmware
@@ -644,6 +646,7 @@ struct nfp_net_dp { 
struct nfp_net {

	struct nfp_net_dp dp;



	const struct nfp_dev_info *dev_info;

	struct nfp_net_fw_version fw_ver;



	u32 id;
@@ -942,7 +945,8 @@ void nfp_net_get_fw_version(struct nfp_net_fw_version *fw_ver, 
			    void __iomem *ctrl_bar);



struct nfp_net *

nfp_net_alloc(struct pci_dev *pdev, void __iomem *ctrl_bar, bool needs_netdev,

nfp_net_alloc(struct pci_dev *pdev, const struct nfp_dev_info *dev_info,

	      void __iomem *ctrl_bar, bool needs_netdev,

	      unsigned int max_tx_rings, unsigned int max_rx_rings);

void nfp_net_free(struct nfp_net *nn);

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+4 −1
Original line number Diff line number Diff line
@@ -3962,6 +3962,7 @@ void nfp_net_info(struct nfp_net *nn) 
/**

 * nfp_net_alloc() - Allocate netdev and related structure

 * @pdev:         PCI device

 * @dev_info:     NFP ASIC params

 * @ctrl_bar:     PCI IOMEM with vNIC config memory

 * @needs_netdev: Whether to allocate a netdev for this vNIC

 * @max_tx_rings: Maximum number of TX rings supported by device
@@ -3974,7 +3975,8 @@ void nfp_net_info(struct nfp_net *nn) 
 * Return: NFP Net device structure, or ERR_PTR on error.

 */

struct nfp_net *

nfp_net_alloc(struct pci_dev *pdev, void __iomem *ctrl_bar, bool needs_netdev,

nfp_net_alloc(struct pci_dev *pdev, const struct nfp_dev_info *dev_info,

	      void __iomem *ctrl_bar, bool needs_netdev,

	      unsigned int max_tx_rings, unsigned int max_rx_rings)

{

	struct nfp_net *nn;
@@ -3999,6 +4001,7 @@ nfp_net_alloc(struct pci_dev *pdev, void __iomem *ctrl_bar, bool needs_netdev, 


	nn->dp.dev = &pdev->dev;

	nn->dp.ctrl_bar = ctrl_bar;

	nn->dev_info = dev_info;

	nn->pdev = pdev;



	nn->max_tx_rings = max_tx_rings;