| Message ID | 20200626002710.110200-1-rajatja@google.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [1/2] pci: Add pci device even if the driver failed to attach | expand |
On Thu, Jun 25, 2020 at 05:27:09PM -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> > --- > 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; > - } Nice catch, sysfs stuff shouldn't be dependant if a driver is bound to a device or not. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nit: when you update these patches, can you run "git log --oneline drivers/pci/bus.c" and make your subject lines match the convention? E.g., PCI: Add device even if driver attach failed On Thu, Jun 25, 2020 at 05:27:09PM -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. Nit: please wrap logs to fill 75 characters. "git log" adds 4 spaces at the beginning, so 75+4 still fits nicely in 80 columns without wrapping. > This patch partially reverts: > commit ab1a187bba5c ("PCI: Check device_attach() return value always") > > Signed-off-by: Rajat Jain <rajatja@google.com> > --- > 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); Thanks for catching my bug! > - return; > - } > > pci_dev_assign_added(dev, true); > } > -- > 2.27.0.212.ge8ba1cc988-goog >
On Fri, Jun 26, 2020 at 8:39 AM Bjorn Helgaas <helgaas@kernel.org> wrote: > > Nit: when you update these patches, can you run "git log --oneline > drivers/pci/bus.c" and make your subject lines match the convention? Sorry, will do. > E.g., > > PCI: Add device even if driver attach failed > > On Thu, Jun 25, 2020 at 05:27:09PM -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. > > Nit: please wrap logs to fill 75 characters. "git log" adds 4 spaces > at the beginning, so 75+4 still fits nicely in 80 columns without > wrapping. Sorry, will do. > > > This patch partially reverts: > > commit ab1a187bba5c ("PCI: Check device_attach() return value always") > > > > Signed-off-by: Rajat Jain <rajatja@google.com> > > --- > > 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); > > Thanks for catching my bug! > > > - 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> --- drivers/pci/bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)