Commit 0377505c authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: add support for NFP5000 



Add NFP5000 to supported chips, the chip is backward compatible
with NFP4000 and NFP6000, so core PCIe code needs to handle it
the same way as 4k and 6k.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6e71efd

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

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ static const struct pci_device_id nfp_pci_device_ids[] = { 
	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	},

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP5000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	},

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c

+3 −1
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface) 
		nfp->expl.data = bar->iomem + NFP_PCIE_SRAM + 0x1000;



		if (nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP4000 ||

		    nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP5000 ||

		    nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000) {

			nfp->iomem.csr = bar->iomem + NFP_PCIE_BAR(0);

		} else {
@@ -663,6 +664,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface) 
	}



	if (nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP4000 ||

	    nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP5000 ||

	    nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000)

		expl_groups = 4;

	else
@@ -1327,7 +1329,7 @@ struct nfp_cpp *nfp_cpp_from_nfp6000_pcie(struct pci_dev *pdev) 


	/*  Finished with card initialization. */

	dev_info(&pdev->dev,

		 "Netronome Flow Processor NFP4000/NFP6000 PCIe Card Probe\n");

		 "Netronome Flow Processor NFP4000/NFP5000/NFP6000 PCIe Card Probe\n");

	pcie_print_link_status(pdev);



	nfp = kzalloc(sizeof(*nfp), GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE