Message ID | 20200918010730.2911234-9-olteanv@gmail.com |
---|---|
State | Superseded |
Delegated to: | David Miller |
Headers | show |
Series | Bugfixes in Microsemi Ocelot switch driver | expand |
On 9/17/2020 6:07 PM, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Currently mscc_ocelot_init_ports() will skip initializing a port when it > doesn't have a phy-handle, so the ocelot->ports[port] pointer will be > NULL. Take this into consideration when tearing down the driver, and add > a new function ocelot_deinit_port() to the switch library, mirror of > ocelot_init_port(), which needs to be called by the driver for all ports > it has initialized. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On 18/09/2020 04:07:30+0300, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Currently mscc_ocelot_init_ports() will skip initializing a port when it > doesn't have a phy-handle, so the ocelot->ports[port] pointer will be > NULL. Take this into consideration when tearing down the driver, and add > a new function ocelot_deinit_port() to the switch library, mirror of > ocelot_init_port(), which needs to be called by the driver for all ports > it has initialized. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Tested-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > Changes in v2: > Patch is new. > > drivers/net/dsa/ocelot/felix.c | 3 +++ > drivers/net/ethernet/mscc/ocelot.c | 16 ++++++++-------- > drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 ++ > include/soc/mscc/ocelot.h | 1 + > 4 files changed, 14 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c > index f7b43f8d56ed..64939ee14648 100644 > --- a/drivers/net/dsa/ocelot/felix.c > +++ b/drivers/net/dsa/ocelot/felix.c > @@ -624,10 +624,13 @@ static void felix_teardown(struct dsa_switch *ds) > { > struct ocelot *ocelot = ds->priv; > struct felix *felix = ocelot_to_felix(ocelot); > + int port; > > if (felix->info->mdio_bus_free) > felix->info->mdio_bus_free(ocelot); > > + for (port = 0; port < ocelot->num_phys_ports; port++) > + ocelot_deinit_port(ocelot, port); > ocelot_deinit_timestamp(ocelot); > /* stop workqueue thread */ > ocelot_deinit(ocelot); > diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c > index 83eb7c325061..8518e1d60da4 100644 > --- a/drivers/net/ethernet/mscc/ocelot.c > +++ b/drivers/net/ethernet/mscc/ocelot.c > @@ -1550,18 +1550,18 @@ EXPORT_SYMBOL(ocelot_init); > > void ocelot_deinit(struct ocelot *ocelot) > { > - struct ocelot_port *port; > - int i; > - > cancel_delayed_work(&ocelot->stats_work); > destroy_workqueue(ocelot->stats_queue); > mutex_destroy(&ocelot->stats_lock); > - > - for (i = 0; i < ocelot->num_phys_ports; i++) { > - port = ocelot->ports[i]; > - skb_queue_purge(&port->tx_skbs); > - } > } > EXPORT_SYMBOL(ocelot_deinit); > > +void ocelot_deinit_port(struct ocelot *ocelot, int port) > +{ > + struct ocelot_port *ocelot_port = ocelot->ports[port]; > + > + skb_queue_purge(&ocelot_port->tx_skbs); > +} > +EXPORT_SYMBOL(ocelot_deinit_port); > + > MODULE_LICENSE("Dual MIT/GPL"); > diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c > index 252c49b5f22b..e02fb8bfab63 100644 > --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c > +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c > @@ -908,6 +908,8 @@ static void mscc_ocelot_release_ports(struct ocelot *ocelot) > if (!ocelot_port) > continue; > > + ocelot_deinit_port(ocelot, port); > + > priv = container_of(ocelot_port, struct ocelot_port_private, > port); > > diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h > index 4521dd602ddc..0ac4e7fba086 100644 > --- a/include/soc/mscc/ocelot.h > +++ b/include/soc/mscc/ocelot.h > @@ -678,6 +678,7 @@ void ocelot_configure_cpu(struct ocelot *ocelot, int npi, > int ocelot_init(struct ocelot *ocelot); > void ocelot_deinit(struct ocelot *ocelot); > void ocelot_init_port(struct ocelot *ocelot, int port); > +void ocelot_deinit_port(struct ocelot *ocelot, int port); > > /* DSA callbacks */ > void ocelot_port_enable(struct ocelot *ocelot, int port, > -- > 2.25.1 >
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index f7b43f8d56ed..64939ee14648 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -624,10 +624,13 @@ static void felix_teardown(struct dsa_switch *ds) { struct ocelot *ocelot = ds->priv; struct felix *felix = ocelot_to_felix(ocelot); + int port; if (felix->info->mdio_bus_free) felix->info->mdio_bus_free(ocelot); + for (port = 0; port < ocelot->num_phys_ports; port++) + ocelot_deinit_port(ocelot, port); ocelot_deinit_timestamp(ocelot); /* stop workqueue thread */ ocelot_deinit(ocelot); diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 83eb7c325061..8518e1d60da4 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1550,18 +1550,18 @@ EXPORT_SYMBOL(ocelot_init); void ocelot_deinit(struct ocelot *ocelot) { - struct ocelot_port *port; - int i; - cancel_delayed_work(&ocelot->stats_work); destroy_workqueue(ocelot->stats_queue); mutex_destroy(&ocelot->stats_lock); - - for (i = 0; i < ocelot->num_phys_ports; i++) { - port = ocelot->ports[i]; - skb_queue_purge(&port->tx_skbs); - } } EXPORT_SYMBOL(ocelot_deinit); +void ocelot_deinit_port(struct ocelot *ocelot, int port) +{ + struct ocelot_port *ocelot_port = ocelot->ports[port]; + + skb_queue_purge(&ocelot_port->tx_skbs); +} +EXPORT_SYMBOL(ocelot_deinit_port); + MODULE_LICENSE("Dual MIT/GPL"); diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c index 252c49b5f22b..e02fb8bfab63 100644 --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c @@ -908,6 +908,8 @@ static void mscc_ocelot_release_ports(struct ocelot *ocelot) if (!ocelot_port) continue; + ocelot_deinit_port(ocelot, port); + priv = container_of(ocelot_port, struct ocelot_port_private, port); diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index 4521dd602ddc..0ac4e7fba086 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -678,6 +678,7 @@ void ocelot_configure_cpu(struct ocelot *ocelot, int npi, int ocelot_init(struct ocelot *ocelot); void ocelot_deinit(struct ocelot *ocelot); void ocelot_init_port(struct ocelot *ocelot, int port); +void ocelot_deinit_port(struct ocelot *ocelot, int port); /* DSA callbacks */ void ocelot_port_enable(struct ocelot *ocelot, int port,