Skip to content

Commit

Permalink
Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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)
  • Loading branch information
torvalds committed Apr 22, 2015
2 parents 7dcca3e + 9fbbda5 commit 9b60afe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]
M: [email protected]
Expand Down
4 changes: 1 addition & 3 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7533,7 +7533,6 @@ S: Maintained
F: drivers/pci/host/pci-exynos.c

PCI DRIVER FOR SYNOPSIS DESIGNWARE
M: Mohit Kumar <[email protected]>
M: Jingoo Han <[email protected]>
L: [email protected]
S: Maintained
Expand All @@ -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 <[email protected]>
L: [email protected]
S: Maintained
S: Orphan
F: drivers/pci/host/*spear*

PCMCIA SUBSYSTEM
Expand Down
5 changes: 1 addition & 4 deletions arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9b60afe

Please sign in to comment.