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

Commit 2fef3276 authored by Binbin Wu's avatar Binbin Wu Committed by Andy Shevchenko
Browse files

pinctrl: pinctrl-intel: move gpio suspend/resume to noirq phase 



In current driver, SET_LATE_SYSTEM_SLEEP_PM_OPS is used to install the
callbacks for suspend/resume.
GPIO pin may be used as the interrupt pin by some device. However, using
SET_LATE_SYSTEM_SLEEP_PM_OPS() to install the callbacks, the resume
callback is called after resume_device_irqs(). Unintended interrupts may
arrive due to resuming device irqs first, but the GPIO controller is not
properly restored.

Normally, for a SMP system, there are multiple cores, so even when there are
unintended interrupts, BSP gets the chance to initialize the GPIO chip soon.
But when there is only 1 core is active (other cores are offlined or
single core) during resume, it is more easily to observe the unintended
interrupts.

This patch renames the suspend/resume function by adding suffix "_noirq",
and installs the callbacks using SET_NOIRQ_SYSTEM_SLEEP_PM_OPS().

Signed-off-by: default avatarBinbin Wu <binbin.wu@intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 10d64c87

drivers/pinctrl/intel/pinctrl-intel.c

+4 −4
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int 
	return false;

}



int intel_pinctrl_suspend(struct device *dev)

int intel_pinctrl_suspend_noirq(struct device *dev)

{

	struct intel_pinctrl *pctrl = dev_get_drvdata(dev);

	struct intel_community_context *communities;
@@ -1505,7 +1505,7 @@ int intel_pinctrl_suspend(struct device *dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(intel_pinctrl_suspend);

EXPORT_SYMBOL_GPL(intel_pinctrl_suspend_noirq);



static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)

{
@@ -1527,7 +1527,7 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl) 
	}

}



int intel_pinctrl_resume(struct device *dev)

int intel_pinctrl_resume_noirq(struct device *dev)

{

	struct intel_pinctrl *pctrl = dev_get_drvdata(dev);

	const struct intel_community_context *communities;
@@ -1589,7 +1589,7 @@ int intel_pinctrl_resume(struct device *dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(intel_pinctrl_resume);

EXPORT_SYMBOL_GPL(intel_pinctrl_resume_noirq);

#endif



MODULE_AUTHOR("Mathias Nyman <mathias.nyman@linux.intel.com>");

drivers/pinctrl/intel/pinctrl-intel.h

+6 −5
Original line number Diff line number Diff line
@@ -177,13 +177,14 @@ int intel_pinctrl_probe_by_hid(struct platform_device *pdev); 
int intel_pinctrl_probe_by_uid(struct platform_device *pdev);



#ifdef CONFIG_PM_SLEEP

int intel_pinctrl_suspend(struct device *dev);

int intel_pinctrl_resume(struct device *dev);

int intel_pinctrl_suspend_noirq(struct device *dev);

int intel_pinctrl_resume_noirq(struct device *dev);

#endif



#define INTEL_PINCTRL_PM_OPS(_name)					\

const struct dev_pm_ops _name = {					\

	SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend, intel_pinctrl_resume) \

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend_noirq,	\

				      intel_pinctrl_resume_noirq)	\

}



#endif /* PINCTRL_INTEL_H */