iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfp: support Corigine PCIE vendor ID

Browse Source 
Historically the nfp driver has supported NFP chips with Netronome's
PCIE vendor ID. This patch extends the driver to also support NFP
chips, which at this point are assumed to be otherwise identical from
a software perspective, that have Corigine's PCIE vendor ID (0x1da8).

Also, Rename the macro definitions PCI_DEVICE_ID_NERTONEOME_NFPXXXX
to PCI_DEVICE_ID_NFPXXXX, as they are now used in conjunction with two
PCIE vendor IDs.

Signed-off-by: Yu Xiao <yu.xiao@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Yu Xiao 2022-05-08 19:38:16 +02:00 committed by Jakub Kicinski
parent 34e244ea15
commit 299ba7a32a
4 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/ethernet/netronome/nfp/nfp_main.c
View File

@ -33,22 +33,38 @@
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_NFP3800,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP3800,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP3800,
},
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP4000,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP5000,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP5000,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP6000,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP3800,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP3800,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP4000,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP5000,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP6000,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000,
},
{ 0, } /* Required last entry. */
};
MODULE_DEVICE_TABLE(pci, nfp_pci_device_ids);
@ -681,8 +697,10 @@ static int nfp_pci_probe(struct pci_dev *pdev,
struct nfp_pf *pf;
int err;
if (pdev->vendor == PCI_VENDOR_ID_NETRONOME &&
pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000_VF)
if ((pdev->vendor == PCI_VENDOR_ID_NETRONOME ||
pdev->vendor == PCI_VENDOR_ID_CORIGINE) &&
(pdev->device == PCI_DEVICE_ID_NFP3800_VF ||
pdev->device == PCI_DEVICE_ID_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];

12
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
View File

@ -38,14 +38,22 @@ struct nfp_net_vf {
static const char nfp_net_driver_name[] = "nfp_netvf";
static const struct pci_device_id nfp_netvf_pci_device_ids[] = {
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP3800_VF,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP3800_VF,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP3800_VF,
},
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000_VF,
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP6000_VF,
PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000_VF,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP3800_VF,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP3800_VF,
},
{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP6000_VF,
PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
PCI_ANY_ID, 0, NFP_DEV_NFP6000_VF,
},
{ 0, } /* Required last entry. */
};
MODULE_DEVICE_TABLE(pci, nfp_netvf_pci_device_ids);

16
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
View File

@ -621,13 +621,13 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
nfp->dev_info->pcie_expl_offset;
switch (nfp->pdev->device) {
case PCI_DEVICE_ID_NETRONOME_NFP3800:
case PCI_DEVICE_ID_NFP3800:
pf = nfp->pdev->devfn & 7;
nfp->iomem.csr = bar->iomem + NFP_PCIE_BAR(pf);
break;
case PCI_DEVICE_ID_NETRONOME_NFP4000:
case PCI_DEVICE_ID_NETRONOME_NFP5000:
case PCI_DEVICE_ID_NETRONOME_NFP6000:
case PCI_DEVICE_ID_NFP4000:
case PCI_DEVICE_ID_NFP5000:
case PCI_DEVICE_ID_NFP6000:
nfp->iomem.csr = bar->iomem + NFP_PCIE_BAR(0);
break;
default:
@ -640,12 +640,12 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
}
switch (nfp->pdev->device) {
case PCI_DEVICE_ID_NETRONOME_NFP3800:
case PCI_DEVICE_ID_NFP3800:
expl_groups = 1;
break;
case PCI_DEVICE_ID_NETRONOME_NFP4000:
case PCI_DEVICE_ID_NETRONOME_NFP5000:
case PCI_DEVICE_ID_NETRONOME_NFP6000:
case PCI_DEVICE_ID_NFP4000:
case PCI_DEVICE_ID_NFP5000:
case PCI_DEVICE_ID_NFP6000:
expl_groups = 4;
break;
default:

8
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.h
View File

@ -6,6 +6,14 @@
#include <linux/types.h>
#define PCI_VENDOR_ID_CORIGINE 0x1da8
#define PCI_DEVICE_ID_NFP3800 0x3800
#define PCI_DEVICE_ID_NFP4000 0x4000
#define PCI_DEVICE_ID_NFP5000 0x5000
#define PCI_DEVICE_ID_NFP6000 0x6000
#define PCI_DEVICE_ID_NFP3800_VF 0x3803
#define PCI_DEVICE_ID_NFP6000_VF 0x6003
enum nfp_dev_id {
NFP_DEV_NFP3800,
NFP_DEV_NFP3800_VF,