]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
pinctrl: armada-37xx: change suspend/resume time
authorMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 8 Jan 2019 16:28:43 +0000 (17:28 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 21 Jan 2019 13:12:50 +0000 (14:12 +0100)
Armada 3700 PCIe IP relies on the pinctrl IP managed by this
driver. For reasons related to the PCI core's organization when
suspending/resuming, PCI host controller drivers must reconfigure
their register at suspend_noirq()/resume_noirq() which happens after
suspend()/suspend_late() and before resume_early()/resume().

In the current state, after resuming from a suspend to RAM cycle the
PCIe IP is reconfigured before the pinctrl one which produces an
interrupt storm. The solution to support PCIe resume operation is to
change the "priority" of this pinctrl driver PM callbacks to
"_noirq()".

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

index 4b9f2cf94431a6ae7718843fc997b40483d3493b..6462d3ca7ceb9b44b406015397102eadec5c2f99 100644 (file)
@@ -1107,8 +1107,8 @@ static int armada_3700_pinctrl_resume(struct device *dev)
  * to other IO drivers.
  */
 static const struct dev_pm_ops armada_3700_pinctrl_pm_ops = {
-       .suspend_late = armada_3700_pinctrl_suspend,
-       .resume_early = armada_3700_pinctrl_resume,
+       .suspend_noirq = armada_3700_pinctrl_suspend,
+       .resume_noirq = armada_3700_pinctrl_resume,
 };
 
 #define PINCTRL_ARMADA_37XX_DEV_PM_OPS (&armada_3700_pinctrl_pm_ops)