summarylogtreecommitdiffstats
path: root/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
diff options
context:
space:
mode:
authorTony Lambiris2017-11-22 23:57:44 -0500
committerTony Lambiris2017-11-23 00:00:11 -0500
commiteae85ae397cc33d8d0eec2c19cce2031a84dc109 (patch)
tree0cdaa4947be801f23c8eaac2718e27b471aac860 /RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
parent7d090451fb7dc3ea4afc1e37fa22bcef756c83fb (diff)
downloadaur-eae85ae397cc33d8d0eec2c19cce2031a84dc109.tar.gz
Sync to linux 4.14
Add .SRCINFO
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.patch12
1 files changed, 6 insertions, 6 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
index 9bfaffb87fc..0794c3856be 100644
--- a/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
+++ b/RFC-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
@@ -23,10 +23,11 @@ index ee72ebe..e347047 100644
case pci_fixup_enable:
start = __start_pci_fixups_enable;
end = __end_pci_fixups_enable;
-@@ -4551,6 +4551,24 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev)
+@@ -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.
+ */
@@ -44,10 +45,9 @@ index ee72ebe..e347047 100644
+}
+DECLARE_PCI_FIXUP_ASSIGN(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_mac_disable_mmio_bar);
+
-+/*
- * VMD-enabled root ports will change the source ID for all messages
- * to the VMD device. Rather than doing device matching with the source
- * ID, the AER driver should traverse the child device tree, reading
+ /* 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