| Message ID | 20220622215912.550419-2-saravanak@google.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix console probe delay due to fw_devlink | expand |
On Wed, Jun 22, 2022 at 02:59:10PM -0700, Saravana Kannan wrote: > When firmware sets the FWNODE_FLAG_BEST_EFFORT flag for a fwnode, > fw_devlink will do a best effort ordering for that device where it'll > only enforce the probe/suspend/resume ordering of that device with > suppliers that have drivers. The driver of that device can then decide > if it wants to defer probe or probe without the suppliers. > > This will be useful for avoid probe delays of the console device that > were caused by commit 71066545b48e ("driver core: Set > fw_devlink.strict=1 by default"). > > Fixes: 71066545b48e ("driver core: Set fw_devlink.strict=1 by default") > Reported-by: Sascha Hauer <sha@pengutronix.de> > Reported-by: Peng Fan <peng.fan@nxp.com> > Signed-off-by: Saravana Kannan <saravanak@google.com> > --- > drivers/base/core.c | 3 ++- > include/linux/fwnode.h | 4 ++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index 839f64485a55..61edd18b7bf3 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -968,7 +968,8 @@ static void device_links_missing_supplier(struct device *dev) > > static bool dev_is_best_effort(struct device *dev) > { > - return fw_devlink_best_effort && dev->can_match; > + return (fw_devlink_best_effort && dev->can_match) || > + dev->fwnode->flags & FWNODE_FLAG_BEST_EFFORT; Check for dev->fwnode first. I am running in a NULL pointer exception here for a device that doesn't have a fwnode. Sascha
On Wed, Jun 22, 2022 at 11:50 PM Sascha Hauer <sha@pengutronix.de> wrote: > > On Wed, Jun 22, 2022 at 02:59:10PM -0700, Saravana Kannan wrote: > > When firmware sets the FWNODE_FLAG_BEST_EFFORT flag for a fwnode, > > fw_devlink will do a best effort ordering for that device where it'll > > only enforce the probe/suspend/resume ordering of that device with > > suppliers that have drivers. The driver of that device can then decide > > if it wants to defer probe or probe without the suppliers. > > > > This will be useful for avoid probe delays of the console device that > > were caused by commit 71066545b48e ("driver core: Set > > fw_devlink.strict=1 by default"). > > > > Fixes: 71066545b48e ("driver core: Set fw_devlink.strict=1 by default") > > Reported-by: Sascha Hauer <sha@pengutronix.de> > > Reported-by: Peng Fan <peng.fan@nxp.com> > > Signed-off-by: Saravana Kannan <saravanak@google.com> > > --- > > drivers/base/core.c | 3 ++- > > include/linux/fwnode.h | 4 ++++ > > 2 files changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/base/core.c b/drivers/base/core.c > > index 839f64485a55..61edd18b7bf3 100644 > > --- a/drivers/base/core.c > > +++ b/drivers/base/core.c > > @@ -968,7 +968,8 @@ static void device_links_missing_supplier(struct device *dev) > > > > static bool dev_is_best_effort(struct device *dev) > > { > > - return fw_devlink_best_effort && dev->can_match; > > + return (fw_devlink_best_effort && dev->can_match) || > > + dev->fwnode->flags & FWNODE_FLAG_BEST_EFFORT; > > Check for dev->fwnode first. I am running in a NULL pointer exception > here for a device that doesn't have a fwnode. Oops. Fixed and sent out a v2. -Saravana
diff --git a/drivers/base/core.c b/drivers/base/core.c index 839f64485a55..61edd18b7bf3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -968,7 +968,8 @@ static void device_links_missing_supplier(struct device *dev) static bool dev_is_best_effort(struct device *dev) { - return fw_devlink_best_effort && dev->can_match; + return (fw_devlink_best_effort && dev->can_match) || + dev->fwnode->flags & FWNODE_FLAG_BEST_EFFORT; } /** diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index 9a81c4410b9f..89b9bdfca925 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -27,11 +27,15 @@ struct device; * driver needs its child devices to be bound with * their respective drivers as soon as they are * added. + * BEST_EFFORT: The fwnode/device needs to probe early and might be missing some + * suppliers. Only enforce ordering with suppliers that have + * drivers. */ #define FWNODE_FLAG_LINKS_ADDED BIT(0) #define FWNODE_FLAG_NOT_DEVICE BIT(1) #define FWNODE_FLAG_INITIALIZED BIT(2) #define FWNODE_FLAG_NEEDS_CHILD_BOUND_ON_ADD BIT(3) +#define FWNODE_FLAG_BEST_EFFORT BIT(4) struct fwnode_handle { struct fwnode_handle *secondary;
When firmware sets the FWNODE_FLAG_BEST_EFFORT flag for a fwnode, fw_devlink will do a best effort ordering for that device where it'll only enforce the probe/suspend/resume ordering of that device with suppliers that have drivers. The driver of that device can then decide if it wants to defer probe or probe without the suppliers. This will be useful for avoid probe delays of the console device that were caused by commit 71066545b48e ("driver core: Set fw_devlink.strict=1 by default"). Fixes: 71066545b48e ("driver core: Set fw_devlink.strict=1 by default") Reported-by: Sascha Hauer <sha@pengutronix.de> Reported-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Saravana Kannan <saravanak@google.com> --- drivers/base/core.c | 3 ++- include/linux/fwnode.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-)