| Message ID | 20210814025003.2449143-2-colin.foster@in-advantage.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | add support for VSC75XX control over SPI | expand |
| Context | Check | Description |
|---|---|---|
| netdev/apply | fail | Patch does not apply to net-next |
| netdev/tree_selection | success | Clearly marked for net-next |
On Fri, Aug 13, 2021 at 07:49:54PM -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> > --- I distinctly remember giving a Reviewed-by tag for this patch in the previous series: https://patchwork.kernel.org/project/netdevbpf/patch/20210710192602.2186370-2-colin.foster@in-advantage.com/ It would be nice if you could carry them along from one series to the next so we don't have to chase you. If you use git b4 when you start working on a new version, the extra tags in the comments are downloaded and appended automatically. That is if you are not ok with manually copy-pasting them into your commit message.
On Sat, Aug 14, 2021 at 02:07:05PM +0300, Vladimir Oltean wrote: > On Fri, Aug 13, 2021 at 07:49:54PM -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> > > --- > > I distinctly remember giving a Reviewed-by tag for this patch in the > previous series: > > https://patchwork.kernel.org/project/netdevbpf/patch/20210710192602.2186370-2-colin.foster@in-advantage.com/ > > It would be nice if you could carry them along from one series to the > next so we don't have to chase you. > > If you use git b4 when you start working on a new version, the extra > tags in the comments are downloaded and appended automatically. That is > if you are not ok with manually copy-pasting them into your commit > message. Yes, you did. I'll do that next time. Forgive me, for this entire process is very much a learning experience for me.
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(-)