| Message ID | 20200706233240.3245512-1-rajatja@google.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 2194bc7c39610be7cabe7456c5f63a570604f015 |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [RESEND,v2] PCI: Add device even if driver attach failed | expand |
On Mon, Jul 06, 2020 at 04:32:40PM -0700, Rajat Jain wrote: > device_attach() returning failure indicates a driver error while trying to > probe the device. In such a scenario, the PCI device should still be added > in the system and be visible to the user. > > This patch partially reverts: > commit ab1a187bba5c ("PCI: Check device_attach() return value always") > > Signed-off-by: Rajat Jain <rajatja@google.com> > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > Resending to stable, independent from other patches per Greg's suggestion > v2: Add Greg's reviewed by, fix commit log <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
On Mon, Jul 06, 2020 at 04:32:40PM -0700, Rajat Jain wrote: > device_attach() returning failure indicates a driver error while trying to > probe the device. In such a scenario, the PCI device should still be added > in the system and be visible to the user. > > This patch partially reverts: > commit ab1a187bba5c ("PCI: Check device_attach() return value always") > > Signed-off-by: Rajat Jain <rajatja@google.com> > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > Resending to stable, independent from other patches per Greg's suggestion > v2: Add Greg's reviewed by, fix commit log Applied to pci/enumeration for v5.8 with stable tag, thanks! > drivers/pci/bus.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index 8e40b3e6da77d..3cef835b375fd 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) > > dev->match_driver = true; > retval = device_attach(&dev->dev); > - if (retval < 0 && retval != -EPROBE_DEFER) { > + if (retval < 0 && retval != -EPROBE_DEFER) > pci_warn(dev, "device attach failed (%d)\n", retval); > - pci_proc_detach_device(dev); > - pci_remove_sysfs_dev_files(dev); > - return; > - } > > pci_dev_assign_added(dev, true); > } > -- > 2.27.0.212.ge8ba1cc988-goog >
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 8e40b3e6da77d..3cef835b375fd 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) dev->match_driver = true; retval = device_attach(&dev->dev); - if (retval < 0 && retval != -EPROBE_DEFER) { + if (retval < 0 && retval != -EPROBE_DEFER) pci_warn(dev, "device attach failed (%d)\n", retval); - pci_proc_detach_device(dev); - pci_remove_sysfs_dev_files(dev); - return; - } pci_dev_assign_added(dev, true); }
device_attach() returning failure indicates a driver error while trying to probe the device. In such a scenario, the PCI device should still be added in the system and be visible to the user. This patch partially reverts: commit ab1a187bba5c ("PCI: Check device_attach() return value always") Signed-off-by: Rajat Jain <rajatja@google.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Resending to stable, independent from other patches per Greg's suggestion v2: Add Greg's reviewed by, fix commit log drivers/pci/bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)