| Message ID | 20210710192602.2186370-2-colin.foster@in-advantage.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for VSC7511-7514 chips over SPI | expand |
On Sat, Jul 10, 2021 at 12:25:55PM -0700, Colin Foster wrote: > The pci_bar variables for the switch and imdio don't make sense for the > generic felix driver. Moving them to felix_vsc9959 to limit scope and > simplify the felix_info struct. > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Just one comment below. > drivers/net/dsa/ocelot/felix.h | 2 -- > drivers/net/dsa/ocelot/felix_vsc9959.c | 11 +++++------ > 2 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h > index 4d96cad815d5..47769dd386db 100644 > --- a/drivers/net/dsa/ocelot/felix.h > +++ b/drivers/net/dsa/ocelot/felix.h > @@ -20,8 +20,6 @@ struct felix_info { > int num_ports; > int num_tx_queues; > struct vcap_props *vcap; > - int switch_pci_bar; > - int imdio_pci_bar; > const struct ptp_clock_info *ptp_caps; > > /* Some Ocelot switches are integrated into the SoC without the > diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c > index f966a253d1c7..182ca749c8e2 100644 > --- a/drivers/net/dsa/ocelot/felix_vsc9959.c > +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c > @@ -1359,8 +1359,6 @@ static const struct felix_info felix_info_vsc9959 = { > .num_mact_rows = 2048, > .num_ports = 6, > .num_tx_queues = OCELOT_NUM_TC, > - .switch_pci_bar = 4, > - .imdio_pci_bar = 0, > .quirk_no_xtr_irq = true, > .ptp_caps = &vsc9959_ptp_caps, > .mdio_bus_alloc = vsc9959_mdio_bus_alloc, > @@ -1388,6 +1386,9 @@ static irqreturn_t felix_irq_handler(int irq, void *data) > return IRQ_HANDLED; > } > > +#define VSC9959_SWITCH_PCI_BAR 4 > +#define VSC9959_IMDIO_PCI_BAR 0 > + I would prefer these to be declared right below #define VSC9959_TAS_GCL_ENTRY_MAX 63 and aligned with it
On Sat, Jul 10, 2021 at 10:53:18PM +0300, Vladimir Oltean wrote: > On Sat, Jul 10, 2021 at 12:25:55PM -0700, Colin Foster wrote: > > The pci_bar variables for the switch and imdio don't make sense for the > > generic felix driver. Moving them to felix_vsc9959 to limit scope and > > simplify the felix_info struct. > > > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > > --- > > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > Just one comment below. > > > drivers/net/dsa/ocelot/felix.h | 2 -- > > drivers/net/dsa/ocelot/felix_vsc9959.c | 11 +++++------ > > 2 files changed, 5 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h > > index 4d96cad815d5..47769dd386db 100644 > > --- a/drivers/net/dsa/ocelot/felix.h > > +++ b/drivers/net/dsa/ocelot/felix.h > > @@ -20,8 +20,6 @@ struct felix_info { > > int num_ports; > > int num_tx_queues; > > struct vcap_props *vcap; > > - int switch_pci_bar; > > - int imdio_pci_bar; > > const struct ptp_clock_info *ptp_caps; > > > > /* Some Ocelot switches are integrated into the SoC without the > > diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c > > index f966a253d1c7..182ca749c8e2 100644 > > --- a/drivers/net/dsa/ocelot/felix_vsc9959.c > > +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c > > @@ -1359,8 +1359,6 @@ static const struct felix_info felix_info_vsc9959 = { > > .num_mact_rows = 2048, > > .num_ports = 6, > > .num_tx_queues = OCELOT_NUM_TC, > > - .switch_pci_bar = 4, > > - .imdio_pci_bar = 0, > > .quirk_no_xtr_irq = true, > > .ptp_caps = &vsc9959_ptp_caps, > > .mdio_bus_alloc = vsc9959_mdio_bus_alloc, > > @@ -1388,6 +1386,9 @@ static irqreturn_t felix_irq_handler(int irq, void *data) > > return IRQ_HANDLED; > > } > > > > +#define VSC9959_SWITCH_PCI_BAR 4 > > +#define VSC9959_IMDIO_PCI_BAR 0 > > + > > I would prefer these to be declared right below > > #define VSC9959_TAS_GCL_ENTRY_MAX 63 > > and aligned with it Done
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h index 4d96cad815d5..47769dd386db 100644 --- a/drivers/net/dsa/ocelot/felix.h +++ b/drivers/net/dsa/ocelot/felix.h @@ -20,8 +20,6 @@ struct felix_info { int num_ports; int num_tx_queues; struct vcap_props *vcap; - int switch_pci_bar; - int imdio_pci_bar; const struct ptp_clock_info *ptp_caps; /* Some Ocelot switches are integrated into the SoC without the diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c index f966a253d1c7..182ca749c8e2 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -1359,8 +1359,6 @@ static const struct felix_info felix_info_vsc9959 = { .num_mact_rows = 2048, .num_ports = 6, .num_tx_queues = OCELOT_NUM_TC, - .switch_pci_bar = 4, - .imdio_pci_bar = 0, .quirk_no_xtr_irq = true, .ptp_caps = &vsc9959_ptp_caps, .mdio_bus_alloc = vsc9959_mdio_bus_alloc, @@ -1388,6 +1386,9 @@ static irqreturn_t felix_irq_handler(int irq, void *data) return IRQ_HANDLED; } +#define VSC9959_SWITCH_PCI_BAR 4 +#define VSC9959_IMDIO_PCI_BAR 0 + static int felix_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -1419,10 +1420,8 @@ static int felix_pci_probe(struct pci_dev *pdev, ocelot->dev = &pdev->dev; ocelot->num_flooding_pgids = OCELOT_NUM_TC; felix->info = &felix_info_vsc9959; - felix->switch_base = pci_resource_start(pdev, - felix->info->switch_pci_bar); - felix->imdio_base = pci_resource_start(pdev, - felix->info->imdio_pci_bar); + felix->switch_base = pci_resource_start(pdev, VSC9959_SWITCH_PCI_BAR); + felix->imdio_base = pci_resource_start(pdev, VSC9959_IMDIO_PCI_BAR); pci_set_master(pdev);
The pci_bar variables for the switch and imdio don't make sense for the generic felix driver. Moving them to felix_vsc9959 to limit scope and simplify the felix_info struct. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> --- drivers/net/dsa/ocelot/felix.h | 2 -- drivers/net/dsa/ocelot/felix_vsc9959.c | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-)