From patchwork Wed Feb 10 07:49:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 380479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0320AC433DB for ; Wed, 10 Feb 2021 07:51:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEC5664E30 for ; Wed, 10 Feb 2021 07:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232968AbhBJHvi (ORCPT ); Wed, 10 Feb 2021 02:51:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232927AbhBJHvW (ORCPT ); Wed, 10 Feb 2021 02:51:22 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3F4BC0613D6 for ; Tue, 9 Feb 2021 23:50:41 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id b8so732839plh.12 for ; Tue, 09 Feb 2021 23:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rBkqkZTd5g9iMpheqnnUlGoR1nH7kXohQFG15Ej9IvU=; b=AUxr9dYSK65v0KhZ89C0z56tmdMSZYJOxt1oncONInfyHwDhNqMUNFxvNMKMjl06Np qa63EmhI+yIK+bATCe8ESWDSluJvRMKrAkVnZVgPDyc9Qu6HSIOR+XQWnFwX9uq0gE/0 mPottdu94hroAEIwnbltsnoOhx0u06q/FXhco/39hHBQzgCydMadUCt3Tr62B75XFqMU UnYUbHg6Z5tXxKDP30NdeSlsxvTplaS9BX7OhFPDvlNDr4oR27GVcBtj2xS7GJJGj4m5 rDnM0VOJIW/YXCO8LYx75PIfUP5qASxk6t3LpuY7zmR/vY69eq2lwr3tFrM7PHkAmwfo 1m7A== 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=rBkqkZTd5g9iMpheqnnUlGoR1nH7kXohQFG15Ej9IvU=; b=eO4f+AAIu8RD+tsrnC9zla0Hu8xAXrc28dh/shFzVgc5evmNcavHhGJ9a+4loc7JOi FizFsb5oWH8BgrE1B1JYeRac4kZ1OAGzTS1emKXbfTW6VP/ieSc3V33G5P9XrZtOzw68 uYGScV7zeNlS0oONnjhBMfMq4Aks9X/gdM5Ps3wEABC8zYW6ipg/AQUk+liK5MjZUNrh GSzqgHAD+HZh+/VA7vcXRgV9g+dv5oElpGffbMkYKs0jjRiAmwgbwPchzKw4yP419qHr PMSatFz6c5+8kM6tKNiibdOfjvhgTcEZAPykzMqy1HM0lO2BDxNtbkV+eUig9uvNcVnu SqVA== X-Gm-Message-State: AOAM532r4zarZIpvzddIRuD692dTYt2j3usZAR80EzQc8WQuR43PoKjh MHDPHgcvC0/GObB8WCKlLDbXeQ== X-Google-Smtp-Source: ABdhPJwfji02qAR4wJ8zRnPfrA1z+mEoNfqUrVfCc7Ut8CGf05a9allZfdSKg8liwjf9BQG3KGEMLg== X-Received: by 2002:a17:90b:4a02:: with SMTP id kk2mr1945395pjb.115.1612943441296; Tue, 09 Feb 2021 23:50:41 -0800 (PST) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:7b19:df69:92d6:528e]) by smtp.gmail.com with ESMTPSA id b25sm1261710pfp.26.2021.02.09.23.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 23:50:40 -0800 (PST) From: Drew Fustini To: Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren , Andy Shevchenko , Alexandre Belloni , Geert Uytterhoeven , Pantelis Antoniou , Jason Kridner , Robert Nelson Cc: Drew Fustini Subject: [PATCH v2 1/2] pinctrl: use to octal permissions for debugfs files Date: Tue, 9 Feb 2021 23:49:46 -0800 Message-Id: <20210210074946.155417-2-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210210074946.155417-1-drew@beagleboard.org> References: <20210210074946.155417-1-drew@beagleboard.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Switch over pinctrl debugfs files to use octal permissions as they are preferred over symbolic permissions. Refer to commit f90774e1fd27 ("checkpatch: look for symbolic permissions and suggest octal instead"). Signed-off-by: Drew Fustini --- drivers/pinctrl/core.c | 6 +++--- drivers/pinctrl/pinconf.c | 4 ++-- drivers/pinctrl/pinmux.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 3663d87f51a0..c9c28f653799 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1914,11 +1914,11 @@ static void pinctrl_init_debugfs(void) return; } - debugfs_create_file("pinctrl-devices", S_IFREG | S_IRUGO, + debugfs_create_file("pinctrl-devices", 0400, debugfs_root, NULL, &pinctrl_devices_fops); - debugfs_create_file("pinctrl-maps", S_IFREG | S_IRUGO, + debugfs_create_file("pinctrl-maps", 0400, debugfs_root, NULL, &pinctrl_maps_fops); - debugfs_create_file("pinctrl-handles", S_IFREG | S_IRUGO, + debugfs_create_file("pinctrl-handles", 0400, debugfs_root, NULL, &pinctrl_fops); } diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index 02c075cc010b..f005921bb49e 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c @@ -370,9 +370,9 @@ DEFINE_SHOW_ATTRIBUTE(pinconf_groups); void pinconf_init_device_debugfs(struct dentry *devroot, struct pinctrl_dev *pctldev) { - debugfs_create_file("pinconf-pins", S_IFREG | S_IRUGO, + debugfs_create_file("pinconf-pins", 0400, devroot, pctldev, &pinconf_pins_fops); - debugfs_create_file("pinconf-groups", S_IFREG | S_IRUGO, + debugfs_create_file("pinconf-groups", 0400, devroot, pctldev, &pinconf_groups_fops); } diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index bab888fe3f8e..7f6190eaedbb 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -676,9 +676,9 @@ DEFINE_SHOW_ATTRIBUTE(pinmux_pins); void pinmux_init_device_debugfs(struct dentry *devroot, struct pinctrl_dev *pctldev) { - debugfs_create_file("pinmux-functions", S_IFREG | S_IRUGO, + debugfs_create_file("pinmux-functions", 0400, devroot, pctldev, &pinmux_functions_fops); - debugfs_create_file("pinmux-pins", S_IFREG | S_IRUGO, + debugfs_create_file("pinmux-pins", 0400, devroot, pctldev, &pinmux_pins_fops); } From patchwork Wed Feb 10 07:49:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 381336 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50979C433E0 for ; Wed, 10 Feb 2021 07:51:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D68964E2E for ; Wed, 10 Feb 2021 07:51:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbhBJHvq (ORCPT ); Wed, 10 Feb 2021 02:51:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233011AbhBJHvX (ORCPT ); Wed, 10 Feb 2021 02:51:23 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34910C06178A for ; Tue, 9 Feb 2021 23:50:43 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id 8so738764plc.10 for ; Tue, 09 Feb 2021 23:50:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=naMFlYH6UhpEHmxz8VEooRy+MFEkCdlTQ0W0MTZJ7X4=; b=pE+etDMi+lgK9jmZte9q0cGLwj+h3PK29yLX+ClA/x/LI8kv6b6PPNWZPhYcqzpsFx KfAMYgQUYhgUi7VF2AIHVwgrtLwzv2Ufq63Zo5vdzI3aj+ySoYnm3FnQMka81ZGBJPqf 7vJG0ONhhGD71IFc8N2ByEwmdwChzZtF90qAt/giypuFvWD8Bewyw+I/tb9D8AxI8FL5 lE9Yxe1PCAMGf0/OHTZoV+nA5zfCv3BHcOqjW275N33xo/PQ+0peoM+syLh+lkL1YikN O3iUqd9tm3MSX3aapxGkog9QFJLdG+PvV45JXmGkxoxiyfMS9LTahPNpVwjZs73IZMfA YwSQ== 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=naMFlYH6UhpEHmxz8VEooRy+MFEkCdlTQ0W0MTZJ7X4=; b=d5wv9SJBfGWSJWwAWlJPB1sSyewN9AHyYMtBGdXLfwtpmcxhO0nq2d7RRI+YVLvL9Q cLBub51rM7H0449O5CEK8fIMlkWi22GFk22nwbMGPPEdHlbNhyHcRWZWlv5mdY8e7UNa AD5zBTjxcsMaBXz4+Xbf/BWazAKOKCC/KdHTm5HORIXXHfjDEXrQsFx9P112O6HgBdUX Mrhel7p6ijoT07DgXF7FzTqdKHCmvtP8d0aKJ+dB1oob/CAqx7ieTpoyPz4zF+zR8AS/ 6Yklbjka4WYl9w9Az3U568RvtMZi1N9evd9oDF4hQDeFd+MdW9HDeYqI+BzX0y58qQpT goXw== X-Gm-Message-State: AOAM5326cXi10DlbnYQAX+ySgZd8DV/f/HtdnhJxzgt0V4YnKGvz6HVi ab+aIJ7WEsMpOHhAXfVlyfCo5A== X-Google-Smtp-Source: ABdhPJzU1TbjG7FA2zFcbiny6Opf8oep9SSpoWE65laH/UwIwPU28PZ1LvRbpS++r0Iz25E2eUpW5Q== X-Received: by 2002:a17:90a:7404:: with SMTP id a4mr1877586pjg.167.1612943442715; Tue, 09 Feb 2021 23:50:42 -0800 (PST) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:7b19:df69:92d6:528e]) by smtp.gmail.com with ESMTPSA id b25sm1261710pfp.26.2021.02.09.23.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 23:50:42 -0800 (PST) From: Drew Fustini To: Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren , Andy Shevchenko , Alexandre Belloni , Geert Uytterhoeven , Pantelis Antoniou , Jason Kridner , Robert Nelson Cc: Drew Fustini Subject: [PATCH v2 2/2] pinctrl: pinmux: Add pinmux-select debugfs file Date: Tue, 9 Feb 2021 23:49:47 -0800 Message-Id: <20210210074946.155417-3-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210210074946.155417-1-drew@beagleboard.org> References: <20210210074946.155417-1-drew@beagleboard.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add "pinmux-select" to debugfs which will activate a function and group when 2 integers " " are written to the file. The write operation pinmux_select() handles this by checking if fsel and gsel are valid selectors and then calling ops->set_mux(). The existing "pinmux-functions" debugfs file lists the pin functions registered for the pin controller. For example: function: pinmux-uart0, groups = [ pinmux-uart0-pins ] function: pinmux-mmc0, groups = [ pinmux-mmc0-pins ] function: pinmux-mmc1, groups = [ pinmux-mmc1-pins ] function: pinmux-i2c0, groups = [ pinmux-i2c0-pins ] function: pinmux-i2c1, groups = [ pinmux-i2c1-pins ] function: pinmux-spi1, groups = [ pinmux-spi1-pins ] To activate function pinmux-i2c1 (fsel 4) and group pinmux-i2c1-pins (gsel 4): echo '4 4' > pinmux-select Signed-off-by: Drew Fustini --- drivers/pinctrl/pinmux.c | 106 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 7f6190eaedbb..b8cd0c3bedf7 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -673,6 +673,110 @@ void pinmux_show_setting(struct seq_file *s, DEFINE_SHOW_ATTRIBUTE(pinmux_functions); DEFINE_SHOW_ATTRIBUTE(pinmux_pins); + +#define PINMUX_MAX_NAME 64 +static ssize_t pinmux_select(struct file *file, const char __user *user_buf, + size_t len, loff_t *ppos) +{ + struct seq_file *sfile = file->private_data; + struct pinctrl_dev *pctldev = sfile->private; + const struct pinmux_ops *pmxops = pctldev->desc->pmxops; + const char *const *groups; + char *buf, *fname, *gname; + unsigned int num_groups; + int fsel, gsel, ret; + + if (len > (PINMUX_MAX_NAME * 2)) { + dev_err(pctldev->dev, "write too big for buffer"); + return -EINVAL; + } + + buf = devm_kzalloc(pctldev->dev, PINMUX_MAX_NAME * 2, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + fname = devm_kzalloc(pctldev->dev, PINMUX_MAX_NAME, GFP_KERNEL); + if (!fname) { + ret = -ENOMEM; + goto free_buf; + } + + gname = devm_kzalloc(pctldev->dev, PINMUX_MAX_NAME, GFP_KERNEL); + if (!buf) { + ret = -ENOMEM; + goto free_fname; + } + + ret = strncpy_from_user(buf, user_buf, PINMUX_MAX_NAME * 2); + if (ret < 0) { + dev_err(pctldev->dev, "failed to copy buffer from userspace"); + goto free_gname; + } + buf[len-1] = '\0'; + + ret = sscanf(buf, "%s %s", fname, gname); + if (ret != 2) { + dev_err(pctldev->dev, "expected format: "); + goto free_gname; + } + + fsel = pinmux_func_name_to_selector(pctldev, fname); + if (fsel < 0) { + dev_err(pctldev->dev, "invalid function %s in map table\n", fname); + ret = -EINVAL; + goto free_gname; + } + + ret = pmxops->get_function_groups(pctldev, fsel, &groups, &num_groups); + if (ret) { + dev_err(pctldev->dev, "no groups for function %d (%s)", fsel, fname); + goto free_gname; + + } + + ret = match_string(groups, num_groups, gname); + if (ret < 0) { + dev_err(pctldev->dev, "invalid group %s", gname); + goto free_gname; + } + + ret = pinctrl_get_group_selector(pctldev, gname); + if (ret < 0) { + dev_err(pctldev->dev, "failed to get group selectorL %s", gname); + goto free_gname; + } + gsel = ret; + + ret = pmxops->set_mux(pctldev, fsel, gsel); + if (ret) { + dev_err(pctldev->dev, "set_mux() failed: %d", ret); + goto free_gname; + } + + return len; +free_buf: + devm_kfree(pctldev->dev, buf); +free_fname: + devm_kfree(pctldev->dev, fname); +free_gname: + devm_kfree(pctldev->dev, gname); + return ret; +} + +static int pinmux_select_open(struct inode *inode, struct file *file) +{ + return single_open(file, NULL, inode->i_private); +} + +static const struct file_operations pinmux_select_ops = { + .owner = THIS_MODULE, + .open = pinmux_select_open, + .read = seq_read, + .write = pinmux_select, + .llseek = no_llseek, + .release = single_release, +}; + void pinmux_init_device_debugfs(struct dentry *devroot, struct pinctrl_dev *pctldev) { @@ -680,6 +784,8 @@ void pinmux_init_device_debugfs(struct dentry *devroot, devroot, pctldev, &pinmux_functions_fops); debugfs_create_file("pinmux-pins", 0400, devroot, pctldev, &pinmux_pins_fops); + debugfs_create_file("pinmux-select", 0200, + devroot, pctldev, &pinmux_select_ops); } #endif /* CONFIG_DEBUG_FS */