From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org, "Bartosz Golaszewski" <brgl@bgdev.pl>, "Manivannan Sadhasivam" <mani@kernel.org>, "Thorsten Scherer" <t.scherer@eckelmann.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Robert Richter" <rric@kernel.org>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, "Michal Simek" <michal.simek@xilinx.com> Cc: linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 4/9] gpio: thunderx: Convert to immutable irq_chip Date: Mon, 20 Mar 2023 10:55:11 +0100 [thread overview] Message-ID: <20230316-immutable-chips-2-v1-4-053d6ede831b@linaro.org> (raw) In-Reply-To: <20230316-immutable-chips-2-v1-0-053d6ede831b@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Whereas in most cases we put the gpiochip_[enable|disable]_irq() calls in the .irq_mask() and .irq_unmask() callbacks, here we need to put them in the .irq_enable() and .irq_disable() callbacks, as this driver uses both .irq_mask() and .irq_mask_ack(). Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-thunderx.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c index cc62c6e64103..8521c6aacace 100644 --- a/drivers/gpio/gpio-thunderx.c +++ b/drivers/gpio/gpio-thunderx.c @@ -354,16 +354,22 @@ static int thunderx_gpio_irq_set_type(struct irq_data *d, return IRQ_SET_MASK_OK; } -static void thunderx_gpio_irq_enable(struct irq_data *data) +static void thunderx_gpio_irq_enable(struct irq_data *d) { - irq_chip_enable_parent(data); - thunderx_gpio_irq_unmask(data); + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + gpiochip_enable_irq(gc, irqd_to_hwirq(d)); + irq_chip_enable_parent(d); + thunderx_gpio_irq_unmask(d); } -static void thunderx_gpio_irq_disable(struct irq_data *data) +static void thunderx_gpio_irq_disable(struct irq_data *d) { - thunderx_gpio_irq_mask(data); - irq_chip_disable_parent(data); + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + thunderx_gpio_irq_mask(d); + irq_chip_disable_parent(d); + gpiochip_disable_irq(gc, irqd_to_hwirq(d)); } /* @@ -372,7 +378,7 @@ static void thunderx_gpio_irq_disable(struct irq_data *data) * semantics and other acknowledgment tasks associated with the GPIO * mechanism. */ -static struct irq_chip thunderx_gpio_irq_chip = { +static const struct irq_chip thunderx_gpio_irq_chip = { .name = "GPIO", .irq_enable = thunderx_gpio_irq_enable, .irq_disable = thunderx_gpio_irq_disable, @@ -383,8 +389,8 @@ static struct irq_chip thunderx_gpio_irq_chip = { .irq_eoi = irq_chip_eoi_parent, .irq_set_affinity = irq_chip_set_affinity_parent, .irq_set_type = thunderx_gpio_irq_set_type, - - .flags = IRQCHIP_SET_TYPE_MASKED + .flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; static int thunderx_gpio_child_to_parent_hwirq(struct gpio_chip *gc, @@ -526,7 +532,7 @@ static int thunderx_gpio_probe(struct pci_dev *pdev, chip->set_multiple = thunderx_gpio_set_multiple; chip->set_config = thunderx_gpio_set_config; girq = &chip->irq; - girq->chip = &thunderx_gpio_irq_chip; + gpio_irq_chip_set_chip(girq, &thunderx_gpio_irq_chip); girq->fwnode = of_node_to_fwnode(dev->of_node); girq->parent_domain = irq_get_irq_data(txgpio->msix_entries[0].vector)->domain; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org, "Bartosz Golaszewski" <brgl@bgdev.pl>, "Manivannan Sadhasivam" <mani@kernel.org>, "Thorsten Scherer" <t.scherer@eckelmann.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Robert Richter" <rric@kernel.org>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, "Michal Simek" <michal.simek@xilinx.com> Cc: linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 4/9] gpio: thunderx: Convert to immutable irq_chip Date: Mon, 20 Mar 2023 10:55:11 +0100 [thread overview] Message-ID: <20230316-immutable-chips-2-v1-4-053d6ede831b@linaro.org> (raw) In-Reply-To: <20230316-immutable-chips-2-v1-0-053d6ede831b@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Whereas in most cases we put the gpiochip_[enable|disable]_irq() calls in the .irq_mask() and .irq_unmask() callbacks, here we need to put them in the .irq_enable() and .irq_disable() callbacks, as this driver uses both .irq_mask() and .irq_mask_ack(). Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-thunderx.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c index cc62c6e64103..8521c6aacace 100644 --- a/drivers/gpio/gpio-thunderx.c +++ b/drivers/gpio/gpio-thunderx.c @@ -354,16 +354,22 @@ static int thunderx_gpio_irq_set_type(struct irq_data *d, return IRQ_SET_MASK_OK; } -static void thunderx_gpio_irq_enable(struct irq_data *data) +static void thunderx_gpio_irq_enable(struct irq_data *d) { - irq_chip_enable_parent(data); - thunderx_gpio_irq_unmask(data); + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + gpiochip_enable_irq(gc, irqd_to_hwirq(d)); + irq_chip_enable_parent(d); + thunderx_gpio_irq_unmask(d); } -static void thunderx_gpio_irq_disable(struct irq_data *data) +static void thunderx_gpio_irq_disable(struct irq_data *d) { - thunderx_gpio_irq_mask(data); - irq_chip_disable_parent(data); + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + thunderx_gpio_irq_mask(d); + irq_chip_disable_parent(d); + gpiochip_disable_irq(gc, irqd_to_hwirq(d)); } /* @@ -372,7 +378,7 @@ static void thunderx_gpio_irq_disable(struct irq_data *data) * semantics and other acknowledgment tasks associated with the GPIO * mechanism. */ -static struct irq_chip thunderx_gpio_irq_chip = { +static const struct irq_chip thunderx_gpio_irq_chip = { .name = "GPIO", .irq_enable = thunderx_gpio_irq_enable, .irq_disable = thunderx_gpio_irq_disable, @@ -383,8 +389,8 @@ static struct irq_chip thunderx_gpio_irq_chip = { .irq_eoi = irq_chip_eoi_parent, .irq_set_affinity = irq_chip_set_affinity_parent, .irq_set_type = thunderx_gpio_irq_set_type, - - .flags = IRQCHIP_SET_TYPE_MASKED + .flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; static int thunderx_gpio_child_to_parent_hwirq(struct gpio_chip *gc, @@ -526,7 +532,7 @@ static int thunderx_gpio_probe(struct pci_dev *pdev, chip->set_multiple = thunderx_gpio_set_multiple; chip->set_config = thunderx_gpio_set_config; girq = &chip->irq; - girq->chip = &thunderx_gpio_irq_chip; + gpio_irq_chip_set_chip(girq, &thunderx_gpio_irq_chip); girq->fwnode = of_node_to_fwnode(dev->of_node); girq->parent_domain = irq_get_irq_data(txgpio->msix_entries[0].vector)->domain; -- 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-20 9:55 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-20 9:55 [PATCH 0/9] Mass convert GPIO IRQ chips to be immutable part 2 Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 1/9] gpio: rda: Convert to immutable irq_chip Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 10:34 ` Manivannan Sadhasivam 2023-03-20 10:34 ` Manivannan Sadhasivam 2023-03-20 9:55 ` [PATCH 2/9] gpio: siox: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 3/9] gpio: stmpe: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` Linus Walleij [this message] 2023-03-20 9:55 ` [PATCH 4/9] gpio: thunderx: " Linus Walleij 2023-03-20 9:55 ` [PATCH 5/9] gpio: tqmx86: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 6/9] gpio: visconti: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 7/9] gpio: xgs-iproc: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 8/9] gpio: xilinx: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 9/9] gpio: xlp: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 11:10 ` [PATCH 0/9] Mass convert GPIO IRQ chips to be immutable part 2 Marc Zyngier 2023-03-20 11:10 ` Marc Zyngier 2023-03-22 16:52 ` Bartosz Golaszewski 2023-03-22 16:52 ` Bartosz Golaszewski
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=20230316-immutable-chips-2-v1-4-053d6ede831b@linaro.org \ --to=linus.walleij@linaro.org \ --cc=alexandre.torgue@foss.st.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=brgl@bgdev.pl \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=linux-unisoc@lists.infradead.org \ --cc=mani@kernel.org \ --cc=maz@kernel.org \ --cc=mcoquelin.stm32@gmail.com \ --cc=michal.simek@xilinx.com \ --cc=nobuhiro1.iwamatsu@toshiba.co.jp \ --cc=rjui@broadcom.com \ --cc=rric@kernel.org \ --cc=sbranden@broadcom.com \ --cc=shubhrajyoti.datta@xilinx.com \ --cc=srinivas.neeli@xilinx.com \ --cc=t.scherer@eckelmann.de \ --cc=u.kleine-koenig@pengutronix.de \ /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.