| Message ID | 20210621165230.1.Id4ee5788c993294f66542721fca7719c00a5d8f3@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | iommu: Enable devices to request non-strict DMA, starting with QCom SD/MMC | expand |
On Mon, Jun 21, 2021 at 04:52:43PM -0700, Douglas Anderson wrote: > Right now things are a bit awkward if a driver would like a chance to > run before some of the more "automatic" things (pinctrl, DMA, IOMMUs, > ...) happen to a device. This patch aims to fix that problem by > introducing the concept of a "pre_probe" function that drivers can > implement to run before the "automatic" stuff. > > Why would you want to run before the "automatic" stuff? The incentive > in my case is that I want to be able to fill in some boolean flags in > the "struct device" before the IOMMU init runs. It appears that the > strictness vs. non-strictness of a device's iommu config is determined > once at init time and can't be changed afterwards. However, I would > like to avoid hardcoding the rules for strictness in the IOMMU > driver. Instead I'd like to let individual drivers be able to make > informed decisions about the appropriateness of strictness > vs. non-strictness. > > The desire for running code pre_probe is likely not limited to my use > case. I believe that the list "qcom_smmu_client_of_match" is hacked > into the iommu driver specifically because there was no real good > framework for this. For the existing list it wasn't _quite_ as ugly as > my needs since the decision could be made solely on compatible string, > but it still feels like it would have been better for individual > drivers to run code and setup some state rather than coding up a big > list in the IOMMU driver. > > Even without this patch, I believe it is possible for a driver to run > before the "automatic" things by registering for > "BUS_NOTIFY_BIND_DRIVER" in its init call, though I haven't personally > tested this. Using the notifier is a bit awkward, though, and I'd > rather avoid it. Also, using "BUS_NOTIFY_BIND_DRIVER" would require > drivers to stop using the convenience module_platform_driver() helper > and roll a bunch of boilerplate code. > > NOTE: the pre_probe here is listed in the driver structure. As a side > effect of this it will be passed a "struct device *" rather than the > more specific device type (like the "struct platform_device *" that > most platform devices get passed to their probe). Presumably this > won't cause trouble and it's a lot less code to write but if we need > to make it more symmetric that's also possible by touching more files. No, please please no. If a bus really wants to do crud like this, it can do it in it's own probe callback, the driver core doesn't need to mess with this. If you need to mess with iommu values in struct device, again, do that in the bus core for the devices on that specific bus, that's where those values are supposed to be set anyway, right? If the iommu drivers need to be run before a specific bus is initialized, then fix that there, the driver core does not need to care about this at all. so a big NACK on this one, sorry. greg k-h
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index ecd7cf848daf..9a13bff8dafa 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -549,10 +549,16 @@ static int really_probe(struct device *dev, struct device_driver *drv) re_probe: dev->driver = drv; + if (drv->pre_probe) { + ret = drv->pre_probe(dev); + if (ret) + goto probe_failed_pre_dma; + } + /* If using pinctrl, bind pins now before probing */ ret = pinctrl_bind_pins(dev); if (ret) - goto pinctrl_bind_failed; + goto probe_failed_pre_dma; if (dev->bus->dma_configure) { ret = dev->bus->dma_configure(dev); @@ -639,7 +645,7 @@ static int really_probe(struct device *dev, struct device_driver *drv) if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, BUS_NOTIFY_DRIVER_NOT_BOUND, dev); -pinctrl_bind_failed: +probe_failed_pre_dma: device_links_no_driver(dev); devres_release_all(dev); arch_teardown_dma_ops(dev); diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index a498ebcf4993..f7305dd6ceb1 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -57,6 +57,14 @@ enum probe_type { * @probe_type: Type of the probe (synchronous or asynchronous) to use. * @of_match_table: The open firmware table. * @acpi_match_table: The ACPI match table. + * @pre_probe: Called after a device has been bound to a driver but before + * anything "automatic" (pinctrl, DMA, IOMMUs, ...) has been + * setup. This is mostly a chance for the driver to do things + * that might need to be run before any of those automatic + * processes. The vast majority of devices don't need to + * implement this. Note that there is no "post_remove" at the + * moment. If you need to undo something that you did in + * pre_probe() you can use devres. * @probe: Called to query the existence of a specific device, * whether this driver can work with it, and bind the driver * to a specific device. @@ -105,6 +113,7 @@ struct device_driver { const struct of_device_id *of_match_table; const struct acpi_device_id *acpi_match_table; + int (*pre_probe) (struct device *dev); int (*probe) (struct device *dev); void (*sync_state)(struct device *dev); int (*remove) (struct device *dev);
Right now things are a bit awkward if a driver would like a chance to run before some of the more "automatic" things (pinctrl, DMA, IOMMUs, ...) happen to a device. This patch aims to fix that problem by introducing the concept of a "pre_probe" function that drivers can implement to run before the "automatic" stuff. Why would you want to run before the "automatic" stuff? The incentive in my case is that I want to be able to fill in some boolean flags in the "struct device" before the IOMMU init runs. It appears that the strictness vs. non-strictness of a device's iommu config is determined once at init time and can't be changed afterwards. However, I would like to avoid hardcoding the rules for strictness in the IOMMU driver. Instead I'd like to let individual drivers be able to make informed decisions about the appropriateness of strictness vs. non-strictness. The desire for running code pre_probe is likely not limited to my use case. I believe that the list "qcom_smmu_client_of_match" is hacked into the iommu driver specifically because there was no real good framework for this. For the existing list it wasn't _quite_ as ugly as my needs since the decision could be made solely on compatible string, but it still feels like it would have been better for individual drivers to run code and setup some state rather than coding up a big list in the IOMMU driver. Even without this patch, I believe it is possible for a driver to run before the "automatic" things by registering for "BUS_NOTIFY_BIND_DRIVER" in its init call, though I haven't personally tested this. Using the notifier is a bit awkward, though, and I'd rather avoid it. Also, using "BUS_NOTIFY_BIND_DRIVER" would require drivers to stop using the convenience module_platform_driver() helper and roll a bunch of boilerplate code. NOTE: the pre_probe here is listed in the driver structure. As a side effect of this it will be passed a "struct device *" rather than the more specific device type (like the "struct platform_device *" that most platform devices get passed to their probe). Presumably this won't cause trouble and it's a lot less code to write but if we need to make it more symmetric that's also possible by touching more files. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- drivers/base/dd.c | 10 ++++++++-- include/linux/device/driver.h | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-)