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: Doug Anderson X-Patchwork-Id: 963975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="cNnyFqmu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 421R9t59xfz9s47 for ; Fri, 31 Aug 2018 01:24:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727328AbeH3T1G (ORCPT ); Thu, 30 Aug 2018 15:27:06 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:37020 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727267AbeH3T1F (ORCPT ); Thu, 30 Aug 2018 15:27:05 -0400 Received: by mail-pf1-f194.google.com with SMTP id h69-v6so4040037pfd.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=RLXkBdFdq88wrMafE8TIWrqHoTTVvdANF7UXLqBL3PxnPyaNY5FjUs3CmOLhtLraoG NUw0ZCQ2cO21wEaOrjpaXQfttUz5p6X26ysEwruQK8697o9IFZZtXc/nq0aIvJygPXdI uX9rur7JQChUT1HVeMxfZ6w6AeNsUMsRJmj/r2uvT9+6+kdFM8ZLlaHRYecaJcObT5ic suVvfiT8DugYn4hWMr8OqtYfAsaneCPBXiBDdPI57ry1F2aBwvYiCBRLwZNJQzXt5g41 5rPuCTKztT7hI2xSpBZ3WiNaAmZWw8wv711e6Bbqz+FNA19LPTcmMl+9ru27QY1/Z7xd fhPA== X-Gm-Message-State: APzg51CUy+yKa/qd3kN/fucy5s3HPyx1HoYuGp1mBQZBP9QpjXlq0cqb gOkp8Mbt2luPyVRC97em1cVKOg== 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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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: Doug Anderson X-Patchwork-Id: 963974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MbiXVEq+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 421R9s35pMz9s3x for ; Fri, 31 Aug 2018 01:24:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727266AbeH3T1H (ORCPT ); Thu, 30 Aug 2018 15:27:07 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:46669 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727278AbeH3T1G (ORCPT ); Thu, 30 Aug 2018 15:27:06 -0400 Received: by mail-pl1-f193.google.com with SMTP id a4-v6so3975712plm.13 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=t8T0RTSaE6V0HfBs+Sd8/9Wa8H+t/KpPI8MtBKghzrOsKp43U0k4wr0/zTrGmWwBVo CAEiMQWbInnpIYYP1e3rMuuEvW0w4V1yL+X+yQhscWXbCRwNLnvpEXbkC2TqM4HO1OMD uzODUmkstH98iywsJu/GfSm71zC/4auX+r4LqcqH2Xa6VVDsibRSJVa8tolS/0T+Xjbm BEVPGRvaxavr6wUAUiZjXnj2+47C5LwdnG/1H/zR8euPkv+XrSJwe7Y8A7Jin9kwkcPD s+PXVl0A3OvlwJZovANMavM69zwfeu653z6bB78GeO6oJf63Ei5lrhFSLe7Bmf3FZj3a fx6g== X-Gm-Message-State: APzg51BKIy8Zv+7nRXAaPJVV/hiPxeIpMMkLMX53cebdF7zoB/RcUyb7 Og6o0IbJtboRjHLVy/zFG4526w== 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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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;