On Fri, Feb 10, 2023 at 10:43:51AM -0600, Rob Herring wrote: > If a device has a firmware node (DT/ACPI), and the device is marked > disabled, that is currently ignored. Add a check for this condition > and bail out creating the pci_dev. > > This assumes the config space for the device can still be accessed > because they already have by this point in order to identify the device. > > Cc: Liu Peibao <liupeibao@xxxxxxxxxxx> > Cc: Binbin Zhou <zhoubinbin@xxxxxxxxxxx> > Cc: Huacai Chen <chenhuacai@xxxxxxxxxxx> > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> Applied with Binbin's tested-by to pci/enumeration for v6.3, thanks! > --- > Please test if this works for Loongson. > --- > drivers/pci/probe.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 1779582fb500..b1d80c1d7a69 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1841,6 +1841,8 @@ int pci_setup_device(struct pci_dev *dev) > > pci_set_of_node(dev); > pci_set_acpi_fwnode(dev); > + if (dev->dev.fwnode && !fwnode_device_is_available(dev->dev.fwnode)) > + return -ENODEV; > > pci_dev_assign_slot(dev); > > -- > 2.39.1 >
