| Message ID | 20210107153638.753942-4-ciorneiioana@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | dpaa2-mac: various updates | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 1 maintainers not CCed: stuyoder@gmail.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 20 this patch: 20 |
| netdev/kdoc | success | Errors and warnings before: 15 this patch: 15 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 15 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 20 this patch: 20 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 1/7/2021 5:36 PM, Ioana Ciornei wrote: > From: Ioana Ciornei <ioana.ciornei@nxp.com> > > The fsl_mc_get_endpoint() should return a pointer to the connected > fsl_mc device, if there is one. By interrogating the MC firmware, we > know if there is an endpoint or not so when the endpoint device is > actually searched on the fsl-mc bus and not found we are hitting the > case in which the device has not been yet discovered by the bus. > > Return -EPROBE_DEFER so that callers can differentiate this case. > > Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- Best Regards, Laurentiu > --- > drivers/bus/fsl-mc/fsl-mc-bus.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c > index 34811db074b7..28d5da1c011c 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-bus.c > +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c > @@ -936,6 +936,15 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev) > endpoint_desc.id = endpoint2.id; > endpoint = fsl_mc_device_lookup(&endpoint_desc, mc_bus_dev); > > + /* > + * We know that the device has an endpoint because we verified by > + * interrogating the firmware. This is the case when the device was not > + * yet discovered by the fsl-mc bus, thus the lookup returned NULL. > + * Differentiate this case by returning EPROBE_DEFER. > + */ > + if (!endpoint) > + return ERR_PTR(-EPROBE_DEFER); > + > return endpoint; > } > EXPORT_SYMBOL_GPL(fsl_mc_get_endpoint); >
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 34811db074b7..28d5da1c011c 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -936,6 +936,15 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev) endpoint_desc.id = endpoint2.id; endpoint = fsl_mc_device_lookup(&endpoint_desc, mc_bus_dev); + /* + * We know that the device has an endpoint because we verified by + * interrogating the firmware. This is the case when the device was not + * yet discovered by the fsl-mc bus, thus the lookup returned NULL. + * Differentiate this case by returning EPROBE_DEFER. + */ + if (!endpoint) + return ERR_PTR(-EPROBE_DEFER); + return endpoint; } EXPORT_SYMBOL_GPL(fsl_mc_get_endpoint);