From patchwork Thu Aug 30 15:23:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 10582067 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70C9B5A4 for ; Thu, 30 Aug 2018 15:24:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F38A2BD87 for ; Thu, 30 Aug 2018 15:24:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 524D72C051; Thu, 30 Aug 2018 15:24:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF6BF2BD87 for ; Thu, 30 Aug 2018 15:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbeH3T1F (ORCPT ); Thu, 30 Aug 2018 15:27:05 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:37538 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727268AbeH3T1F (ORCPT ); Thu, 30 Aug 2018 15:27:05 -0400 Received: by mail-pg1-f193.google.com with SMTP id 2-v6so3518046pgo.4 for ; Thu, 30 Aug 2018 08:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2nCfGAEYg662uKFkRNSQGhytc709+nZ6xKaZn3HXieI=; b=cNnyFqmuwkGeBkME7G9FJHJtK7iTzwGGqAlNIyPBrFZdmHSr7FjvQU9JfvklfMSpH2 LTFer7BF06/LWnuPzdpsdroxQKBR+GQDvPItXB9Z9kB0J32eLymElOKdHchylF+bIr3m thdpeHGxXVQTDWPVn+0D0BoFsnUK3ycj8pYo4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2nCfGAEYg662uKFkRNSQGhytc709+nZ6xKaZn3HXieI=; b=k45HNdqkdoa8Q4bVBYMtpfPXzhbSRC5hQ5Gt5h7DHwO8bXIf3wQuEq/zK4OrBA6be/ aY6T2LgnYOHk7EGSKNn2lGlHiVHvF6C8JbzGOAZdkwqgBGOBbiz7w5G2k2IF56kVuK+y 9FdGY4f+rRpDqZbaxYBRLv2k140yOJ2rM4f5MOZ2JLbTGo3yb1rqC1/2/v4qDfirRlCK gjtIatZy+8CiB9DL7VFKnlCxK2aR73t+wiQjBVco0fhP1tGZdQoqo2ncMgS4a2o2BL5j aBiNYakkn0i7om10E4c/iDAVoL7qij6U4joLDBz3+lNWY/7kIuN4ZttBt6bv2TSVtq2z WRwQ== X-Gm-Message-State: APzg51A9ohvAcCGDhU72HoCm/R1Bzh6b/nGyFTpNh61qd+2yzj0/yHzQ nmalJNRkrE2hNZELTJianOM1nA== X-Google-Smtp-Source: ANB0VdbR7a40ZCk3tK8x72d7bjxEUcB/WwX2/a89Iu5pN3YvtcWhtKI6LpWnfjZIG1PywL01xoM6Tw== X-Received: by 2002:a65:4384:: with SMTP id m4-v6mr10145903pgp.265.1535642664362; Thu, 30 Aug 2018 08:24:24 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id d9-v6sm24143920pfb.86.2018.08.30.08.24.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 08:24:23 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson , Linus Walleij Cc: "Ivan T . Ivanov" , Stephen Boyd , Douglas Anderson , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [RFT PATCH 1/2] pinctrl: ssbi-gpio: Fix pm8xxx_pin_config_get() to be compliant Date: Thu, 30 Aug 2018 08:23:38 -0700 Message-Id: <20180830152340.242249-2-dianders@chromium.org> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog In-Reply-To: <20180830152340.242249-1-dianders@chromium.org> References: <20180830152340.242249-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If you look at "pinconf-groups" in debugfs for ssbi-gpio you'll notice it looks like nonsense. The problem is fairly well described in commit 1cf86bc21257 ("pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant") and commit 05e0c828955c ("pinctrl: msm: Fix msm_config_group_get() to be compliant"), but it was pointed out that ssbi-gpio has the same problem. Let's fix it there too. Fixes: b4c45fe974bc ("pinctrl: qcom: ssbi: Family A gpio & mpp drivers") Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 28 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c index f53e32a9d8fc..0e153bae322e 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c @@ -260,22 +260,32 @@ static int pm8xxx_pin_config_get(struct pinctrl_dev *pctldev, switch (param) { case PIN_CONFIG_BIAS_DISABLE: - arg = pin->bias == PM8XXX_GPIO_BIAS_NP; + if (pin->bias != PM8XXX_GPIO_BIAS_NP) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_PULL_DOWN: - arg = pin->bias == PM8XXX_GPIO_BIAS_PD; + if (pin->bias != PM8XXX_GPIO_BIAS_PD) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_PULL_UP: - arg = pin->bias <= PM8XXX_GPIO_BIAS_PU_1P5_30; + if (pin->bias > PM8XXX_GPIO_BIAS_PU_1P5_30) + return -EINVAL; + arg = 1; break; case PM8XXX_QCOM_PULL_UP_STRENGTH: arg = pin->pull_up_strength; break; case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: - arg = pin->disable; + if (!pin->disable) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_INPUT_ENABLE: - arg = pin->mode == PM8XXX_GPIO_MODE_INPUT; + if (pin->mode != PM8XXX_GPIO_MODE_INPUT) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_OUTPUT: if (pin->mode & PM8XXX_GPIO_MODE_OUTPUT) @@ -290,10 +300,14 @@ static int pm8xxx_pin_config_get(struct pinctrl_dev *pctldev, arg = pin->output_strength; break; case PIN_CONFIG_DRIVE_PUSH_PULL: - arg = !pin->open_drain; + if (pin->open_drain) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_DRIVE_OPEN_DRAIN: - arg = pin->open_drain; + if (!pin->open_drain) + return -EINVAL; + arg = 1; break; default: return -EINVAL; From patchwork Thu Aug 30 15:23:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 10582069 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61A8D14BD for ; Thu, 30 Aug 2018 15:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 525302C051 for ; Thu, 30 Aug 2018 15:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 465962C05E; Thu, 30 Aug 2018 15:24:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAE322C06E for ; Thu, 30 Aug 2018 15:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727342AbeH3T1H (ORCPT ); Thu, 30 Aug 2018 15:27:07 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:39643 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727281AbeH3T1G (ORCPT ); Thu, 30 Aug 2018 15:27:06 -0400 Received: by mail-pl1-f194.google.com with SMTP id w14-v6so3992305plp.6 for ; Thu, 30 Aug 2018 08:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nfd4mgtcfrWuh22yEBdlW/suOzMsLpXBjQSAKha/OE8=; b=MbiXVEq+i13aoquXjjTGCZnWQHk1k32+UoTFmiQkG0SwvaoVTTFuy7iiMOO7QVZUvD tDHnN/Xv5apiKL3oV7GZUF+WhUw4AecOSzg7tatH05erHWPfcVyPN5Js8En9Sj2e3C3e jplxzgp5tf0Cug5BvhqzRhLVAgHBBhVcHIzXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nfd4mgtcfrWuh22yEBdlW/suOzMsLpXBjQSAKha/OE8=; b=aitxmCM5wCrO/awWbLgPajLpwhYEzR0PF7bH7khWKmBNfxitTbybSHNyFunmtI6zlV IUJtY2lNV1MJxUlzFdecnkd69I02dxLQApV5rjrfm0kkFuA27vq8UITJl7Y5EQevZbUv FFYArbVQ6HQ634S7CGNKhqxwsIWagxCRzFJRYSgcHnuiSRTHXkiJNTnUrFEApPJ9fOTH YVpe3g5r3tO7T90BIRI8kLJwdEbNgmYptd8KIqCc36oZipXl54dqvB40Tw5Z+ecugaL7 fjI6axe5jFbR7LM04/hZ5jIU6+UvMT4S0Ym586ZYLTb65FWlg2j3hTIANgNAbih+b/UL whjA== X-Gm-Message-State: APzg51AGwVBdinDHcromt3fhUB3tdMsjlzyWMs71bOcIvfLALJK7Vfaq +xaA7YeDFKTKEH7WDG6YHOwQfQ== X-Google-Smtp-Source: ANB0VdbjCrq5fggCLa8OR9CaTM/rlrtswX3LqIdx+rvk+VNm4xUeezY4xxgrfgKcS/gZnfWQyce03w== X-Received: by 2002:a17:902:900c:: with SMTP id a12-v6mr10735370plp.61.1535642665656; Thu, 30 Aug 2018 08:24:25 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id d9-v6sm24143920pfb.86.2018.08.30.08.24.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 08:24:24 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson , Linus Walleij Cc: "Ivan T . Ivanov" , Stephen Boyd , Douglas Anderson , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [RFT PATCH 2/2] pinctrl: spmi-mpp: Fix pmic_mpp_config_get() to be compliant Date: Thu, 30 Aug 2018 08:23:39 -0700 Message-Id: <20180830152340.242249-3-dianders@chromium.org> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog In-Reply-To: <20180830152340.242249-1-dianders@chromium.org> References: <20180830152340.242249-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If you look at "pinconf-groups" in debugfs for ssbi-mpp you'll notice it looks like nonsense. The problem is fairly well described in commit 1cf86bc21257 ("pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant") and commit 05e0c828955c ("pinctrl: msm: Fix msm_config_group_get() to be compliant"), but it was pointed out that ssbi-mpp has the same problem. Let's fix it there too. NOTE: in case it's helpful to someone reading this, the way to tell whether to do the -EINVAL or not is to look at the PCONFDUMP for a given attribute. If the last element (has_arg) is false then you need to do the -EINVAL trick. ALSO NOTE: it seems unlikely that the values returned when we try to get PIN_CONFIG_BIAS_PULL_UP will actually be printed since "has_arg" is false for that one, but I guess it's still fine to return different values so I kept doing that. It seems like another driver (ssbi-gpio) uses a custom attribute (PM8XXX_QCOM_PULL_UP_STRENGTH) for something similar so maybe a future change should do that here too. Fixes: cfb24f6ebd38 ("pinctrl: Qualcomm SPMI PMIC MPP pin controller driver") Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c index 6556dbeae65e..ce2950ffd525 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c @@ -343,13 +343,12 @@ static int pmic_mpp_config_get(struct pinctrl_dev *pctldev, switch (param) { case PIN_CONFIG_BIAS_DISABLE: - arg = pad->pullup == PMIC_MPP_PULL_UP_OPEN; + if (pad->pullup != PMIC_MPP_PULL_UP_OPEN) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_BIAS_PULL_UP: switch (pad->pullup) { - case PMIC_MPP_PULL_UP_OPEN: - arg = 0; - break; case PMIC_MPP_PULL_UP_0P6KOHM: arg = 600; break; @@ -364,13 +363,17 @@ static int pmic_mpp_config_get(struct pinctrl_dev *pctldev, } break; case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: - arg = !pad->is_enabled; + if (pad->is_enabled) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_POWER_SOURCE: arg = pad->power_source; break; case PIN_CONFIG_INPUT_ENABLE: - arg = pad->input_enabled; + if (!pad->input_enabled) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_OUTPUT: arg = pad->out_value; @@ -382,7 +385,9 @@ static int pmic_mpp_config_get(struct pinctrl_dev *pctldev, arg = pad->amux_input; break; case PMIC_MPP_CONF_PAIRED: - arg = pad->paired; + if (!pad->paired) + return -EINVAL; + arg = 1; break; case PIN_CONFIG_DRIVE_STRENGTH: arg = pad->drive_strength;