diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 11:26:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 11:26:00 -0700 |
| commit | 9b60afee50425064fa0a69bea22f07b6ea55ebc1 (patch) | |
| tree | 7e570ffc883dc4517c6d01bb7445480ba294494e | |
| parent | 7dcca3e92a34bf8ffdc4c01a49182ce1cb6ff534 (diff) | |
| parent | 9fbbda5c8e0ab9c391e4160a0eb3a06260f9f668 (diff) | |
Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These fix an ia64 regression caused by tighter resource checking we
merged during the merge window and remove an invalid email address
from MAINTAINERS.
Resource management:
- ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)
Miscellaneous:
- MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"
* tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows
MAINTAINERS: Remove Mohit Kumar (email bounces)
| -rw-r--r-- | CREDITS | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | arch/ia64/pci/pci.c | 5 |
3 files changed, 6 insertions, 7 deletions
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver S: Gurgaon, India S: Kuala Lumpur, Malaysia +N: Mohit Kumar +D: ST Microelectronics SPEAr13xx PCI host bridge driver +D: Synopsys Designware PCI host bridge driver + N: Gabor Kuti M: seasons@falcon.sch.bme.hu M: seasons@makosteszta.sote.hu diff --git a/MAINTAINERS b/MAINTAINERS index df536b1207ee..ad5b42913527 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7533,7 +7533,6 @@ S: Maintained F: drivers/pci/host/pci-exynos.c PCI DRIVER FOR SYNOPSIS DESIGNWARE -M: Mohit Kumar <mohit.kumar@st.com> M: Jingoo Han <jg1.han@samsung.com> L: linux-pci@vger.kernel.org S: Maintained @@ -7548,9 +7547,8 @@ F: Documentation/devicetree/bindings/pci/host-generic-pci.txt F: drivers/pci/host/pci-host-generic.c PCIE DRIVER FOR ST SPEAR13XX -M: Mohit Kumar <mohit.kumar@st.com> L: linux-pci@vger.kernel.org -S: Maintained +S: Orphan F: drivers/pci/host/*spear* PCMCIA SUBSYSTEM diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 48cc65705db4..d4e162d35b34 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -240,15 +240,12 @@ static acpi_status resource_to_window(struct acpi_resource *resource, * We're only interested in _CRS descriptors that are * - address space descriptors for memory or I/O space * - non-zero size - * - producers, i.e., the address space is routed downstream, - * not consumed by the bridge itself */ status = acpi_resource_to_address64(resource, addr); if (ACPI_SUCCESS(status) && (addr->resource_type == ACPI_MEMORY_RANGE || addr->resource_type == ACPI_IO_RANGE) && - addr->address.address_length && - addr->producer_consumer == ACPI_PRODUCER) + addr->address.address_length) return AE_OK; return AE_ERROR; |