diff options
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.patch | 14 |
1 files changed, 7 insertions, 7 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 16168095d492..ec7874a018eb 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 @@ -51,7 +51,7 @@ index ee72ebe..e347047 100644 /* * This is a quirk for the Ricoh MMC controller found as a part of some * multifunction chips. -@@ -4665,6 +4672,24 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) +@@ -5099,6 +5106,24 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) } DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap); @@ -73,20 +73,20 @@ index ee72ebe..e347047 100644 +} +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) - { + /* + * FLR may cause the following to devices to hang: + * 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; + additional_mmio_size = pci_hotplug_mmio_size; + additional_mmio_pref_size = pci_hotplug_mmio_pref_size; } + + pci_fixup_device(pci_fixup_assign, bus->self); - /* Fall through */ + fallthrough; 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 |