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

Commit 1bcb4312 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

pinctrl: intel: Restore the pins that used to be in Direct IRQ mode 



[ Upstream commit a8520be3ffef3d25b53bf171a7ebe17ee0154175 ]

If the firmware mangled the register contents too much,
check the saved value for the Direct IRQ mode. If it
matches, we will restore the pin state.

Reported-by: default avatarJim Minter <jimminter@microsoft.com>
Fixes: 6989ea4881c8 ("pinctrl: intel: Save and restore pins in "direct IRQ" mode")
Tested-by: default avatarJim Minter <jimminter@microsoft.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20230206141558.20916-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2b763f7d

drivers/pinctrl/intel/pinctrl-intel.c

+13 −3
Original line number Diff line number Diff line
@@ -1510,6 +1510,12 @@ int intel_pinctrl_probe_by_uid(struct platform_device *pdev) 
EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid);



#ifdef CONFIG_PM_SLEEP

static bool __intel_gpio_is_direct_irq(u32 value)

{

	return (value & PADCFG0_GPIROUTIOXAPIC) && (value & PADCFG0_GPIOTXDIS) &&

	       (__intel_gpio_get_gpio_mode(value) == PADCFG0_PMODE_GPIO);

}



static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int pin)

{

	const struct pin_desc *pd = pin_desc_get(pctrl->pctldev, pin);
@@ -1543,8 +1549,7 @@ static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int 
	 * See https://bugzilla.kernel.org/show_bug.cgi?id=214749.

	 */

	value = readl(intel_get_padcfg(pctrl, pin, PADCFG0));

	if ((value & PADCFG0_GPIROUTIOXAPIC) && (value & PADCFG0_GPIOTXDIS) &&

	    (__intel_gpio_get_gpio_mode(value) == PADCFG0_PMODE_GPIO))

	if (__intel_gpio_is_direct_irq(value))

		return true;



	return false;
@@ -1656,7 +1661,12 @@ int intel_pinctrl_resume_noirq(struct device *dev) 
		void __iomem *padcfg;

		u32 val;



		if (!intel_pinctrl_should_save(pctrl, desc->number))

		if (!(intel_pinctrl_should_save(pctrl, desc->number) ||

		      /*

		       * If the firmware mangled the register contents too much,

		       * check the saved value for the Direct IRQ mode.

		       */

		      __intel_gpio_is_direct_irq(pads[i].padcfg0)))

			continue;



		padcfg = intel_get_padcfg(pctrl, desc->number, PADCFG0);