From patchwork Mon Jul 2 22:59: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: 10502649 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.web.codeaurora.org (Postfix) with ESMTP id B684560284 for ; Mon, 2 Jul 2018 23:01:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A715C28CEE for ; Mon, 2 Jul 2018 23:01:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B3F328D28; Mon, 2 Jul 2018 23:01:01 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 33C5828D12 for ; Mon, 2 Jul 2018 23:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932213AbeGBXAq (ORCPT ); Mon, 2 Jul 2018 19:00:46 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:38635 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932701AbeGBXAF (ORCPT ); Mon, 2 Jul 2018 19:00:05 -0400 Received: by mail-pl0-f67.google.com with SMTP id d10-v6so24593plo.5 for ; Mon, 02 Jul 2018 16:00:05 -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; bh=+LqYyoehxMdLQtWTxTW7y/oqkNi8bd7AMQyVF2BQAQY=; b=I6ZCiaUuDwrL4hI5biTHnkDDiOXwemMbtegfugYYPej4xZqmsyrgDDEOqYVDfbzkUQ il4UIn3EiNBoWkVSO1CafWpTdbbbrKzV4UiKTpZRCNdtsBP9kZ8SAywD3W7VkjgVSamE zgkZwRmTZq68cG4TJLZ2DEWGGYrcPKmaogL64= 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; bh=+LqYyoehxMdLQtWTxTW7y/oqkNi8bd7AMQyVF2BQAQY=; b=b7mK1Wu42am+cl2tpHUNg8pdqUXMDjTvrzlMbk6P35rljuvMB8BWfZmHoXeMZZhBUE w/2NG9hMbe3l3G5aBNgtNpORIxtkaaNZyYsQYlJoDG+sFQnRb7SHc6nuv9Y6avb2P1EJ 5pDk/jQBbvY0cbsfjuUwfsI9y6fe6smmpzlfpJjz+Kd3JIP0GOmfAIphMsrca41WEHQD bxXTy/OhU41b/PIVvrLEJecz2Rsn5Sm7dfrvEHzTHNgX7FWPvULGs7xFPL4Soh8w51RL 69pEoHdO1loCVth2DKXFKjFN+VSiDR7kpXCmfoy/AWH7KxjubV5M+QdPB0CDyHegOKXL wffg== X-Gm-Message-State: APt69E2pnAWQaH8oaCAtQG4CyX5FskimPhOKkY0QveYJ/869YVkM465H TgQtOIkiJePwWBO0aKvksa0OTg== X-Google-Smtp-Source: ADUXVKK50cPWtyO1yJ3srLpRda1/sOw6yJ2m7iHxJureUoOxJGqeaVXrDBYmD54n7gF8pxHhH63ozw== X-Received: by 2002:a17:902:b81:: with SMTP id 1-v6mr27978847plr.164.1530572404784; Mon, 02 Jul 2018 16:00:04 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:0:1000:1501:38e4:86fe:ec0c:4007]) by smtp.gmail.com with ESMTPSA id v66-v6sm18878027pfb.84.2018.07.02.16.00.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 16:00:03 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson , Linus Walleij Cc: iivanov@mm-sol.com, swboyd@chromium.org, Douglas Anderson , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/3] pinctrl: msm: Fix msm_config_group_get() to be compliant Date: Mon, 2 Jul 2018 15:59:38 -0700 Message-Id: <20180702225939.109169-2-dianders@chromium.org> X-Mailer: git-send-email 2.18.0.399.gad0ab374a1-goog In-Reply-To: <20180702225939.109169-1-dianders@chromium.org> References: <20180702225939.109169-1-dianders@chromium.org> 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 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 --- drivers/pinctrl/qcom/pinctrl-msm.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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);