Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed

Authored by Rafael J. Wysocki
Committed by Jesse Barnes
1 parent b6e335aeeb
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

PCI/PM: Report wakeup events before resuming devices 

Make wakeup events be reported by the PCI subsystem before attempting to
resume devices or queuing up runtime resume requests for them, because
wakeup events should be reported as soon as they have been detected.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/pci/pci-acpi.c
Diff comments   View file @ 0f953bf
... ... @@ -46,9 +46,9 @@
46 46 struct pci_dev *pci_dev = context;
47 47  
48 48 if (event == ACPI_NOTIFY_DEVICE_WAKE && pci_dev) {
  49 + pci_wakeup_event(pci_dev);
49 50 pci_check_pme_status(pci_dev);
50 51 pm_runtime_resume(&pci_dev->dev);
51   - pci_wakeup_event(pci_dev);
52 52 if (pci_dev->subordinate)
53 53 pci_pme_wakeup_bus(pci_dev->subordinate);
54 54 }
... ... @@ -1308,8 +1308,8 @@
1308 1308 static int pci_pme_wakeup(struct pci_dev *dev, void *ign)
1309 1309 {
1310 1310 if (pci_check_pme_status(dev)) {
1311   - pm_request_resume(&dev->dev);
1312 1311 pci_wakeup_event(dev);
  1312 + pm_request_resume(&dev->dev);
1313 1313 }
1314 1314 return 0;
1315 1315 }
drivers/pci/pcie/pme.c
Diff comments   View file @ 0f953bf
... ... @@ -84,8 +84,8 @@
84 84 list_for_each_entry(dev, &bus->devices, bus_list) {
85 85 /* Skip PCIe devices in case we started from a root port. */
86 86 if (!pci_is_pcie(dev) && pci_check_pme_status(dev)) {
87   - pm_request_resume(&dev->dev);
88 87 pci_wakeup_event(dev);
  88 + pm_request_resume(&dev->dev);
89 89 ret = true;
90 90 }
91 91  
92 92  
... ... @@ -187,8 +187,8 @@
187 187 /* The device is there, but we have to check its PME status. */
188 188 found = pci_check_pme_status(dev);
189 189 if (found) {
190   - pm_request_resume(&dev->dev);
191 190 pci_wakeup_event(dev);
  191 + pm_request_resume(&dev->dev);
192 192 }
193 193 pci_dev_put(dev);
194 194 } else if (devfn) {