diff mbox

pinctrl-sx150x.c broken in 4.11

Message ID 04424bd9-daba-e803-23ce-e7604bf41c71@cogentembedded.com
State New
Headers show

Commit Message

Nikita Yushchenko May 10, 2017, 7:32 p.m. UTC
Hi

Looks like recent pinctrl changes - possibly commit 99e4f67508e1
("pinctrl: core: Use delayed work for hogs") - breaks pinctrl-sx150x
driver in all setups where it has any pinctrl settings in device tree.

AFAIU, pinctrl-sx150x is not a real pinctrl/pinmux driver, but it uses
pinctrl subsystem to provide control over GPIO lines it provides.  But
for user, it is just a i2c-gpio device that is enabled via device tree,
and, like other devices, can have pinctrl-0 that points to "real" pinmux
configuration for involved hardware lines (i.e. line used for interrupt).

Problem is that when pinctrl-sx150x driver registers itself via
pinctrl_register(), pinctrl map that corresponds to pinctrl-0 property
of sx150x device tree node, is misinterpreted as hog.  Corresponding
call chain is

  pinctrl_enable() ->
    pinctrl_claim_hogs() ->
      create_pinctrl()

at this point, registered pinctrl maps are scanned and matched by device
name only, without checking map's control device. Then map is passed to
add_setting() with pctldev set to sx150x which does not provide
pinmux_ops, which errors out:

sx150x-pinctrl 10-0020: does not support mux function
sx150x-pinctrl 10-0020: could not map pin config for "VF610_PAD_PTB1"
sx150x-pinctrl 10-0020: error claiming hogs: -22
sx150x-pinctrl 10-0020: could not claim hogs: -22
sx150x-pinctrl 10-0020: Failed to register pinctrl device
sx150x-pinctrl: probe of 10-0020 failed with error -22

Before commit 99e4f67508e1 ("pinctrl: core: Use delayed work for hogs")
problem was hidden by not passing pinctrl device to add_setting(), but
instead getting that from map.


What is proper fix for this?
Maybe something like

                /*
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Linus Walleij May 11, 2017, 7:23 a.m. UTC | #1
On Wed, May 10, 2017 at 9:32 PM, Nikita Yushchenko
<nikita.yoush@cogentembedded.com> wrote:

> Looks like recent pinctrl changes - possibly commit 99e4f67508e1
> ("pinctrl: core: Use delayed work for hogs") - breaks pinctrl-sx150x
> driver in all setups where it has any pinctrl settings in device tree.
>
> AFAIU, pinctrl-sx150x is not a real pinctrl/pinmux driver,

It's as real as it gets.

> but it uses
> pinctrl subsystem to provide control over GPIO lines it provides.  But
> for user, it is just a i2c-gpio device that is enabled via device tree,
> and, like other devices, can have pinctrl-0 that points to "real" pinmux
> configuration for involved hardware lines (i.e. line used for interrupt).
>
> Problem is that when pinctrl-sx150x driver registers itself via
> pinctrl_register(), pinctrl map that corresponds to pinctrl-0 property
> of sx150x device tree node, is misinterpreted as hog.  Corresponding
> call chain is
>
>   pinctrl_enable() ->
>     pinctrl_claim_hogs() ->
>       create_pinctrl()
>
> at this point, registered pinctrl maps are scanned and matched by device
> name only, without checking map's control device. Then map is passed to
> add_setting() with pctldev set to sx150x which does not provide
> pinmux_ops, which errors out:
>
> sx150x-pinctrl 10-0020: does not support mux function
> sx150x-pinctrl 10-0020: could not map pin config for "VF610_PAD_PTB1"
> sx150x-pinctrl 10-0020: error claiming hogs: -22
> sx150x-pinctrl 10-0020: could not claim hogs: -22
> sx150x-pinctrl 10-0020: Failed to register pinctrl device
> sx150x-pinctrl: probe of 10-0020 failed with error -22
>
> Before commit 99e4f67508e1 ("pinctrl: core: Use delayed work for hogs")
> problem was hidden by not passing pinctrl device to add_setting(), but
> instead getting that from map.
>
> What is proper fix for this?

I bet Tony has the answer to this.

I think something similar to:
commit 6118714275f0a313ecc296a87ed1af32d9691bed
"pinctrl: core: Fix pinctrl_register_and_init() with pinctrl_enable()"
is needed?

Maybe we need to go over everything in drivers/pinctrl and check that
we don't have more of these broken hogs.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 32822b0d9cd0..78dde7594825 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1038,6 +1038,9 @@  static struct pinctrl *create_pinctrl(struct
device *dev,
                /* Map must be for this device */
                if (strcmp(map->dev_name, devname))
                        continue;
+               if (pctldev &&
+                   strcmp(dev_name(pctldev->dev), map->ctrl_dev_name))
+                       continue;

                ret = add_setting(p, pctldev, map);