* [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error
@ 2013-03-29 9:03 Richard Genoud
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Richard Genoud @ 2013-03-29 9:03 UTC (permalink / raw)
To: Linus Walleij, Stephen Warren; +Cc: linux-kernel, Richard Genoud
As Stephen Warren pointed out, pinctrl_free_setting() was called instead
of pinmux_disable_setting() on error.
In this error code, we want to call pinmux_disable_setting() where
pinmux_enable_setting() was called.
And when pinconf_apply_setting() was called, we can't do much to undo
the pin muxing (the closest thing I can think about for "unmuxing" a pin
is muxing it as GPIO input).
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
This commit is on top of:
[PATCH 3/3] pinctrl: pinctrl_select_state: set the old_state back on error
drivers/pinctrl/core.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 714cf74..ddd9a150 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -926,7 +926,15 @@ unapply_new_state:
list_for_each_entry(setting2, &state->settings, node) {
if (&setting2->node == &setting->node)
break;
- pinctrl_free_setting(true, setting2);
+ /*
+ * All we can do here is pinmux_disable_setting.
+ * That means that some pins are muxed differently now
+ * than they were before applying the setting (We can't
+ * "unmux a pin"!), but it's not a big deal since the pins
+ * are free to be muxed by another apply_setting.
+ */
+ if (setting2->type == PIN_MAP_TYPE_MUX_GROUP)
+ pinmux_disable_setting(setting2);
}
if (old_state) {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state
2013-03-29 9:03 [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Richard Genoud
@ 2013-03-29 9:03 ` Richard Genoud
2013-03-29 16:10 ` Stephen Warren
2013-04-03 12:39 ` Linus Walleij
2013-03-29 16:09 ` [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Stephen Warren
2013-04-03 12:37 ` Linus Walleij
2 siblings, 2 replies; 6+ messages in thread
From: Richard Genoud @ 2013-03-29 9:03 UTC (permalink / raw)
To: Linus Walleij, Stephen Warren; +Cc: linux-kernel, Richard Genoud
Instead of just enabling the settings that were disabled in the 1st
loop, it's simpler to recall pinctrl_select_state with the old state.
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
drivers/pinctrl/core.c | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index ddd9a150..caf9bf9 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -937,26 +937,10 @@ unapply_new_state:
pinmux_disable_setting(setting2);
}
- if (old_state) {
- list_for_each_entry(setting, &old_state->settings, node) {
- bool found = false;
- if (setting->type != PIN_MAP_TYPE_MUX_GROUP)
- continue;
- list_for_each_entry(setting2, &state->settings, node) {
- if (setting2->type != PIN_MAP_TYPE_MUX_GROUP)
- continue;
- if (setting2->data.mux.group ==
- setting->data.mux.group) {
- found = true;
- break;
- }
- }
- if (!found)
- pinmux_enable_setting(setting);
- }
- }
+ /* There's no infinite recursive loop here because p->state is NULL */
+ if (old_state)
+ pinctrl_select_state_locked(p, old_state);
- p->state = old_state;
return ret;
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
@ 2013-03-29 16:10 ` Stephen Warren
2013-04-03 12:39 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2013-03-29 16:10 UTC (permalink / raw)
To: Richard Genoud; +Cc: Linus Walleij, Stephen Warren, linux-kernel
On 03/29/2013 03:03 AM, Richard Genoud wrote:
> Instead of just enabling the settings that were disabled in the 1st
> loop, it's simpler to recall pinctrl_select_state with the old state.
Reviewed-by: Stephen Warren <swarren@nvidia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
2013-03-29 16:10 ` Stephen Warren
@ 2013-04-03 12:39 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2013-04-03 12:39 UTC (permalink / raw)
To: Richard Genoud; +Cc: Stephen Warren, linux-kernel@vger.kernel.org
On Fri, Mar 29, 2013 at 10:03 AM, Richard Genoud
<richard.genoud@gmail.com> wrote:
> Instead of just enabling the settings that were disabled in the 1st
> loop, it's simpler to recall pinctrl_select_state with the old state.
>
> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Patch applied with Stephen's review tag.
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error
2013-03-29 9:03 [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Richard Genoud
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
@ 2013-03-29 16:09 ` Stephen Warren
2013-04-03 12:37 ` Linus Walleij
2 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2013-03-29 16:09 UTC (permalink / raw)
To: Richard Genoud; +Cc: Linus Walleij, Stephen Warren, linux-kernel
On 03/29/2013 03:03 AM, Richard Genoud wrote:
> As Stephen Warren pointed out, pinctrl_free_setting() was called instead
> of pinmux_disable_setting() on error.
> In this error code, we want to call pinmux_disable_setting() where
> pinmux_enable_setting() was called.
> And when pinconf_apply_setting() was called, we can't do much to undo
> the pin muxing (the closest thing I can think about for "unmuxing" a pin
> is muxing it as GPIO input).
That's likely typically what pinmux_disable_setting() does, or perhaps
it'll select a function for that pin/group that is guaranteed not to
conflict with any possible other mux configuration.
Reviewed-by: Stephen Warren <swarren@nvidia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error
2013-03-29 9:03 [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Richard Genoud
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
2013-03-29 16:09 ` [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Stephen Warren
@ 2013-04-03 12:37 ` Linus Walleij
2 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2013-04-03 12:37 UTC (permalink / raw)
To: Richard Genoud; +Cc: Stephen Warren, linux-kernel@vger.kernel.org
On Fri, Mar 29, 2013 at 10:03 AM, Richard Genoud
<richard.genoud@gmail.com> wrote:
> As Stephen Warren pointed out, pinctrl_free_setting() was called instead
> of pinmux_disable_setting() on error.
> In this error code, we want to call pinmux_disable_setting() where
> pinmux_enable_setting() was called.
> And when pinconf_apply_setting() was called, we can't do much to undo
> the pin muxing (the closest thing I can think about for "unmuxing" a pin
> is muxing it as GPIO input).
>
> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
> ---
> This commit is on top of:
> [PATCH 3/3] pinctrl: pinctrl_select_state: set the old_state back on error
Patch applied with Stephen's Review tag.
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-03 12:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-29 9:03 [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Richard Genoud
2013-03-29 9:03 ` [PATCH 2/2] pinctrl: simplify the re-enable old state code in pinctrl_select_state Richard Genoud
2013-03-29 16:10 ` Stephen Warren
2013-04-03 12:39 ` Linus Walleij
2013-03-29 16:09 ` [PATCH 1/2] pinctrl: select_state: don't call pinctrl_free_setting on error Stephen Warren
2013-04-03 12:37 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox