On Sat, Aug 07, 2021 at 11:26:45AM +0200, Uwe Kleine-König wrote: > On Fri, Aug 06, 2021 at 04:24:52PM -0500, Bjorn Helgaas wrote: > > On Fri, Aug 06, 2021 at 08:46:23AM +0200, Uwe Kleine-König wrote: > > > On Thu, Aug 05, 2021 at 06:42:34PM -0500, Bjorn Helgaas wrote: > > > > > > I looked at all the bus_type.probe() methods, it looks like pci_dev is > > > > not the only offender here. At least the following also have a driver > > > > pointer in the device struct: > > > > > > > > parisc_device.driver > > > > acpi_device.driver > > > > dio_dev.driver > > > > hid_device.driver > > > > pci_dev.driver > > > > pnp_dev.driver > > > > rio_dev.driver > > > > zorro_dev.driver > > > > > > Right, when I converted zorro_dev it was pointed out that the code was > > > copied from pci and the latter has the same construct. :-) > > > See > > > https://lore.kernel.org/r/20210730191035.1455248-5-u.kleine-koenig@xxxxxxxxxxxxxx > > > for the patch, I don't find where pci was pointed out, maybe it was on > > > irc only. > > > > Oh, thanks! I looked to see if you'd done something similar > > elsewhere, but I missed this one. > > > > > > Looking through the places that care about pci_dev.driver (the ones > > > > updated by patch 5/6), many of them are ... a little dubious to begin > > > > with. A few need the "struct pci_error_handlers *err_handler" > > > > pointer, so that's probably legitimate. But many just need a name, > > > > and should probably be using dev_driver_string() instead. > > > > > > Yeah, I considered adding a function to get the driver name from a > > > pci_dev and a function to get the error handlers. Maybe it's an idea to > > > introduce these two and then use to_pci_driver(pdev->dev.driver) for the > > > few remaining users? Maybe doing that on top of my current series makes > > > sense to have a clean switch from pdev->driver to pdev->dev.driver?! > > > > I'd propose using dev_driver_string() for these places: > > > > eeh_driver_name() (could change callers to use dev_driver_string()) > > bcma_host_pci_probe() > > qm_alloc_uacce() > > hns3_get_drvinfo() > > prestera_pci_probe() > > mlxsw_pci_probe() > > nfp_get_drvinfo() > > ssb_pcihost_probe() > > So the idea is: > > PCI: Simplify pci_device_remove() > PCI: Drop useless check from pci_device_probe() > xen/pci: Drop some checks that are always true > > are kept as is as preparation. (Do you want to take them from this v2, > or should I include them again in v3?) Easiest if you include them until we merge the series. > Then convert the list of functions above to use dev_driver_string() in a > 4th patch. > > > The use in mpt_device_driver_register() looks unnecessary: it's only > > to get a struct pci_device_id *, which is passed to ->probe() > > functions that don't need it. > > This is patch #5. > > > The use in adf_enable_aer() looks wrong: it sets the err_handler > > pointer in one of the adf_driver structs. I think those structs > > should be basically immutable, and the drivers that call > > adf_enable_aer() from their .probe() methods should set > > ".err_handler = &adf_err_handler" in their static adf_driver > > definitions instead. > > I don't understand that one without some research, probably this yields > at least one patch. Yeah, it's a little messy because you'd have to make adf_err_handler non-static and add an extern for it. Sample below. > > I think that basically leaves these: > > > > uncore_pci_probe() # .id_table, custom driver "registration" > > match_id() # .id_table, arch/x86/kernel/probe_roms.c > > xhci_pci_quirks() # .id_table > > pci_error_handlers() # roll-your-own AER handling, drivers/misc/cxl/guest.c > > > > I think it would be fine to use to_pci_driver(pdev->dev.driver) for > > these few. > > Converting these will be patch 7 then and patch 8 can then drop the > duplicated handling. > > Sounds reasonable? Sounds good to me. Thanks for working on this! Bjorn diff --git a/drivers/crypto/qat/qat_4xxx/adf_drv.c b/drivers/crypto/qat/qat_4xxx/adf_drv.c index a8805c815d16..75e6c5540523 100644 --- a/drivers/crypto/qat/qat_4xxx/adf_drv.c +++ b/drivers/crypto/qat/qat_4xxx/adf_drv.c @@ -310,6 +310,7 @@ static struct pci_driver adf_driver = { .probe = adf_probe, .remove = adf_remove, .sriov_configure = adf_sriov_configure, + .err_handler = adf_err_handler, }; module_pci_driver(adf_driver); diff --git a/drivers/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/qat/qat_common/adf_aer.c index d2ae293d0df6..701c3c5f8b9b 100644 --- a/drivers/crypto/qat/qat_common/adf_aer.c +++ b/drivers/crypto/qat/qat_common/adf_aer.c @@ -166,7 +166,7 @@ static void adf_resume(struct pci_dev *pdev) dev_info(&pdev->dev, "Device is up and running\n"); } -static const struct pci_error_handlers adf_err_handler = { +const struct pci_error_handlers adf_err_handler = { .error_detected = adf_error_detected, .slot_reset = adf_slot_reset, .resume = adf_resume, @@ -187,7 +187,6 @@ int adf_enable_aer(struct adf_accel_dev *accel_dev) struct pci_dev *pdev = accel_to_pci_dev(accel_dev); struct pci_driver *pdrv = pdev->driver; - pdrv->err_handler = &adf_err_handler; pci_enable_pcie_error_reporting(pdev); return 0; } diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h index c61476553728..98a29e0b8769 100644 --- a/drivers/crypto/qat/qat_common/adf_common_drv.h +++ b/drivers/crypto/qat/qat_common/adf_common_drv.h @@ -95,6 +95,7 @@ void adf_ae_fw_release(struct adf_accel_dev *accel_dev); int adf_ae_start(struct adf_accel_dev *accel_dev); int adf_ae_stop(struct adf_accel_dev *accel_dev); +extern const struct pci_error_handlers adf_err_handler; int adf_enable_aer(struct adf_accel_dev *accel_dev); void adf_disable_aer(struct adf_accel_dev *accel_dev); void adf_reset_sbr(struct adf_accel_dev *accel_dev);
