| Message ID | 20180702225939.109169-2-dianders@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] pinctrl: Document pin_config_group_get() return codes like pin_config_get() | expand |
On Tue, Jul 3, 2018 at 1:00 AM Douglas Anderson <dianders@chromium.org> wrote: > If you do this on an sdm845 board: > cat /sys/kernel/debug/pinctrl/3400000.pinctrl/pinconf-groups > > ...it looks like nonsense. For every pin you see listed: > input bias bus hold, input bias disabled, input bias pull down, input bias pull up > > That's because msm_config_group_get() isn't complying with the rules > that pinconf_generic_dump_one() expects. Specifically for boolean > parameters (anything with a "struct pin_config_item" where has_arg is > false) the function expects that the function should return its value > not through the "config" parameter but should return "0" if the value > is set and "-EINVAL" if the value isn't set. > > Let's fix this. > > From a quick sample of other pinctrl drivers, it appears to be > tradition to also return 1 through the config parameter for these > boolean parameters when they exist. I'm not one to knock tradition, > so I'll follow tradition and return 1 in these cases. While I'm at > it, I'll also continue searching for four leaf clovers, kocking on > wood three times, and trying not to break mirrors. > > Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver") > Signed-off-by: Douglas Anderson <dianders@chromium.org> Looks solid to me so patch applied, unless Bjorn has objections it stays in. 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 --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 0e22f52b2a19..2155a30c282b 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -250,22 +250,30 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, /* Convert register value to pinconf value */ switch (param) { case PIN_CONFIG_BIAS_DISABLE: - arg = arg == MSM_NO_PULL; + if (arg != MSM_NO_PULL) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_PULL_DOWN: - arg = arg == MSM_PULL_DOWN; + if (arg != MSM_PULL_DOWN) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_BUS_HOLD: if (pctrl->soc->pull_no_keeper) return -ENOTSUPP; - arg = arg == MSM_KEEPER; + if (arg != MSM_KEEPER) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_PULL_UP: if (pctrl->soc->pull_no_keeper) arg = arg == MSM_PULL_UP_NO_KEEPER; else arg = arg == MSM_PULL_UP; + if (!arg) + return -EINVAL; break; case PIN_CONFIG_DRIVE_STRENGTH: arg = msm_regval_to_drive(arg);
If you do this on an sdm845 board: cat /sys/kernel/debug/pinctrl/3400000.pinctrl/pinconf-groups ...it looks like nonsense. For every pin you see listed: input bias bus hold, input bias disabled, input bias pull down, input bias pull up That's because msm_config_group_get() isn't complying with the rules that pinconf_generic_dump_one() expects. Specifically for boolean parameters (anything with a "struct pin_config_item" where has_arg is false) the function expects that the function should return its value not through the "config" parameter but should return "0" if the value is set and "-EINVAL" if the value isn't set. Let's fix this. From a quick sample of other pinctrl drivers, it appears to be tradition to also return 1 through the config parameter for these boolean parameters when they exist. I'm not one to knock tradition, so I'll follow tradition and return 1 in these cases. While I'm at it, I'll also continue searching for four leaf clovers, kocking on wood three times, and trying not to break mirrors. Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- drivers/pinctrl/qcom/pinctrl-msm.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)