summarylogtreecommitdiffstats
path: root/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
diff options
context:
space:
mode:
authorTony Lambiris2018-03-22 23:50:24 -0400
committerTony Lambiris2018-03-22 23:50:24 -0400
commit2b509d407ab5815fedf6747594f06f57959c6676 (patch)
tree3f070bd484ad5155799ea95091096239c853cd96 /RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
parent37dd51e7485863783c796448b58732a02b22273e (diff)
downloadaur-2b509d407ab5815fedf6747594f06f57959c6676.tar.gz
Version bump
Diffstat (limited to 'RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch')
-rw-r--r--RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch111
1 files changed, 111 insertions, 0 deletions
diff --git a/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch b/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
new file mode 100644
index 00000000000..0794c3856be
--- /dev/null
+++ b/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
@@ -0,0 +1,111 @@
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index ee72ebe..e347047 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -3370,6 +3370,8 @@ extern struct pci_fixup __start_pci_fixups_header[];
+ extern struct pci_fixup __end_pci_fixups_header[];
+ extern struct pci_fixup __start_pci_fixups_final[];
+ extern struct pci_fixup __end_pci_fixups_final[];
++extern struct pci_fixup __start_pci_fixups_assign[];
++extern struct pci_fixup __end_pci_fixups_assign[];
+ extern struct pci_fixup __start_pci_fixups_enable[];
+ extern struct pci_fixup __end_pci_fixups_enable[];
+ extern struct pci_fixup __start_pci_fixups_resume[];
+@@ -3405,6 +3407,11 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
+ end = __end_pci_fixups_final;
+ break;
+
++ case pci_fixup_assign:
++ start = __start_pci_fixups_assign;
++ end = __end_pci_fixups_assign;
++ break;
++
+ case pci_fixup_enable:
+ start = __start_pci_fixups_enable;
+ end = __end_pci_fixups_enable;
+@@ -4762,6 +4769,24 @@
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
+
++/*
++ * On Mac Pro 11, the allocation of pci bridge memory resource
++ * broke ACPI Sleep Type register region.
++ */
++static void quirk_mac_disable_mmio_bar(struct pci_dev *dev)
++{
++ struct resource *b_res;
++
++ dev_info(&dev->dev, "[Quirk] Disable mmio on Mac Pro 11\n");
++ if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
++ return;
++
++ b_res = &dev->resource[PCI_BRIDGE_RESOURCES];
++ b_res[1].flags = 0;
++ b_res[2].flags = 0;
++}
++DECLARE_PCI_FIXUP_ASSIGN(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_mac_disable_mmio_bar);
++
+ /* FLR may cause some 82579 devices to hang. */
+ static void quirk_intel_no_flr(struct pci_dev *dev)
+ {
+diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
+index 55641a3..730d6fd 100644
+--- a/drivers/pci/setup-bus.c
++++ b/drivers/pci/setup-bus.c
+@@ -1256,6 +1256,8 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head)
+ additional_io_size = pci_hotplug_io_size;
+ additional_mem_size = pci_hotplug_mem_size;
+ }
++
++ pci_fixup_device(pci_fixup_assign, bus->self);
+ /* Fall through */
+ default:
+ pbus_size_io(bus, realloc_head ? 0 : additional_io_size,
+diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
+index 6a67ab9..3ba05f0 100644
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -299,6 +299,9 @@
+ VMLINUX_SYMBOL(__start_pci_fixups_final) = .; \
+ KEEP(*(.pci_fixup_final)) \
+ VMLINUX_SYMBOL(__end_pci_fixups_final) = .; \
++ VMLINUX_SYMBOL(__start_pci_fixups_assign) = .; \
++ KEEP(*(.pci_fixup_assign)) \
++ VMLINUX_SYMBOL(__end_pci_fixups_assign) = .; \
+ VMLINUX_SYMBOL(__start_pci_fixups_enable) = .; \
+ KEEP(*(.pci_fixup_enable)) \
+ VMLINUX_SYMBOL(__end_pci_fixups_enable) = .; \
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index b67e4df..14a35bb 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -1584,6 +1584,7 @@ enum pci_fixup_pass {
+ pci_fixup_early, /* Before probing BARs */
+ pci_fixup_header, /* After reading configuration header */
+ pci_fixup_final, /* Final phase of device fixups */
++ pci_fixup_assign, /* Before resource assignment */
+ pci_fixup_enable, /* pci_enable_device() time */
+ pci_fixup_resume, /* pci_device_resume() */
+ pci_fixup_suspend, /* pci_device_suspend() */
+@@ -1644,6 +1645,9 @@ enum pci_fixup_pass {
+ #define DECLARE_PCI_FIXUP_FINAL(vendor, device, hook) \
+ DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final, \
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
++#define DECLARE_PCI_FIXUP_ASSIGN(vendor, device, hook) \
++ DECLARE_PCI_FIXUP_SECTION(.pci_fixup_assign, \
++ hook, vendor, device, PCI_ANY_ID, 0, hook)
+ #define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook) \
+ DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable, \
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index 48958d3..248acdb 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -877,6 +877,7 @@ static void check_section(const char *modname, struct elf_info *elf,
+
+ #define ALL_PCI_INIT_SECTIONS \
+ ".pci_fixup_early", ".pci_fixup_header", ".pci_fixup_final", \
++ ".pci_fixup_assign", \
+ ".pci_fixup_enable", ".pci_fixup_resume", \
+ ".pci_fixup_resume_early", ".pci_fixup_suspend"
+