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>, 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 v3 12/17] gpio: mlxbf2: Convert to immutable irq_chip Date: Thu, 09 Mar 2023 08:46:00 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v3-12-972542092a77@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v3-0-972542092a77@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Acked-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-mlxbf2.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c index 77a41151c921..6abe01bc39c3 100644 --- a/drivers/gpio/gpio-mlxbf2.c +++ b/drivers/gpio/gpio-mlxbf2.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/resource.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/types.h> @@ -65,10 +66,10 @@ struct mlxbf2_gpio_context_save_regs { /* BlueField-2 gpio block context structure. */ struct mlxbf2_gpio_context { struct gpio_chip gc; - struct irq_chip irq_chip; /* YU GPIO blocks address */ void __iomem *gpio_io; + struct device *dev; struct mlxbf2_gpio_context_save_regs *csave_regs; }; @@ -237,6 +238,7 @@ static void mlxbf2_gpio_irq_enable(struct irq_data *irqd) unsigned long flags; u32 val; + gpiochip_enable_irq(gc, irqd_to_hwirq(irqd)); raw_spin_lock_irqsave(&gs->gc.bgpio_lock, flags); val = readl(gs->gpio_io + YU_GPIO_CAUSE_OR_CLRCAUSE); val |= BIT(offset); @@ -261,6 +263,7 @@ static void mlxbf2_gpio_irq_disable(struct irq_data *irqd) val &= ~BIT(offset); writel(val, gs->gpio_io + YU_GPIO_CAUSE_OR_EVTEN0); raw_spin_unlock_irqrestore(&gs->gc.bgpio_lock, flags); + gpiochip_disable_irq(gc, irqd_to_hwirq(irqd)); } static irqreturn_t mlxbf2_gpio_irq_handler(int irq, void *ptr) @@ -322,6 +325,24 @@ mlxbf2_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) return 0; } +static void mlxbf2_gpio_irq_print_chip(struct irq_data *irqd, + struct seq_file *p) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd); + struct mlxbf2_gpio_context *gs = gpiochip_get_data(gc); + + seq_printf(p, dev_name(gs->dev)); +} + +static const struct irq_chip mlxbf2_gpio_irq_chip = { + .irq_set_type = mlxbf2_gpio_irq_set_type, + .irq_enable = mlxbf2_gpio_irq_enable, + .irq_disable = mlxbf2_gpio_irq_disable, + .irq_print_chip = mlxbf2_gpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + /* BlueField-2 GPIO driver initialization routine. */ static int mlxbf2_gpio_probe(struct platform_device *pdev) @@ -340,6 +361,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev) if (!gs) return -ENOMEM; + gs->dev = dev; + /* YU GPIO block address */ gs->gpio_io = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(gs->gpio_io)) @@ -376,13 +399,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq >= 0) { - gs->irq_chip.name = name; - gs->irq_chip.irq_set_type = mlxbf2_gpio_irq_set_type; - gs->irq_chip.irq_enable = mlxbf2_gpio_irq_enable; - gs->irq_chip.irq_disable = mlxbf2_gpio_irq_disable; - girq = &gs->gc.irq; - girq->chip = &gs->irq_chip; + gpio_irq_chip_set_chip(girq, &mlxbf2_gpio_irq_chip); girq->handler = handle_simple_irq; girq->default_type = IRQ_TYPE_NONE; /* This will let us handle the parent IRQ in the driver */ -- 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>, 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 v3 12/17] gpio: mlxbf2: Convert to immutable irq_chip Date: Thu, 09 Mar 2023 08:46:00 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v3-12-972542092a77@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v3-0-972542092a77@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Acked-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-mlxbf2.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c index 77a41151c921..6abe01bc39c3 100644 --- a/drivers/gpio/gpio-mlxbf2.c +++ b/drivers/gpio/gpio-mlxbf2.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/resource.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/types.h> @@ -65,10 +66,10 @@ struct mlxbf2_gpio_context_save_regs { /* BlueField-2 gpio block context structure. */ struct mlxbf2_gpio_context { struct gpio_chip gc; - struct irq_chip irq_chip; /* YU GPIO blocks address */ void __iomem *gpio_io; + struct device *dev; struct mlxbf2_gpio_context_save_regs *csave_regs; }; @@ -237,6 +238,7 @@ static void mlxbf2_gpio_irq_enable(struct irq_data *irqd) unsigned long flags; u32 val; + gpiochip_enable_irq(gc, irqd_to_hwirq(irqd)); raw_spin_lock_irqsave(&gs->gc.bgpio_lock, flags); val = readl(gs->gpio_io + YU_GPIO_CAUSE_OR_CLRCAUSE); val |= BIT(offset); @@ -261,6 +263,7 @@ static void mlxbf2_gpio_irq_disable(struct irq_data *irqd) val &= ~BIT(offset); writel(val, gs->gpio_io + YU_GPIO_CAUSE_OR_EVTEN0); raw_spin_unlock_irqrestore(&gs->gc.bgpio_lock, flags); + gpiochip_disable_irq(gc, irqd_to_hwirq(irqd)); } static irqreturn_t mlxbf2_gpio_irq_handler(int irq, void *ptr) @@ -322,6 +325,24 @@ mlxbf2_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) return 0; } +static void mlxbf2_gpio_irq_print_chip(struct irq_data *irqd, + struct seq_file *p) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd); + struct mlxbf2_gpio_context *gs = gpiochip_get_data(gc); + + seq_printf(p, dev_name(gs->dev)); +} + +static const struct irq_chip mlxbf2_gpio_irq_chip = { + .irq_set_type = mlxbf2_gpio_irq_set_type, + .irq_enable = mlxbf2_gpio_irq_enable, + .irq_disable = mlxbf2_gpio_irq_disable, + .irq_print_chip = mlxbf2_gpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + /* BlueField-2 GPIO driver initialization routine. */ static int mlxbf2_gpio_probe(struct platform_device *pdev) @@ -340,6 +361,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev) if (!gs) return -ENOMEM; + gs->dev = dev; + /* YU GPIO block address */ gs->gpio_io = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(gs->gpio_io)) @@ -376,13 +399,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq >= 0) { - gs->irq_chip.name = name; - gs->irq_chip.irq_set_type = mlxbf2_gpio_irq_set_type; - gs->irq_chip.irq_enable = mlxbf2_gpio_irq_enable; - gs->irq_chip.irq_disable = mlxbf2_gpio_irq_disable; - girq = &gs->gc.irq; - girq->chip = &gs->irq_chip; + gpio_irq_chip_set_chip(girq, &mlxbf2_gpio_irq_chip); girq->handler = handle_simple_irq; girq->default_type = IRQ_TYPE_NONE; /* This will let us handle the parent IRQ in the driver */ -- 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-03-09 7:46 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-09 7:45 [PATCH v3 00/17] Mass convert GPIO IRQ chips to be immutable Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 01/17] gpio: altera: Convert to immutable irq_chip Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 02/17] gpio: adnp: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 03/17] gpio: aspeed: Always register the irqchip Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 04/17] gpio: aspeed: Convert to immutable irq_chip Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 05/17] gpio: aspeed-sgpio: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 06/17] gpio: ath79: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 07/17] gpio: cadence: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 08/17] gpio: hisi: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 09/17] gpio: hlwd: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 10/17] gpio: idt3243x: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-09 7:45 ` [PATCH v3 11/17] gpio: msc313: " Linus Walleij 2023-03-09 7:45 ` Linus Walleij 2023-03-10 8:06 ` Romain Perier 2023-03-10 8:06 ` Romain Perier 2023-03-09 7:46 ` Linus Walleij [this message] 2023-03-09 7:46 ` [PATCH v3 12/17] gpio: mlxbf2: " Linus Walleij 2023-03-09 7:46 ` [PATCH v3 13/17] gpio: max732x: " Linus Walleij 2023-03-09 7:46 ` Linus Walleij 2023-03-09 7:46 ` [PATCH v3 14/17] gpio: omap: Drop irq_base Linus Walleij 2023-03-09 7:46 ` Linus Walleij 2023-03-09 7:46 ` [PATCH v3 15/17] gpio: omap: Convert to immutable irq_chip Linus Walleij 2023-03-09 7:46 ` Linus Walleij 2023-03-09 7:46 ` [PATCH v3 16/17] gpio: pci-idio-16: " Linus Walleij 2023-03-09 7:46 ` Linus Walleij 2023-03-09 7:46 ` [PATCH v3 17/17] gpio: pcie-idio-24: " Linus Walleij 2023-03-09 7:46 ` Linus Walleij 2023-03-10 15:25 ` [PATCH v3 00/17] Mass convert GPIO IRQ chips to be immutable Bartosz Golaszewski 2023-03-10 15:25 ` Bartosz Golaszewski 2023-03-10 22:44 ` Linus Walleij 2023-03-10 22:44 ` Linus Walleij
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-v3-12-972542092a77@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=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.