From patchwork Wed Feb 10 22:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1439242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=JYu+9KU8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DbZHr56C3z9sBy for ; Thu, 11 Feb 2021 09:31:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232692AbhBJWbv (ORCPT ); Wed, 10 Feb 2021 17:31:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232204AbhBJWbt (ORCPT ); Wed, 10 Feb 2021 17:31:49 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B565FC06174A for ; Wed, 10 Feb 2021 14:31:09 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id t2so2024860pjq.2 for ; Wed, 10 Feb 2021 14:31:09 -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=/XYPeyR2vRFmwC1dUrzuhuASZmzYtfr/DToN2nYAQ80=; b=JYu+9KU8OR3CRBu+ZQaE8wJn23ZIbkLjdlwgnV1EWOim2EUy4SoX7HUHD1uJxRfTXV cEAQtPZ5efXsYCZGY83A+0Sjs8fqSm59x5WGTrwv3CMjy/z393lM+FqP6LVc5GrmjU9N LxTVh55i/QTBVfXREXIux9blFUkBcwen//hFOoc8nSHyXEkn8YGNIAF9M+886/aQgdKl 9PV6+EBgvjqaK7+y04wwsNU9+9L8uGUeOynqlFDY4Tm+/GSV6FPm4QQ4byYJDzMZH/mT tkDgDWzygS0mkr6kPs/ypbj+izckCvEIoRlyNs7mNEUtGUCmll0JK8eufivhPQJUnJ+o Pfpg== 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=/XYPeyR2vRFmwC1dUrzuhuASZmzYtfr/DToN2nYAQ80=; b=aM5pzbfWdFtQfQJm7GX0GurKFRL4rz3Gb5Kez2ptBIonN4PkhXCzIIe086MTxbmAvO KqXuI2sik747VvYQsv+/wCQ5vE9r+wBbf6HtU3BNYOyYLV7vJX/QrsC8MsOeW4kA4ZEz YplIK6qRwIRqFN0eeqgRYE8SvrIQYfaw+HjAabeUDvMELwoxRusa/+WIbRKanjoJ9U07 TSSfsiLmHO3FcoXgXJcpPrvGXZXA//ZmQgs/nsVPzyfMmTypiWvr8uaiFXnNSicQUasn aRe9Uutegfu6GwAY2/KC2XDvgDbDI+pXBzqFVS7yUvuwsMLIHq719SIvAvqoBYb6eBr8 3eJA== X-Gm-Message-State: AOAM531uarcpbtVRINBV6uyTSHyQL+q7bKvUcmocBvX1oSVpBLD6pEYL IU5RTVnhzIThxyRdCKHQcJvz+g== X-Google-Smtp-Source: ABdhPJxi6Q1gIU2BXYaAO66vfIws12E9CsQfWvOFXnSZpcq7+bqxY2RQMhhpM15MtGl3abyExMUMgA== X-Received: by 2002:a17:90a:67ca:: with SMTP id g10mr1123718pjm.28.1612996269324; Wed, 10 Feb 2021 14:31:09 -0800 (PST) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:7b19:df69:92d6:528e]) by smtp.gmail.com with ESMTPSA id t17sm3686307pgk.25.2021.02.10.14.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:31:08 -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 , Joe Perches , Dan Carpenter Cc: Drew Fustini Subject: [PATCH v4 1/2] pinctrl: use to octal permissions for debugfs files Date: Wed, 10 Feb 2021 14:28:52 -0800 Message-Id: <20210210222851.232374-2-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210210222851.232374-1-drew@beagleboard.org> References: <20210210222851.232374-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"). Note: S_IFREG flag is added to the mode by __debugfs_create_file() in fs/debugfs/inode.c Suggested-by: Andy Shevchenko 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..02f8710afb9c 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", 0444, debugfs_root, NULL, &pinctrl_devices_fops); - debugfs_create_file("pinctrl-maps", S_IFREG | S_IRUGO, + debugfs_create_file("pinctrl-maps", 0444, debugfs_root, NULL, &pinctrl_maps_fops); - debugfs_create_file("pinctrl-handles", S_IFREG | S_IRUGO, + debugfs_create_file("pinctrl-handles", 0444, debugfs_root, NULL, &pinctrl_fops); } diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index 02c075cc010b..d9d54065472e 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", 0444, devroot, pctldev, &pinconf_pins_fops); - debugfs_create_file("pinconf-groups", S_IFREG | S_IRUGO, + debugfs_create_file("pinconf-groups", 0444, devroot, pctldev, &pinconf_groups_fops); } diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index bab888fe3f8e..c651b2db0925 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", 0444, devroot, pctldev, &pinmux_functions_fops); - debugfs_create_file("pinmux-pins", S_IFREG | S_IRUGO, + debugfs_create_file("pinmux-pins", 0444, devroot, pctldev, &pinmux_pins_fops); } From patchwork Wed Feb 10 22:28:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 1439245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=CY6W6zgF; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DbZLF6sbRz9sBy for ; Thu, 11 Feb 2021 09:33:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232164AbhBJWdk (ORCPT ); Wed, 10 Feb 2021 17:33:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232602AbhBJWdj (ORCPT ); Wed, 10 Feb 2021 17:33:39 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00566C061756 for ; Wed, 10 Feb 2021 14:32:58 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id r38so2175384pgk.13 for ; Wed, 10 Feb 2021 14:32:58 -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=VsbMCxTtdvlOFCnXGlkrpcWY7egsi5VCqOPmThmfB80=; b=CY6W6zgFQUcoGd00h6NX4x4EXPAE3mu6QeelJJW72Azjxl6Gvq+f+D/9QPRq5vvBss OG+OG6tZZtH1ASf4TezDSMAjekwt6+CG++5MameA37Q/sS7oQ/11cl7KIUq3NqIfokUR aAUqMWV86KfcJVtnZQ1aWcqOgsNemFadRvuUoZ8DQMQ9r7gIfMTHSIm60lIKbZ4XbVaV Nxe8HYGGVmXdyYG43z27O9MfUi46eEQchF43xXRAbHpv9ac5veQmEymXwQH1nV/EFtum BXtG1WoFeWM1D81tItAgO6SjT9prsitSwIAJCvh7s5NW4+b5UGtuUdCcAbyXHz3DhWTF FJnw== 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=VsbMCxTtdvlOFCnXGlkrpcWY7egsi5VCqOPmThmfB80=; b=K3Ujusjzmpewz/KGc2Kj0gzmI77bc15YHAItwglVRNnjM1yEOv8EryBP8d229pSNiO AQTZpu8BdRFkEMswcV+Pn/r4FgOozqF9zl2O5vO8Ah1EDyyWHnxHwfkHhV8K5bYlnJ+G +xAAv+azhxgU4Zu7xNvvBqniov5qWrFul1ec6/JDGyUp+MUWLUEmp3bYdU4ak77s+ED4 fBQqd2wE6Mcic2BcqApD4KtBlIFvenhBqcAsdGcEH3ADjjilgqx7cnnCsGbrcTbdaukX cTavdAZ4F9S3YF/YlxbNKgzBgqpHw8HNz8Pf4JKYZZrfFaPH4agdn+7ZCjxXbkoKLOMu 8yIg== X-Gm-Message-State: AOAM530DhlBWphGTooeGchjKfBpS3S3Lqhbfosxndfyve/5JPApLLoir I+6rB2fjQBl3RwvpLZ1bJhQQXkuW8P1y1w== X-Google-Smtp-Source: ABdhPJwkxVbtjV3jPupR3hPdBKiUdYBSkQtWEFcUA5UaFwtsgsTeqlmD5JjOYzyiDlS8THRH/9eckQ== X-Received: by 2002:a63:4d41:: with SMTP id n1mr5222989pgl.147.1612996378524; Wed, 10 Feb 2021 14:32:58 -0800 (PST) Received: from x1.hsd1.or.comcast.net ([2601:1c0:4701:ae70:7b19:df69:92d6:528e]) by smtp.gmail.com with ESMTPSA id t17sm3686307pgk.25.2021.02.10.14.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:32:57 -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 , Joe Perches , Dan Carpenter Cc: Drew Fustini Subject: [PATCH v4 2/2] pinctrl: pinmux: Add pinmux-select debugfs file Date: Wed, 10 Feb 2021 14:28:54 -0800 Message-Id: <20210210222851.232374-3-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210210222851.232374-1-drew@beagleboard.org> References: <20210210222851.232374-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 "" are written to the file. The write operation pinmux_select() handles this by checking that the names map to 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 and group pinmux-i2c1-pins: echo "pinmux-i2c1 pinmux-i2c1-pins" > pinmux-select Signed-off-by: Drew Fustini --- drivers/pinctrl/pinmux.c | 107 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index c651b2db0925..23fa32f0a067 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -673,6 +673,111 @@ 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 = kzalloc(PINMUX_MAX_NAME * 2, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + fname = kzalloc(PINMUX_MAX_NAME, GFP_KERNEL); + if (!fname) { + ret = -ENOMEM; + goto free_buf; + } + + gname = kzalloc(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_gname: + devm_kfree(pctldev->dev, gname); +free_fname: + devm_kfree(pctldev->dev, fname); +free_buf: + devm_kfree(pctldev->dev, buf); + + 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 +785,8 @@ void pinmux_init_device_debugfs(struct dentry *devroot, devroot, pctldev, &pinmux_functions_fops); debugfs_create_file("pinmux-pins", 0444, devroot, pctldev, &pinmux_pins_fops); + debugfs_create_file("pinmux-select", 0200, + devroot, pctldev, &pinmux_select_ops); } #endif /* CONFIG_DEBUG_FS */