| Message ID | 1486383041-16758-6-git-send-email-bgolaszewski@baylibre.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Feb 6, 2017 at 1:10 PM, Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > Setup a dummy irqchip that will allow us to inject line events for > testing purposes. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> This is obviously exactly how we should do this. However since it needs the devm* helpers from the irq subsystem I can't apply them until the irqchip maintainers merge or ack that patch. If you want it in soon I suggest resending it with non-memorymanaged accessors for the descs and later make a separate patch to switch over to the devm_* versions when/if it is accepted. If you're not in a hurry, just wait :) 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
2017-02-06 14:29 GMT+01:00 Linus Walleij <linus.walleij@linaro.org>: > On Mon, Feb 6, 2017 at 1:10 PM, Bartosz Golaszewski > <bgolaszewski@baylibre.com> wrote: > >> Setup a dummy irqchip that will allow us to inject line events for >> testing purposes. >> >> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > This is obviously exactly how we should do this. > > However since it needs the devm* helpers from the irq > subsystem I can't apply them until the irqchip maintainers > merge or ack that patch. > > If you want it in soon I suggest resending it with > non-memorymanaged accessors for the descs and later > make a separate patch to switch over to the devm_* > versions when/if it is accepted. > > If you're not in a hurry, just wait :) > > Yours, > Linus Walleij I think I'll do it, since it would be nice to have it go in for 4.11 (if you're ready to merge it that late into the release cycle). Thanks, Bartosz -- 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 Mon, Feb 6, 2017 at 2:31 PM, Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > 2017-02-06 14:29 GMT+01:00 Linus Walleij <linus.walleij@linaro.org>: >> On Mon, Feb 6, 2017 at 1:10 PM, Bartosz Golaszewski >> <bgolaszewski@baylibre.com> wrote: >> >>> Setup a dummy irqchip that will allow us to inject line events for >>> testing purposes. >>> >>> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> >> >> This is obviously exactly how we should do this. >> >> However since it needs the devm* helpers from the irq >> subsystem I can't apply them until the irqchip maintainers >> merge or ack that patch. >> >> If you want it in soon I suggest resending it with >> non-memorymanaged accessors for the descs and later >> make a separate patch to switch over to the devm_* >> versions when/if it is accepted. >> >> If you're not in a hurry, just wait :) >> >> Yours, >> Linus Walleij > > I think I'll do it, since it would be nice to have it go in for 4.11 > (if you're ready to merge it that late into the release cycle). I will merge this. Expanding the testing is paramount. 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/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 2d77392..db6ff78 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -298,6 +298,7 @@ config GPIO_MOCKUP tristate "GPIO Testing Driver" depends on GPIOLIB && SYSFS select GPIO_SYSFS + select GPIOLIB_IRQCHIP help This enables GPIO Testing driver, which provides a way to test GPIO subsystem through sysfs(or char device) and debugfs. GPIO_SYSFS diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index 0ce9acc3..7d82d35 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -16,6 +16,9 @@ #include <linux/gpio/driver.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irq_work.h> #define GPIO_MOCKUP_NAME "gpio-mockup" #define GPIO_MOCKUP_MAX_GC 10 @@ -35,9 +38,15 @@ struct gpio_mockup_line_status { bool value; }; +struct gpio_mockup_irq_context { + struct irq_work work; + int irq; +}; + struct gpio_mockup_chip { struct gpio_chip gc; struct gpio_mockup_line_status *lines; + struct gpio_mockup_irq_context irq_ctx; }; static int gpio_mockup_ranges[GPIO_MOCKUP_MAX_GC << 1]; @@ -115,6 +124,57 @@ static int gpio_mockup_name_lines(struct device *dev, return 0; } +static int gpio_mockup_to_irq(struct gpio_chip *chip, unsigned int offset) +{ + return chip->irq_base + offset; +} + +/* + * While we should generally support irqmask and irqunmask, this driver is + * for testing purposes only so we don't care. + */ +static void gpio_mockup_irqmask(struct irq_data *d) { } +static void gpio_mockup_irqunmask(struct irq_data *d) { } + +static struct irq_chip gpio_mockup_irqchip = { + .name = GPIO_MOCKUP_NAME, + .irq_mask = gpio_mockup_irqmask, + .irq_unmask = gpio_mockup_irqunmask, +}; + +static void gpio_mockup_handle_irq(struct irq_work *work) +{ + struct gpio_mockup_irq_context *irq_ctx; + + irq_ctx = container_of(work, struct gpio_mockup_irq_context, work); + handle_simple_irq(irq_to_desc(irq_ctx->irq)); +} + +static int gpio_mockup_irqchip_setup(struct device *dev, + struct gpio_mockup_chip *chip) +{ + struct gpio_chip *gc = &chip->gc; + int irq_base, i; + + irq_base = devm_irq_alloc_descs(dev, -1, 0, gc->ngpio, 0); + if (irq_base < 0) + return irq_base; + + gc->irq_base = irq_base; + gc->irqchip = &gpio_mockup_irqchip; + + for (i = 0; i < gc->ngpio; i++) { + irq_set_chip(irq_base + i, gc->irqchip); + irq_set_handler(irq_base + i, &handle_simple_irq); + irq_modify_status(irq_base + i, + IRQ_NOREQUEST | IRQ_NOAUTOEN, IRQ_NOPROBE); + } + + init_irq_work(&chip->irq_ctx.work, gpio_mockup_handle_irq); + + return 0; +} + static int gpio_mockup_add(struct device *dev, struct gpio_mockup_chip *chip, const char *name, int base, int ngpio) @@ -132,6 +192,7 @@ static int gpio_mockup_add(struct device *dev, gc->direction_output = gpio_mockup_dirout; gc->direction_input = gpio_mockup_dirin; gc->get_direction = gpio_mockup_get_direction; + gc->to_irq = gpio_mockup_to_irq; chip->lines = devm_kzalloc(dev, sizeof(*chip->lines) * gc->ngpio, GFP_KERNEL); @@ -144,6 +205,10 @@ static int gpio_mockup_add(struct device *dev, return ret; } + ret = gpio_mockup_irqchip_setup(dev, chip); + if (ret) + return ret; + return devm_gpiochip_add_data(dev, &chip->gc, chip); }
Setup a dummy irqchip that will allow us to inject line events for testing purposes. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-mockup.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+)