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

Commit d3dc4907 authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

mfd: Don't use irq_create_mapping() to resolve a mapping 



[ Upstream commit 9ff80e2de36d0554e3a6da18a171719fe8663c17 ]

Although irq_create_mapping() is able to deal with duplicate
mappings, it really isn't supposed to be a substitute for
irq_find_mapping(), and can result in allocations that take place
in atomic context if the mapping didn't exist.

Fix the handful of MFD drivers that use irq_create_mapping() in
interrupt context by using irq_find_mapping() instead.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 05e4fdd5

drivers/mfd/ab8500-core.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int ab8500_handle_hierarchical_line(struct ab8500 *ab8500, 
		if (line == AB8540_INT_GPIO43F || line == AB8540_INT_GPIO44F)

			line += 1;



		handle_nested_irq(irq_create_mapping(ab8500->domain, line));

		handle_nested_irq(irq_find_mapping(ab8500->domain, line));

	}



	return 0;

drivers/mfd/stmpe.c

+2 −2
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static irqreturn_t stmpe_irq(int irq, void *data) 


	if (variant->id_val == STMPE801_ID ||

	    variant->id_val == STMPE1600_ID) {

		int base = irq_create_mapping(stmpe->domain, 0);

		int base = irq_find_mapping(stmpe->domain, 0);



		handle_nested_irq(base);

		return IRQ_HANDLED;
@@ -1063,7 +1063,7 @@ static irqreturn_t stmpe_irq(int irq, void *data) 
		while (status) {

			int bit = __ffs(status);

			int line = bank * 8 + bit;

			int nestedirq = irq_create_mapping(stmpe->domain, line);

			int nestedirq = irq_find_mapping(stmpe->domain, line);



			handle_nested_irq(nestedirq);

			status &= ~(1 << bit);

drivers/mfd/tc3589x.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static irqreturn_t tc3589x_irq(int irq, void *data) 


	while (status) {

		int bit = __ffs(status);

		int virq = irq_create_mapping(tc3589x->domain, bit);

		int virq = irq_find_mapping(tc3589x->domain, bit);



		handle_nested_irq(virq);

		status &= ~(1 << bit);

drivers/mfd/wm8994-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static irqreturn_t wm8994_edge_irq(int irq, void *data) 
	struct wm8994 *wm8994 = data;



	while (gpio_get_value_cansleep(wm8994->pdata.irq_gpio))

		handle_nested_irq(irq_create_mapping(wm8994->edge_irq, 0));

		handle_nested_irq(irq_find_mapping(wm8994->edge_irq, 0));



	return IRQ_HANDLED;

}