lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 256/757] pinctrl: devicetree: Keep deferring even on timeout
    Date
    From: Thierry Reding <treding@nvidia.com>

    [ Upstream commit 84f28fc38d2ff99e2ac623325ba37809da611b8e ]

    driver_deferred_probe_check_state() may return -ETIMEDOUT instead of
    -EPROBE_DEFER after all built-in drivers have been probed. This can
    cause issues for built-in drivers that depend on resources provided by
    loadable modules.

    One such case happens on Tegra where I2C controllers are used during
    early boot to set up the system PMIC, so the I2C driver needs to be a
    built-in driver. At the same time, some instances of the I2C controller
    depend on the DPAUX hardware for pinmuxing. Since the DPAUX is handled
    by the display driver, which is usually not built-in, the pin control
    states will not become available until after the root filesystem has
    been mounted and the display driver loaded from it.

    Fixes: bec6c0ecb243 ("pinctrl: Remove use of driver_deferred_probe_check_state_continue()")
    Suggested-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Link: https://lore.kernel.org/r/20200825143348.1358679-1-thierry.reding@gmail.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/devicetree.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
    index 5eff8c2965528..3fb2387147189 100644
    --- a/drivers/pinctrl/devicetree.c
    +++ b/drivers/pinctrl/devicetree.c
    @@ -130,9 +130,8 @@ static int dt_to_map_one_config(struct pinctrl *p,
    if (!np_pctldev || of_node_is_root(np_pctldev)) {
    of_node_put(np_pctldev);
    ret = driver_deferred_probe_check_state(p->dev);
    - /* keep deferring if modules are enabled unless we've timed out */
    - if (IS_ENABLED(CONFIG_MODULES) && !allow_default &&
    - (ret == -ENODEV))
    + /* keep deferring if modules are enabled */
    + if (IS_ENABLED(CONFIG_MODULES) && !allow_default && ret < 0)
    ret = -EPROBE_DEFER;
    return ret;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:4.036 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site