On Mon, 4 May 2020 at 19:55, Michael Walle <mich...@walle.cc> wrote: > > If there is no specific configuration of the felix switch in the device > tree, but only the default configuration (ie. given by the SoCs dtsi > file), the probe fails because no CPU port has been set. On the other > hand you cannot set a default CPU port because that depends on the > actual board using the switch. > > [ 2.701300] DSA: tree 0 has no CPU port > [ 2.705167] mscc_felix 0000:00:00.5: Failed to register DSA switch: -22 > [ 2.711844] mscc_felix: probe of 0000:00:00.5 failed with error -22 > > Thus let the device tree disable this device entirely, like it is also > done with the enetc driver of the same SoC. > > Signed-off-by: Michael Walle <mich...@walle.cc> > ---
Reviewed-by: Vladimir Oltean <vladimir.olt...@nxp.com> > This was part of a two patch series. The second patch is already merged. > This patch was never picked up, although it was Acked-by: David Miller, > see: > https://lore.kernel.org/netdev/20200314.205335.907987569817755804.da...@davemloft.net/ > > Since there is no more dependency, this patch could go through the > net-next queue. > > drivers/net/dsa/ocelot/felix.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c > index 69546383a382..531c7710063f 100644 > --- a/drivers/net/dsa/ocelot/felix.c > +++ b/drivers/net/dsa/ocelot/felix.c > @@ -699,6 +699,11 @@ static int felix_pci_probe(struct pci_dev *pdev, > struct felix *felix; > int err; > > + if (pdev->dev.of_node && !of_device_is_available(pdev->dev.of_node)) { > + dev_info(&pdev->dev, "device is disabled, skipping\n"); > + return -ENODEV; > + } > + > err = pci_enable_device(pdev); > if (err) { > dev_err(&pdev->dev, "device enable failed\n"); > -- > 2.20.1 > Thanks, Michael! -Vladimir
