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

Commit 9a520fd9 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: intel: Protect set wake flow by spin lock 



It seems intel_gpio_irq_wake() misses lock protection against I/O flow.
Use spin lock here as well.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a6e5e4a6

drivers/pinctrl/intel/pinctrl-intel.c

+5 −0
Original line number Diff line number Diff line
@@ -796,12 +796,15 @@ static int intel_gpio_irq_wake(struct irq_data *d, unsigned int on) 
	const struct intel_community *community;

	unsigned pin = irqd_to_hwirq(d);

	unsigned padno, gpp, gpp_offset;

	unsigned long flags;

	u32 gpe_en;



	community = intel_get_community(pctrl, pin);

	if (!community)

		return -EINVAL;



	raw_spin_lock_irqsave(&pctrl->lock, flags);



	padno = pin_to_padno(community, pin);

	gpp = padno / community->gpp_size;

	gpp_offset = padno % community->gpp_size;
@@ -821,6 +824,8 @@ static int intel_gpio_irq_wake(struct irq_data *d, unsigned int on) 
		gpe_en &= ~BIT(gpp_offset);

	writel(gpe_en, community->regs + GPI_GPE_EN + gpp * 4);



	raw_spin_unlock_irqrestore(&pctrl->lock, flags);



	dev_dbg(pctrl->dev, "%sable wake for pin %u\n", on ? "en" : "dis", pin);

	return 0;

}