Commit ef902f54 authored by Linus Walleij's avatar Linus Walleij Committed by Bartosz Golaszewski

gpio: thunderx: Convert to immutable irq_chip

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 32585b56
...@@ -354,16 +354,22 @@ static int thunderx_gpio_irq_set_type(struct irq_data *d, ...@@ -354,16 +354,22 @@ static int thunderx_gpio_irq_set_type(struct irq_data *d,
return IRQ_SET_MASK_OK; 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); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
thunderx_gpio_irq_unmask(data);
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); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
irq_chip_disable_parent(data);
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) ...@@ -372,7 +378,7 @@ static void thunderx_gpio_irq_disable(struct irq_data *data)
* semantics and other acknowledgment tasks associated with the GPIO * semantics and other acknowledgment tasks associated with the GPIO
* mechanism. * mechanism.
*/ */
static struct irq_chip thunderx_gpio_irq_chip = { static const struct irq_chip thunderx_gpio_irq_chip = {
.name = "GPIO", .name = "GPIO",
.irq_enable = thunderx_gpio_irq_enable, .irq_enable = thunderx_gpio_irq_enable,
.irq_disable = thunderx_gpio_irq_disable, .irq_disable = thunderx_gpio_irq_disable,
...@@ -383,8 +389,8 @@ static struct irq_chip thunderx_gpio_irq_chip = { ...@@ -383,8 +389,8 @@ static struct irq_chip thunderx_gpio_irq_chip = {
.irq_eoi = irq_chip_eoi_parent, .irq_eoi = irq_chip_eoi_parent,
.irq_set_affinity = irq_chip_set_affinity_parent, .irq_set_affinity = irq_chip_set_affinity_parent,
.irq_set_type = thunderx_gpio_irq_set_type, .irq_set_type = thunderx_gpio_irq_set_type,
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_IMMUTABLE,
.flags = IRQCHIP_SET_TYPE_MASKED GPIOCHIP_IRQ_RESOURCE_HELPERS,
}; };
static int thunderx_gpio_child_to_parent_hwirq(struct gpio_chip *gc, 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, ...@@ -526,7 +532,7 @@ static int thunderx_gpio_probe(struct pci_dev *pdev,
chip->set_multiple = thunderx_gpio_set_multiple; chip->set_multiple = thunderx_gpio_set_multiple;
chip->set_config = thunderx_gpio_set_config; chip->set_config = thunderx_gpio_set_config;
girq = &chip->irq; 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->fwnode = of_node_to_fwnode(dev->of_node);
girq->parent_domain = girq->parent_domain =
irq_get_irq_data(txgpio->msix_entries[0].vector)->domain; irq_get_irq_data(txgpio->msix_entries[0].vector)->domain;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment