Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a6b05d authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Greg Kroah-Hartman
Browse files

pinctrl: stm32: fix optional IRQ support to gpios 



commit a1d4ef1adf8bbd302067534ead671a94759687ed upstream.

To act as an interrupt controller, a gpio bank relies on the
"interrupt-parent" of the pin controller.
When this optional "interrupt-parent" misses, do not create any IRQ domain.

This fixes a "NULL pointer in stm32_gpio_domain_alloc()" kernel crash when
the interrupt-parent = <exti> property is not declared in the Device Tree.

Fixes: 0eb9f683 ("pinctrl: Add IRQ support to STM32 gpios")
Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@foss.st.com>
Link: https://lore.kernel.org/r/20220627142350.742973-1-fabien.dessenne@foss.st.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 002c3bbb

drivers/pinctrl/stm32/pinctrl-stm32.c

+11 −7
Original line number Diff line number Diff line
@@ -1215,15 +1215,17 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, 
	bank->bank_ioport_nr = bank_ioport_nr;

	spin_lock_init(&bank->lock);



	if (pctl->domain) {

		/* create irq hierarchical domain */

		bank->fwnode = of_node_to_fwnode(np);



	bank->domain = irq_domain_create_hierarchy(pctl->domain, 0,

					STM32_GPIO_IRQ_LINE, bank->fwnode,

					&stm32_gpio_domain_ops, bank);

		bank->domain = irq_domain_create_hierarchy(pctl->domain, 0, STM32_GPIO_IRQ_LINE,

							   bank->fwnode, &stm32_gpio_domain_ops,

							   bank);



		if (!bank->domain)

			return -ENODEV;

	}



	err = gpiochip_add_data(&bank->gpio_chip, bank);

	if (err) {
@@ -1393,6 +1395,8 @@ int stm32_pctl_probe(struct platform_device *pdev) 
	pctl->domain = stm32_pctrl_get_irq_domain(np);

	if (IS_ERR(pctl->domain))

		return PTR_ERR(pctl->domain);

	if (!pctl->domain)

		dev_warn(dev, "pinctrl without interrupt support\n");



	/* hwspinlock is optional */

	hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);