* [PATCH] pinctrl: implement pinctrl deferred probing
@ 2012-04-10 8:04 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2012-04-10 8:04 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel
Cc: Stephen Warren, Shawn Guo, Thomas Abraham, Dong Aisheng,
Rajendra Nayak, Haojian Zhuang, Linus Walleij, Mark Brown,
Arnd Bergmann
From: Linus Walleij <linus.walleij@linaro.org>
If drivers try to obtain pinctrl handles for a pin controller that
has not yet registered to the subsystem, we need to be able to
back out and retry with deferred probing. So let's return
-EPROBE_DEFER whenever this location fails.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Documentation/pinctrl.txt | 5 +++++
drivers/pinctrl/core.c | 7 +++++--
drivers/pinctrl/devicetree.c | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index eb46b1c..4431c3e7 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -1043,6 +1043,11 @@ quickly poking some registers.
The pins are allocated for your device when you issue the pinctrl_get() call,
after this you should be able to see this in the debugfs listing of all pins.
+NOTE: the pinctrl system will return -EPROBE_DEFER if it cannot find the
+requested pinctrl handles, for example if the pinctrl driver has not yet
+registered. Thus make sure that the error path in your driver gracefully
+cleans up and is ready to retry the probing later in the startup process.
+
System pin control hogging
==========================
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 7ff8690..3ae00ab 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
dev_err(p->dev, "unknown pinctrl device %s in map entry",
map->ctrl_dev_name);
kfree(setting);
- /* Eventually, this should trigger deferred probe */
- return -ENODEV;
+ /*
+ * OK let us guess that the driver is not there yet, and
+ * let's defer obtaining this pinctrl handle to later...
+ */
+ return -EPROBE_DEFER;
}
switch (map->type) {
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index 5ef2feb..8833538 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -124,8 +124,8 @@ static int dt_to_map_one_config(struct pinctrl *p, const char *statename,
dev_err(p->dev, "could not find pctldev for node %s\n",
np_config->full_name);
of_node_put(np_pctldev);
- /* FIXME: This should trigger deferrered probe */
- return -ENODEV;
+ /* OK let's just assume this will appear later then */
+ return -EPROBE_DEFER;
}
pctldev = find_pinctrl_by_of_node(np_pctldev);
if (pctldev)
--
1.7.9.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: implement pinctrl deferred probing
@ 2012-04-10 8:04 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2012-04-10 8:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
If drivers try to obtain pinctrl handles for a pin controller that
has not yet registered to the subsystem, we need to be able to
back out and retry with deferred probing. So let's return
-EPROBE_DEFER whenever this location fails.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Documentation/pinctrl.txt | 5 +++++
drivers/pinctrl/core.c | 7 +++++--
drivers/pinctrl/devicetree.c | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index eb46b1c..4431c3e7 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -1043,6 +1043,11 @@ quickly poking some registers.
The pins are allocated for your device when you issue the pinctrl_get() call,
after this you should be able to see this in the debugfs listing of all pins.
+NOTE: the pinctrl system will return -EPROBE_DEFER if it cannot find the
+requested pinctrl handles, for example if the pinctrl driver has not yet
+registered. Thus make sure that the error path in your driver gracefully
+cleans up and is ready to retry the probing later in the startup process.
+
System pin control hogging
==========================
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 7ff8690..3ae00ab 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
dev_err(p->dev, "unknown pinctrl device %s in map entry",
map->ctrl_dev_name);
kfree(setting);
- /* Eventually, this should trigger deferred probe */
- return -ENODEV;
+ /*
+ * OK let us guess that the driver is not there yet, and
+ * let's defer obtaining this pinctrl handle to later...
+ */
+ return -EPROBE_DEFER;
}
switch (map->type) {
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index 5ef2feb..8833538 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -124,8 +124,8 @@ static int dt_to_map_one_config(struct pinctrl *p, const char *statename,
dev_err(p->dev, "could not find pctldev for node %s\n",
np_config->full_name);
of_node_put(np_pctldev);
- /* FIXME: This should trigger deferrered probe */
- return -ENODEV;
+ /* OK let's just assume this will appear later then */
+ return -EPROBE_DEFER;
}
pctldev = find_pinctrl_by_of_node(np_pctldev);
if (pctldev)
--
1.7.9.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: implement pinctrl deferred probing
2012-04-10 8:04 ` Linus Walleij
@ 2012-04-10 15:36 ` Stephen Warren
-1 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-04-10 15:36 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-kernel, linux-arm-kernel, Shawn Guo, Thomas Abraham,
Dong Aisheng, Rajendra Nayak, Haojian Zhuang, Linus Walleij,
Mark Brown, Arnd Bergmann
On 04/10/2012 02:04 AM, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> If drivers try to obtain pinctrl handles for a pin controller that
> has not yet registered to the subsystem, we need to be able to
> back out and retry with deferred probing. So let's return
> -EPROBE_DEFER whenever this location fails.
>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This looks fine, except:
> @@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
> dev_err(p->dev, "unknown pinctrl device %s in map entry",
> map->ctrl_dev_name);
Perhaps this dev_err (and the one in the other hunk) should be
downgraded to warn/info/debug?
> + /*
> + * OK let us guess that the driver is not there yet, and
> + * let's defer obtaining this pinctrl handle to later...
> + */
> + return -EPROBE_DEFER;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: implement pinctrl deferred probing
@ 2012-04-10 15:36 ` Stephen Warren
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-04-10 15:36 UTC (permalink / raw)
To: linux-arm-kernel
On 04/10/2012 02:04 AM, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> If drivers try to obtain pinctrl handles for a pin controller that
> has not yet registered to the subsystem, we need to be able to
> back out and retry with deferred probing. So let's return
> -EPROBE_DEFER whenever this location fails.
>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This looks fine, except:
> @@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
> dev_err(p->dev, "unknown pinctrl device %s in map entry",
> map->ctrl_dev_name);
Perhaps this dev_err (and the one in the other hunk) should be
downgraded to warn/info/debug?
> + /*
> + * OK let us guess that the driver is not there yet, and
> + * let's defer obtaining this pinctrl handle to later...
> + */
> + return -EPROBE_DEFER;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: implement pinctrl deferred probing
2012-04-10 15:36 ` Stephen Warren
@ 2012-04-11 8:35 ` Linus Walleij
-1 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2012-04-11 8:35 UTC (permalink / raw)
To: Stephen Warren
Cc: Linus Walleij, linux-kernel, linux-arm-kernel, Shawn Guo,
Thomas Abraham, Dong Aisheng, Rajendra Nayak, Haojian Zhuang,
Mark Brown, Arnd Bergmann
On Tue, Apr 10, 2012 at 5:36 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> @@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
>> dev_err(p->dev, "unknown pinctrl device %s in map entry",
>> map->ctrl_dev_name);
>
> Perhaps this dev_err (and the one in the other hunk) should be
> downgraded to warn/info/debug?
I've downgraded to dev_info() for now (see v2), I suspect people may have some
problems with deferred probing ATM so better log something for them. Later we
may set it to dev_dbg() if it looks too noisy...
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pinctrl: implement pinctrl deferred probing
@ 2012-04-11 8:35 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2012-04-11 8:35 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 10, 2012 at 5:36 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> @@ -521,8 +521,11 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
>> ? ? ? ? ? ? ? dev_err(p->dev, "unknown pinctrl device %s in map entry",
>> ? ? ? ? ? ? ? ? ? ? ? map->ctrl_dev_name);
>
> Perhaps this dev_err (and the one in the other hunk) should be
> downgraded to warn/info/debug?
I've downgraded to dev_info() for now (see v2), I suspect people may have some
problems with deferred probing ATM so better log something for them. Later we
may set it to dev_dbg() if it looks too noisy...
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-11 8:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-10 8:04 [PATCH] pinctrl: implement pinctrl deferred probing Linus Walleij
2012-04-10 8:04 ` Linus Walleij
2012-04-10 15:36 ` Stephen Warren
2012-04-10 15:36 ` Stephen Warren
2012-04-11 8:35 ` Linus Walleij
2012-04-11 8:35 ` Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.