165 lines
5.3 KiB
Diff
165 lines
5.3 KiB
Diff
From: Andreas Noever <andreas.noever@gmail.com>
|
|
Date: Tue, 3 Jun 2014 22:04:09 +0200
|
|
Subject: [1/2] PCI: Add pci_fixup_suspend_late quirk pass
|
|
Origin: https://git.kernel.org/linus/7d2a01b87f1682fde87461864e6682031bfaa0a9
|
|
|
|
Add pci_fixup_suspend_late as a new pci_fixup_pass. The pass is called
|
|
from suspend_noirq and poweroff_noirq. Using the same pass for suspend
|
|
and hibernate is consistent with resume_early which is called by
|
|
resume_noirq and restore_noirq.
|
|
|
|
The new quirk pass is required for Thunderbolt support on Apple
|
|
hardware.
|
|
|
|
Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
|
|
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/pci/pci-driver.c | 18 ++++++++++++++----
|
|
drivers/pci/quirks.c | 7 +++++++
|
|
include/asm-generic/vmlinux.lds.h | 3 +++
|
|
include/linux/pci.h | 12 +++++++++++-
|
|
4 files changed, 35 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/pci/pci-driver.c
|
|
+++ b/drivers/pci/pci-driver.c
|
|
@@ -582,7 +582,7 @@ static int pci_legacy_suspend_late(struc
|
|
WARN_ONCE(pci_dev->current_state != prev,
|
|
"PCI PM: Device state not saved by %pF\n",
|
|
drv->suspend_late);
|
|
- return 0;
|
|
+ goto Fixup;
|
|
}
|
|
}
|
|
|
|
@@ -591,6 +591,9 @@ static int pci_legacy_suspend_late(struc
|
|
|
|
pci_pm_set_unknown_state(pci_dev);
|
|
|
|
+Fixup:
|
|
+ pci_fixup_device(pci_fixup_suspend_late, pci_dev);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -734,7 +737,7 @@ static int pci_pm_suspend_noirq(struct d
|
|
|
|
if (!pm) {
|
|
pci_save_state(pci_dev);
|
|
- return 0;
|
|
+ goto Fixup;
|
|
}
|
|
|
|
if (pm->suspend_noirq) {
|
|
@@ -751,7 +754,7 @@ static int pci_pm_suspend_noirq(struct d
|
|
WARN_ONCE(pci_dev->current_state != prev,
|
|
"PCI PM: State of device not saved by %pF\n",
|
|
pm->suspend_noirq);
|
|
- return 0;
|
|
+ goto Fixup;
|
|
}
|
|
}
|
|
|
|
@@ -775,6 +778,9 @@ static int pci_pm_suspend_noirq(struct d
|
|
if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
|
|
pci_write_config_word(pci_dev, PCI_COMMAND, 0);
|
|
|
|
+Fixup:
|
|
+ pci_fixup_device(pci_fixup_suspend_late, pci_dev);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -999,8 +1005,10 @@ static int pci_pm_poweroff_noirq(struct
|
|
if (pci_has_legacy_pm_support(to_pci_dev(dev)))
|
|
return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
|
|
|
|
- if (!drv || !drv->pm)
|
|
+ if (!drv || !drv->pm) {
|
|
+ pci_fixup_device(pci_fixup_suspend_late, pci_dev);
|
|
return 0;
|
|
+ }
|
|
|
|
if (drv->pm->poweroff_noirq) {
|
|
int error;
|
|
@@ -1021,6 +1029,8 @@ static int pci_pm_poweroff_noirq(struct
|
|
if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)
|
|
pci_write_config_word(pci_dev, PCI_COMMAND, 0);
|
|
|
|
+ pci_fixup_device(pci_fixup_suspend_late, pci_dev);
|
|
+
|
|
if (pcibios_pm_ops.poweroff_noirq)
|
|
return pcibios_pm_ops.poweroff_noirq(dev);
|
|
|
|
--- a/drivers/pci/quirks.c
|
|
+++ b/drivers/pci/quirks.c
|
|
@@ -3038,6 +3038,8 @@ extern struct pci_fixup __start_pci_fixu
|
|
extern struct pci_fixup __end_pci_fixups_resume_early[];
|
|
extern struct pci_fixup __start_pci_fixups_suspend[];
|
|
extern struct pci_fixup __end_pci_fixups_suspend[];
|
|
+extern struct pci_fixup __start_pci_fixups_suspend_late[];
|
|
+extern struct pci_fixup __end_pci_fixups_suspend_late[];
|
|
|
|
static bool pci_apply_fixup_final_quirks;
|
|
|
|
@@ -3083,6 +3085,11 @@ void pci_fixup_device(enum pci_fixup_pas
|
|
end = __end_pci_fixups_suspend;
|
|
break;
|
|
|
|
+ case pci_fixup_suspend_late:
|
|
+ start = __start_pci_fixups_suspend_late;
|
|
+ end = __end_pci_fixups_suspend_late;
|
|
+ break;
|
|
+
|
|
default:
|
|
/* stupid compiler warning, you would think with an enum... */
|
|
return;
|
|
--- a/include/asm-generic/vmlinux.lds.h
|
|
+++ b/include/asm-generic/vmlinux.lds.h
|
|
@@ -268,6 +268,9 @@
|
|
VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \
|
|
*(.pci_fixup_suspend) \
|
|
VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \
|
|
+ VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .; \
|
|
+ *(.pci_fixup_suspend_late) \
|
|
+ VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \
|
|
} \
|
|
\
|
|
/* Built-in firmware blobs */ \
|
|
--- a/include/linux/pci.h
|
|
+++ b/include/linux/pci.h
|
|
@@ -1483,8 +1483,9 @@ enum pci_fixup_pass {
|
|
pci_fixup_final, /* Final phase of device fixups */
|
|
pci_fixup_enable, /* pci_enable_device() time */
|
|
pci_fixup_resume, /* pci_device_resume() */
|
|
- pci_fixup_suspend, /* pci_device_suspend */
|
|
+ pci_fixup_suspend, /* pci_device_suspend() */
|
|
pci_fixup_resume_early, /* pci_device_resume_early() */
|
|
+ pci_fixup_suspend_late, /* pci_device_suspend_late() */
|
|
};
|
|
|
|
/* Anonymous variables would be nice... */
|
|
@@ -1525,6 +1526,11 @@ enum pci_fixup_pass {
|
|
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
|
|
suspend##hook, vendor, device, class, \
|
|
class_shift, hook)
|
|
+#define DECLARE_PCI_FIXUP_CLASS_SUSPEND_LATE(vendor, device, class, \
|
|
+ class_shift, hook) \
|
|
+ DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late, \
|
|
+ suspend_late##hook, vendor, device, \
|
|
+ class, class_shift, hook)
|
|
|
|
#define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook) \
|
|
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early, \
|
|
@@ -1550,6 +1556,10 @@ enum pci_fixup_pass {
|
|
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
|
|
suspend##hook, vendor, device, \
|
|
PCI_ANY_ID, 0, hook)
|
|
+#define DECLARE_PCI_FIXUP_SUSPEND_LATE(vendor, device, hook) \
|
|
+ DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late, \
|
|
+ suspend_late##hook, vendor, device, \
|
|
+ PCI_ANY_ID, 0, hook)
|
|
|
|
#ifdef CONFIG_PCI_QUIRKS
|
|
void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
|