From: Linus Walleij <linus.walleij@linaro.org> To: Mun Yew Tham <mun.yew.tham@intel.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, Alban Bedel <albeu@free.fr>, Orson Zhai <orsonzhai@gmail.com>, Baolin Wang <baolin.wang@linux.alibaba.com>, Chunyan Zhang <zhang.lyra@gmail.com>, Jay Fang <f.fangjian@huawei.com>, Daniel Palmer <daniel@thingy.jp>, Romain Perier <romain.perier@gmail.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Kevin Hilman <khilman@kernel.org>, William Breathitt Gray <william.gray@linaro.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-omap@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 04/17] gpio: aspeed-sgpio: Convert to immutable irq_chip Date: Thu, 16 Feb 2023 10:37:05 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v1-4-51a8f224a5d0@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v1-0-51a8f224a5d0@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-aspeed-sgpio.c | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c index 454cefbeecf0..3c1c0fc21fc5 100644 --- a/drivers/gpio/gpio-aspeed-sgpio.c +++ b/drivers/gpio/gpio-aspeed-sgpio.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/string.h> @@ -29,7 +30,7 @@ struct aspeed_sgpio_pdata { struct aspeed_sgpio { struct gpio_chip chip; - struct irq_chip intc; + struct device *dev; struct clk *pclk; raw_spinlock_t lock; void __iomem *base; @@ -296,6 +297,10 @@ static void aspeed_sgpio_irq_set_mask(struct irq_data *d, bool set) irqd_to_aspeed_sgpio_data(d, &gpio, &bank, &bit, &offset); addr = bank_reg(gpio, bank, reg_irq_enable); + /* Unmasking the IRQ */ + if (set) + gpiochip_enable_irq(&gpio->chip, irqd_to_hwirq(d)); + raw_spin_lock_irqsave(&gpio->lock, flags); reg = ioread32(addr); @@ -307,6 +312,12 @@ static void aspeed_sgpio_irq_set_mask(struct irq_data *d, bool set) iowrite32(reg, addr); raw_spin_unlock_irqrestore(&gpio->lock, flags); + + /* Masking the IRQ */ + if (!set) + gpiochip_disable_irq(&gpio->chip, irqd_to_hwirq(d)); + + } static void aspeed_sgpio_irq_mask(struct irq_data *d) @@ -401,6 +412,27 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc) chained_irq_exit(ic, desc); } +static void aspeed_sgpio_irq_print_chip(struct irq_data *d, struct seq_file *p) +{ + const struct aspeed_sgpio_bank *bank; + struct aspeed_sgpio *gpio; + u32 bit; + int offset; + + irqd_to_aspeed_sgpio_data(d, &gpio, &bank, &bit, &offset); + seq_printf(p, dev_name(gpio->dev)); +} + +static const struct irq_chip aspeed_sgpio_irq_chip = { + .irq_ack = aspeed_sgpio_irq_ack, + .irq_mask = aspeed_sgpio_irq_mask, + .irq_unmask = aspeed_sgpio_irq_unmask, + .irq_set_type = aspeed_sgpio_set_type, + .irq_print_chip = aspeed_sgpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio, struct platform_device *pdev) { @@ -423,14 +455,8 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio, iowrite32(0xffffffff, bank_reg(gpio, bank, reg_irq_status)); } - gpio->intc.name = dev_name(&pdev->dev); - gpio->intc.irq_ack = aspeed_sgpio_irq_ack; - gpio->intc.irq_mask = aspeed_sgpio_irq_mask; - gpio->intc.irq_unmask = aspeed_sgpio_irq_unmask; - gpio->intc.irq_set_type = aspeed_sgpio_set_type; - irq = &gpio->chip.irq; - irq->chip = &gpio->intc; + gpio_irq_chip_set_chip(irq, &aspeed_sgpio_irq_chip); irq->init_valid_mask = aspeed_sgpio_irq_init_valid_mask; irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; @@ -524,6 +550,8 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev) if (IS_ERR(gpio->base)) return PTR_ERR(gpio->base); + gpio->dev = &pdev->dev; + pdata = device_get_match_data(&pdev->dev); if (!pdata) return -EINVAL; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org> To: Mun Yew Tham <mun.yew.tham@intel.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, Alban Bedel <albeu@free.fr>, Orson Zhai <orsonzhai@gmail.com>, Baolin Wang <baolin.wang@linux.alibaba.com>, Chunyan Zhang <zhang.lyra@gmail.com>, Jay Fang <f.fangjian@huawei.com>, Daniel Palmer <daniel@thingy.jp>, Romain Perier <romain.perier@gmail.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Kevin Hilman <khilman@kernel.org>, William Breathitt Gray <william.gray@linaro.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-omap@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 04/17] gpio: aspeed-sgpio: Convert to immutable irq_chip Date: Thu, 16 Feb 2023 10:37:05 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v1-4-51a8f224a5d0@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v1-0-51a8f224a5d0@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-aspeed-sgpio.c | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c index 454cefbeecf0..3c1c0fc21fc5 100644 --- a/drivers/gpio/gpio-aspeed-sgpio.c +++ b/drivers/gpio/gpio-aspeed-sgpio.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/string.h> @@ -29,7 +30,7 @@ struct aspeed_sgpio_pdata { struct aspeed_sgpio { struct gpio_chip chip; - struct irq_chip intc; + struct device *dev; struct clk *pclk; raw_spinlock_t lock; void __iomem *base; @@ -296,6 +297,10 @@ static void aspeed_sgpio_irq_set_mask(struct irq_data *d, bool set) irqd_to_aspeed_sgpio_data(d, &gpio, &bank, &bit, &offset); addr = bank_reg(gpio, bank, reg_irq_enable); + /* Unmasking the IRQ */ + if (set) + gpiochip_enable_irq(&gpio->chip, irqd_to_hwirq(d)); + raw_spin_lock_irqsave(&gpio->lock, flags); reg = ioread32(addr); @@ -307,6 +312,12 @@ static void aspeed_sgpio_irq_set_mask(struct irq_data *d, bool set) iowrite32(reg, addr); raw_spin_unlock_irqrestore(&gpio->lock, flags); + + /* Masking the IRQ */ + if (!set) + gpiochip_disable_irq(&gpio->chip, irqd_to_hwirq(d)); + + } static void aspeed_sgpio_irq_mask(struct irq_data *d) @@ -401,6 +412,27 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc) chained_irq_exit(ic, desc); } +static void aspeed_sgpio_irq_print_chip(struct irq_data *d, struct seq_file *p) +{ + const struct aspeed_sgpio_bank *bank; + struct aspeed_sgpio *gpio; + u32 bit; + int offset; + + irqd_to_aspeed_sgpio_data(d, &gpio, &bank, &bit, &offset); + seq_printf(p, dev_name(gpio->dev)); +} + +static const struct irq_chip aspeed_sgpio_irq_chip = { + .irq_ack = aspeed_sgpio_irq_ack, + .irq_mask = aspeed_sgpio_irq_mask, + .irq_unmask = aspeed_sgpio_irq_unmask, + .irq_set_type = aspeed_sgpio_set_type, + .irq_print_chip = aspeed_sgpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio, struct platform_device *pdev) { @@ -423,14 +455,8 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio, iowrite32(0xffffffff, bank_reg(gpio, bank, reg_irq_status)); } - gpio->intc.name = dev_name(&pdev->dev); - gpio->intc.irq_ack = aspeed_sgpio_irq_ack; - gpio->intc.irq_mask = aspeed_sgpio_irq_mask; - gpio->intc.irq_unmask = aspeed_sgpio_irq_unmask; - gpio->intc.irq_set_type = aspeed_sgpio_set_type; - irq = &gpio->chip.irq; - irq->chip = &gpio->intc; + gpio_irq_chip_set_chip(irq, &aspeed_sgpio_irq_chip); irq->init_valid_mask = aspeed_sgpio_irq_init_valid_mask; irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; @@ -524,6 +550,8 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev) if (IS_ERR(gpio->base)) return PTR_ERR(gpio->base); + gpio->dev = &pdev->dev; + pdata = device_get_match_data(&pdev->dev); if (!pdata) return -EINVAL; -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-02-16 9:37 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-16 9:37 [PATCH 00/17] Mass convert GPIO IRQ chips to be immutable Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 01/17] gpio: altera: Convert to immutable irq_chip Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 02/17] gpio: adnp: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 03/17] gpio: aspeed: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-27 0:44 ` Joel Stanley 2023-02-27 0:44 ` Joel Stanley 2023-02-16 9:37 ` Linus Walleij [this message] 2023-02-16 9:37 ` [PATCH 04/17] gpio: aspeed-sgpio: " Linus Walleij 2023-02-16 9:37 ` [PATCH 05/17] gpio: ath79: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 06/17] gpio: cadence: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 07/17] gpio: eic_sprd: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 08/17] gpio: hisi: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 09/17] gpio: hlwd: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 10/17] gpio: idt3243x: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 13:28 ` Thomas Bogendoerfer 2023-02-17 13:28 ` Thomas Bogendoerfer 2023-02-16 9:37 ` [PATCH 11/17] gpio: msc313: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 12/17] gpio: mlxbf2: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 13/17] gpio: max732x: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 14/17] gpio: omap: Drop irq_base Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 5:58 ` Tony Lindgren 2023-02-17 5:58 ` Tony Lindgren 2023-02-16 9:37 ` [PATCH 15/17] gpio: omap: Convert to immutable irq_chip Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 7:49 ` Tony Lindgren 2023-02-17 7:49 ` Tony Lindgren 2023-02-17 16:31 ` Andreas Kemnade 2023-02-17 16:31 ` Andreas Kemnade 2023-03-06 7:28 ` Tony Lindgren 2023-03-06 7:28 ` Tony Lindgren 2023-03-06 7:31 ` Tony Lindgren 2023-03-06 7:31 ` Tony Lindgren 2023-02-16 9:37 ` [PATCH 16/17] gpio: pci-idio-16: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-08 11:16 ` William Breathitt Gray 2023-02-08 11:16 ` William Breathitt Gray 2023-02-16 9:37 ` [PATCH 17/17] gpio: pcie-idio-24: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-08 11:17 ` William Breathitt Gray 2023-02-08 11:17 ` William Breathitt Gray 2023-02-16 10:47 ` [PATCH 00/17] Mass convert GPIO IRQ chips to be immutable Marc Zyngier 2023-02-16 10:47 ` Marc Zyngier 2023-02-17 6:02 ` Tony Lindgren 2023-02-17 6:02 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230215-immutable-chips-v1-4-51a8f224a5d0@linaro.org \ --to=linus.walleij@linaro.org \ --cc=albeu@free.fr \ --cc=andrew@aj.id.au \ --cc=baolin.wang@linux.alibaba.com \ --cc=brgl@bgdev.pl \ --cc=daniel@thingy.jp \ --cc=f.fangjian@huawei.com \ --cc=grygorii.strashko@ti.com \ --cc=joel@jms.id.au \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=maz@kernel.org \ --cc=mun.yew.tham@intel.com \ --cc=orsonzhai@gmail.com \ --cc=romain.perier@gmail.com \ --cc=ssantosh@kernel.org \ --cc=william.gray@linaro.org \ --cc=zhang.lyra@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.