| Message ID | 1445502750-22672-4-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Thu, Oct 22, 2015 at 10:32:27AM +0200, Linus Walleij wrote: > - Hotpluggable GPIO controllers can come and go, as this > kind of problem has been know to userspace for character .. has been known .. -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 22, 2015 at 10:32:27AM +0200, Linus Walleij wrote: > +/** > + * struct gpiochip_info - Information about a certain GPIO chip > + * @name: the name of this GPIO chip > + * @lines: number of GPIO lines on this chip > + */ > +struct gpiochip_info { > + char name[32]; To be pendantic, s/char/__u8/ Otherwise, looks good, but I don't see the read/write protocol here, is that in a later patch? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 22, 2015 at 10:32:27AM +0200, Linus Walleij wrote: > + if (cmd == GPIO_GET_CHIPINFO_IOCTL) { > + return 0; > + } > + return -EINVAL; A switch statement might be more scalable as more ioctl()s are added?
Hi, Linus On 10/22/2015 04:32 PM, Linus Walleij wrote: > A new chardev that is to be used for userspace GPIO access is [...] > diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h > new file mode 100644 > index 000000000000..3188a87bdaa0 > --- /dev/null > +++ b/include/uapi/linux/gpio.h > @@ -0,0 +1,28 @@ > +/* > + * <linux/gpio.h> - userspace ABI for the GPIO character devices > + * > + * Copyright (C) 2015 Linus Walleij > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + */ > +#ifndef _UAPI_GPIO_H_ > +#define _UAPI_GPIO_H_ > + > +#include <linux/ioctl.h> > +#include <linux/types.h> > + > +/** > + * struct gpiochip_info - Information about a certain GPIO chip > + * @name: the name of this GPIO chip > + * @lines: number of GPIO lines on this chip > + */ > +struct gpiochip_info { > + char name[32]; > + __u32 lines; > +}; > + > +#define GPIO_GET_CHIPINFO_IOCTL _IOR('o', 0x01, struct gpiochip_info) I am trying to use this interface to do my gpio mockup test. I need to list all the gpiochips attach to one gpio driver(aka gpio-mockup, there may be more than one gpio drivers in the system). And then test some of the pin of each gpio_chip. From the api(ioctl GPIO_GET_CHIPINFO_IOCTL: gpiochip_info), it seems that I could list all the gpiochips or list only one gpiochip. But I could not list gpiochip belongs to one gpio driver. Do I understand correctly? Will we add a new api to do it? Regards Bamvor > + > +#endif /* _UAPI_GPIO_H_ */ > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Oct 24, 2015 at 2:30 AM, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > On Thu, Oct 22, 2015 at 10:32:27AM +0200, Linus Walleij wrote: >> +/** >> + * struct gpiochip_info - Information about a certain GPIO chip >> + * @name: the name of this GPIO chip >> + * @lines: number of GPIO lines on this chip >> + */ >> +struct gpiochip_info { >> + char name[32]; > > To be pendantic, s/char/__u8/ Thanks, will fix. > Otherwise, looks good, but I don't see the read/write protocol here, is > that in a later patch? I wanted to get the very basic infrastructure in place first so we can then add a careful selection of ioctl():s one by one. get/set is delicate as I want to be able to handle reading/switching multiple lines at once from day one as that reduce context switching nicely, and we also have .set_multiple() in the driver backend for select chips. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 27, 2016 at 11:05 AM, Bamvor Zhang Jian <bamvor.zhangjian@linaro.org> wrote: > From the api(ioctl GPIO_GET_CHIPINFO_IOCTL: gpiochip_info), it seems > that I could list all the gpiochips or list only one gpiochip. But > I could not list gpiochip belongs to one gpio driver. I think you can get that information from parsing sysfs? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Linus On 01/28/2016 07:14 PM, Linus Walleij wrote: > On Wed, Jan 27, 2016 at 11:05 AM, Bamvor Zhang Jian > <bamvor.zhangjian@linaro.org> wrote: > >> From the api(ioctl GPIO_GET_CHIPINFO_IOCTL: gpiochip_info), it seems >> that I could list all the gpiochips or list only one gpiochip. But >> I could not list gpiochip belongs to one gpio driver. > > I think you can get that information from parsing sysfs? Yeap, I could get the directory: "/sys/devices/platform/gpio-mockup/gpio/" I notice that you mark the sysfs ABI as obsolete in these series. I am not sure whether it is reasonable to read it from syfs when using chardev. Regars Bamvor > > Yours, > Linus Walleij > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 29, 2016 at 11:24 AM, Bamvor Zhang Jian <bamvor.zhangjian@linaro.org> wrote: > On 01/28/2016 07:14 PM, Linus Walleij wrote: >> On Wed, Jan 27, 2016 at 11:05 AM, Bamvor Zhang Jian >> <bamvor.zhangjian@linaro.org> wrote: >> >>> From the api(ioctl GPIO_GET_CHIPINFO_IOCTL: gpiochip_info), it seems >>> that I could list all the gpiochips or list only one gpiochip. But >>> I could not list gpiochip belongs to one gpio driver. >> >> I think you can get that information from parsing sysfs? > Yeap, I could get the directory: > "/sys/devices/platform/gpio-mockup/gpio/" > > I notice that you mark the sysfs ABI as obsolete in these series. I > am not sure whether it is reasonable to read it from syfs when using > chardev. They can probably be used in parallel. I don't have a Kconfig option for the chardev, it is always turned on, so as to make people use it. I even consider putting nasty stuff in dmesg and the boot crawl for people using the sysfs at some point. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/MAINTAINERS b/MAINTAINERS index 274f85405584..4a12cd019511 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4646,6 +4646,7 @@ F: drivers/gpio/ F: include/linux/gpio/ F: include/linux/gpio.h F: include/asm-generic/gpio.h +F: include/uapi/linux/gpio.h GRE DEMULTIPLEXER DRIVER M: Dmitry Kozlov <xeb@mail.ru> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7861791657b5..15c58956a2d0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -17,6 +17,10 @@ #include <linux/gpio/machine.h> #include <linux/pinctrl/consumer.h> #include <linux/idr.h> +#include <linux/cdev.h> +#include <linux/fs.h> +#include <linux/uaccess.h> +#include <uapi/linux/gpio.h> #include "gpiolib.h" @@ -45,6 +49,11 @@ /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); +static dev_t gpio_devt; +#define GPIO_DEV_MAX 256 /* 256 GPIO chip devices supported */ +static struct bus_type gpio_bus_type = { + .name = "gpio", +}; /* gpio_lock prevents conflicts during gpio_desc[] table updates. * While any GPIO is requested, its gpio_chip is not removable; @@ -283,6 +292,80 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc) } /** + * gpio_ioctl() - ioctl handler for the GPIO chardev + */ +static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + struct gpio_chip *chip = filp->private_data; + int __user *ip = (int __user *)arg; + struct gpiochip_info chipinfo; + + if (!chip) + return -ENODEV; + + if (cmd == GPIO_GET_CHIPINFO_IOCTL) { + /* Fill in the struct and pass to userspace */ + if (chip->label) + strncpy(chipinfo.name, chip->label, + sizeof(chipinfo.name)); + else + strncpy(chipinfo.name, dev_name(&chip->device), + sizeof(chipinfo.name)); + chipinfo.name[sizeof(chipinfo.name)-1] = '\0'; + chipinfo.lines = chip->ngpio; + if (copy_to_user(ip, &chipinfo, sizeof(chipinfo))) + return -EFAULT; + return 0; + } + return -EINVAL; +} + +/** + * gpio_chrdev_open() - open the chardev for ioctl operations + * @inode: inode for this chardev + * @filp: file struct for storing private data + * Returns 0 on success + */ +static int gpio_chrdev_open(struct inode *inode, struct file *filp) +{ + struct gpio_chip *chip = container_of(inode->i_cdev, + struct gpio_chip, chrdev); + + if (!chip) + return -ENODEV; + get_device(&chip->device); + filp->private_data = chip; + return 0; +} + +/** + * gpio_chrdev_release() - close chardev after ioctl operations + * @inode: inode for this chardev + * @filp: file struct for storing private data + * Returns 0 on success + */ +static int gpio_chrdev_release(struct inode *inode, struct file *filp) +{ + struct gpio_chip *chip = container_of(inode->i_cdev, + struct gpio_chip, chrdev); + + if (!chip) + return -ENODEV; + put_device(&chip->device); + return 0; +} + + +static const struct file_operations gpio_fileops = { + .release = gpio_chrdev_release, + .open = gpio_chrdev_open, + .owner = THIS_MODULE, + .llseek = noop_llseek, + .unlocked_ioctl = gpio_ioctl, + .compat_ioctl = gpio_ioctl, +}; + +/** * gpiochip_add() - register a gpio_chip * @chip: the chip to register, with chip->base initialized * Context: potentially before irqs will work @@ -318,6 +401,7 @@ int gpiochip_add(struct gpio_chip *chip) * We memset the struct to zero to avoid reentrance issues. */ memset(&chip->device, 0, sizeof(chip->device)); + chip->device.bus = &gpio_bus_type; if (chip->dev) { chip->device.parent = chip->dev; chip->device.of_node = chip->dev->of_node; @@ -386,9 +470,26 @@ int gpiochip_add(struct gpio_chip *chip) acpi_gpiochip_add(chip); + /* + * By first adding the chardev, and then adding the device, + * we get a device node entry in sysfs under + * /sys/bus/gpio/devices/gpiochipN/dev that can be used for + * coldplug of device nodes and other udev business. + */ + cdev_init(&chip->chrdev, &gpio_fileops); + chip->chrdev.owner = THIS_MODULE; + chip->chrdev.kobj.parent = &chip->device.kobj; + chip->device.devt = MKDEV(MAJOR(gpio_devt), chip->id); + status = cdev_add(&chip->chrdev, chip->device.devt, 1); + if (status < 0) + chip_warn(chip, "failed to add char device %d:%d\n", + MAJOR(gpio_devt), chip->id); + else + chip_dbg(chip, "added GPIO chardev (%d:%d)\n", + MAJOR(gpio_devt), chip->id); status = device_add(&chip->device); if (status) - goto err_remove_chip; + goto err_remove_chardev; status = gpiochip_sysfs_register(chip); if (status) @@ -402,6 +503,8 @@ int gpiochip_add(struct gpio_chip *chip) err_remove_device: device_del(&chip->device); +err_remove_chardev: + cdev_del(&chip->chrdev); err_remove_chip: acpi_gpiochip_remove(chip); gpiochip_free_hogs(chip); @@ -436,6 +539,7 @@ void gpiochip_remove(struct gpio_chip *chip) unsigned id; bool requested = false; + cdev_del(&chip->chrdev); gpiochip_sysfs_unregister(chip); gpiochip_irqchip_remove(chip); @@ -2457,6 +2561,26 @@ void gpiod_put_array(struct gpio_descs *descs) } EXPORT_SYMBOL_GPL(gpiod_put_array); +static int __init gpiolib_dev_init(void) +{ + int ret; + + /* Register GPIO sysfs bus */ + ret = bus_register(&gpio_bus_type); + if (ret < 0) { + pr_err("gpiolib: could not register GPIO bus type\n"); + return ret; + } + + ret = alloc_chrdev_region(&gpio_devt, 0, GPIO_DEV_MAX, "gpiochip"); + if (ret < 0) { + pr_err("gpiolib: failed to allocate char dev region\n"); + bus_unregister(&gpio_bus_type); + } + return ret; +} +core_initcall(gpiolib_dev_init); + #ifdef CONFIG_DEBUG_FS static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip) diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index cf3028eccc4b..826791d51c80 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -23,6 +23,7 @@ struct seq_file; * @label: for diagnostics * @id: numerical ID number for the GPIO chip * @device: the GPIO device struct. + * @chrdev: character device for the GPIO device. * @dev: optional parent device (hardware) providing the GPIOs * @cdev: class device used by sysfs interface (may be NULL) * @owner: helps prevent removal of modules exporting active GPIOs @@ -94,6 +95,7 @@ struct gpio_chip { const char *label; int id; struct device device; + struct cdev chrdev; struct device *dev; struct device *cdev; struct module *owner; diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index f7b2db44eb4b..0cfa57693dcc 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -138,6 +138,7 @@ header-y += genetlink.h header-y += gen_stats.h header-y += gfs2_ondisk.h header-y += gigaset_dev.h +header-y += gpio.h header-y += gsmmux.h header-y += hdlcdrv.h header-y += hdlc.h diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h new file mode 100644 index 000000000000..3188a87bdaa0 --- /dev/null +++ b/include/uapi/linux/gpio.h @@ -0,0 +1,28 @@ +/* + * <linux/gpio.h> - userspace ABI for the GPIO character devices + * + * Copyright (C) 2015 Linus Walleij + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + */ +#ifndef _UAPI_GPIO_H_ +#define _UAPI_GPIO_H_ + +#include <linux/ioctl.h> +#include <linux/types.h> + +/** + * struct gpiochip_info - Information about a certain GPIO chip + * @name: the name of this GPIO chip + * @lines: number of GPIO lines on this chip + */ +struct gpiochip_info { + char name[32]; + __u32 lines; +}; + +#define GPIO_GET_CHIPINFO_IOCTL _IOR('o', 0x01, struct gpiochip_info) + +#endif /* _UAPI_GPIO_H_ */
A new chardev that is to be used for userspace GPIO access is added in this patch. It is intended to gradually replace the horribly broken sysfs ABI. Using a chardev has many upsides: - All operations are per-gpiochip, which is the actual device underlying the GPIOs, making us tie in to the kernel device model properly. - Hotpluggable GPIO controllers can come and go, as this kind of problem has been know to userspace for character devices since ages, and if a gpiochip handle is held in userspace we know we will break something, whereas the sysfs is stateless. - The one-value-per-file rule of sysfs is really hard to maintain when you want to twist more than one knob at a time, for example have in-kernel APIs to switch several GPIO lines at the same time, and this will be possible to do with a single ioctl() from userspace, saving a lot of context switching. We also need to add a new bus type for GPIO. This is necessary for example for userspace coldplug, where sysfs is traversed to find the boot-time device nodes and create the character devices in /dev. This new chardev ABI is *non* *optional* and can be counted on to be present in the future, emphasizing the preference of this ABI. The ABI only implements one single ioctl() to get the name and number of GPIO lines of a chip. Even this is debatable: see it as a minimal example for review. This ABI shall be ruthlessly reviewed and etched in stone. The old /sys/class/gpio is still optional to compile in, but will be deprecated. Unique device IDs are created using IDR, which is overkill and insanely scalable, but also well tested. Cc: Johan Hovold <johan@kernel.org> Cc: Michael Welling <mwelling@ieee.org> Cc: Markus Pargmann <mpa@pengutronix.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- MAINTAINERS | 1 + drivers/gpio/gpiolib.c | 126 +++++++++++++++++++++++++++++++++++++++++++- include/linux/gpio/driver.h | 2 + include/uapi/linux/Kbuild | 1 + include/uapi/linux/gpio.h | 28 ++++++++++ 5 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/gpio.h