| Message ID | 20221101153539.22630-1-vburru@marvell.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | octeon_ep: support Octeon device CNF95N | expand |
On Tue, Nov 01, 2022 at 08:35:39AM -0700, Veerasenareddy Burru wrote: > Add support for Octeon device CNF95N. > CNF95N is a Octeon Fusion family product with same PCI NIC > characteristics as CN93 which is currently supported by the driver. > > Signed-off-by: Veerasenareddy Burru <vburru@marvell.com> > --- > .../ethernet/marvell/octeon_ep/octep_main.c | 19 ++++++++++++++++--- > .../ethernet/marvell/octeon_ep/octep_main.h | 2 ++ > 2 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c > index 9089adcb75f9..e956c1059fc8 100644 > --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c > +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c > @@ -23,6 +23,7 @@ struct workqueue_struct *octep_wq; > /* Supported Devices */ > static const struct pci_device_id octep_pci_id_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CN93_PF)}, > + {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CNF95N_PF)}, > {0, }, > }; > MODULE_DEVICE_TABLE(pci, octep_pci_id_tbl); > @@ -907,6 +908,18 @@ static void octep_ctrl_mbox_task(struct work_struct *work) > } > } > > +static const char *octep_devid_to_str(struct octep_device *oct) > +{ > + switch (oct->chip_id) { > + case OCTEP_PCI_DEVICE_ID_CN93_PF: > + return "CN93XX"; > + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: > + return "CNF95N"; > + default: > + return "Unsupported"; > + } > +} > + > /** > * octep_device_setup() - Setup Octeon Device. > * > @@ -939,9 +952,9 @@ int octep_device_setup(struct octep_device *oct) > > switch (oct->chip_id) { > case OCTEP_PCI_DEVICE_ID_CN93_PF: > - dev_info(&pdev->dev, > - "Setting up OCTEON CN93XX PF PASS%d.%d\n", > - OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); > + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: > + dev_info(&pdev->dev, "Setting up OCTEON %s PF PASS%d.%d\n", > + octep_devid_to_str(oct), OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); > octep_device_setup_cn93_pf(oct); > break; > default: > diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h > index 025626a61383..123ffc13754d 100644 > --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h > +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h > @@ -21,6 +21,8 @@ > #define OCTEP_PCI_DEVICE_ID_CN93_PF 0xB200 > #define OCTEP_PCI_DEVICE_ID_CN93_VF 0xB203 > > +#define OCTEP_PCI_DEVICE_ID_CNF95N_PF 0xB400 //95N PF AFAIK, correct comment style is /* */ and not //. BTW, patch should include target "[PATCH net-next]...". > + > #define OCTEP_MAX_QUEUES 63 > #define OCTEP_MAX_IQ OCTEP_MAX_QUEUES > #define OCTEP_MAX_OQ OCTEP_MAX_QUEUES > -- > 2.36.0 >
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 9089adcb75f9..e956c1059fc8 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -23,6 +23,7 @@ struct workqueue_struct *octep_wq; /* Supported Devices */ static const struct pci_device_id octep_pci_id_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CN93_PF)}, + {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CNF95N_PF)}, {0, }, }; MODULE_DEVICE_TABLE(pci, octep_pci_id_tbl); @@ -907,6 +908,18 @@ static void octep_ctrl_mbox_task(struct work_struct *work) } } +static const char *octep_devid_to_str(struct octep_device *oct) +{ + switch (oct->chip_id) { + case OCTEP_PCI_DEVICE_ID_CN93_PF: + return "CN93XX"; + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: + return "CNF95N"; + default: + return "Unsupported"; + } +} + /** * octep_device_setup() - Setup Octeon Device. * @@ -939,9 +952,9 @@ int octep_device_setup(struct octep_device *oct) switch (oct->chip_id) { case OCTEP_PCI_DEVICE_ID_CN93_PF: - dev_info(&pdev->dev, - "Setting up OCTEON CN93XX PF PASS%d.%d\n", - OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: + dev_info(&pdev->dev, "Setting up OCTEON %s PF PASS%d.%d\n", + octep_devid_to_str(oct), OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); octep_device_setup_cn93_pf(oct); break; default: diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h index 025626a61383..123ffc13754d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h @@ -21,6 +21,8 @@ #define OCTEP_PCI_DEVICE_ID_CN93_PF 0xB200 #define OCTEP_PCI_DEVICE_ID_CN93_VF 0xB203 +#define OCTEP_PCI_DEVICE_ID_CNF95N_PF 0xB400 //95N PF + #define OCTEP_MAX_QUEUES 63 #define OCTEP_MAX_IQ OCTEP_MAX_QUEUES #define OCTEP_MAX_OQ OCTEP_MAX_QUEUES
Add support for Octeon device CNF95N. CNF95N is a Octeon Fusion family product with same PCI NIC characteristics as CN93 which is currently supported by the driver. Signed-off-by: Veerasenareddy Burru <vburru@marvell.com> --- .../ethernet/marvell/octeon_ep/octep_main.c | 19 ++++++++++++++++--- .../ethernet/marvell/octeon_ep/octep_main.h | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-)