leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI updates for v4.1:

Browse Source 
Resource management
     - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)
 
   Miscellaneous
     - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVN7vCAAoJEFmIoMA60/r8ZPUP/AgGrsy7BiDfPM5n7T7DSaAV
 GUeg12cU7s3M5sBk6XUktxpB1AwZuoDrtWe6srMz5H7Q/I9JTiybxEvkRUjXWJbV
 SfOShRwS3JyQAy8G/Ld0idEzDQDcXBAX4uom8xRwpLW/bTPwCCqmHCQnuvK20jbp
 7S3Snl5j/y6ihiX4Mo6J1Bu88CpJeAq/LQ4WBKd0SEXtSuSRkwGO1TPGi1B7vNxp
 YcFM4QSbc/2z+K51RL5ieovJZ71fFpJrFZt1H+f+SBwN5hXDsub6NB8Mj1MyV/bn
 BwoX9ebagSVC5x2LKmwjfCVGMAy1LO3qkYkQ6QQ/56b2YyafzG7GRHkkNE3bNdu1
 p19IZ8uQG/zr5kcwFy6TF9d2nCPmFgjAbWWXgt60pGj5XnO2TOCmcduWmywkS8ld
 xeLeF3SeDuIo1+nL2egNX4ig5pJhhbVYpMgDa+JyFFx/K0at/pl1F6xAVxm2SNPn
 6GVWVXDM4uyksCXeMpPuOtj2bNP3mUloTViDeNPycJwqij+bkrU6VB+nKwBb6iup
 1w2PHOV+94urwqHMI5mdLKdIE2p1a35ks9lT5S2xiWsNf8FCb9DNqqymRRjnNlQk
 IIPFqVleV0rOnsjfHY0SyIRXinXf2f3CYTCYSyl77Zc6UObrC2v7G2SbHKieWy+B
 XYsHftw60GQAfEZRj9aq
 =anh8
 -----END PGP SIGNATURE-----

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)
This commit is contained in:
Linus Torvalds 2015-04-22 11:26:00 -07:00
commit 9b60afee50
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CREDITS
View File

@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India S: Gurgaon, India
S: Kuala Lumpur, Malaysia 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 N: Gabor Kuti
M: seasons@falcon.sch.bme.hu M: seasons@falcon.sch.bme.hu
M: seasons@makosteszta.sote.hu M: seasons@makosteszta.sote.hu

4
MAINTAINERS
View File

@ -7533,7 +7533,6 @@ S: Maintained
F: drivers/pci/host/pci-exynos.c F: drivers/pci/host/pci-exynos.c
PCI DRIVER FOR SYNOPSIS DESIGNWARE PCI DRIVER FOR SYNOPSIS DESIGNWARE
M: Mohit Kumar <mohit.kumar@st.com>
M: Jingoo Han <jg1.han@samsung.com> M: Jingoo Han <jg1.han@samsung.com>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
S: Maintained S: Maintained
@ -7548,9 +7547,8 @@ F: Documentation/devicetree/bindings/pci/host-generic-pci.txt
F: drivers/pci/host/pci-host-generic.c F: drivers/pci/host/pci-host-generic.c
PCIE DRIVER FOR ST SPEAR13XX PCIE DRIVER FOR ST SPEAR13XX
M: Mohit Kumar <mohit.kumar@st.com>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
S: Maintained S: Orphan
F: drivers/pci/host/*spear* F: drivers/pci/host/*spear*
PCMCIA SUBSYSTEM PCMCIA SUBSYSTEM

5
arch/ia64/pci/pci.c
View File

@ -240,15 +240,12 @@ static acpi_status resource_to_window(struct acpi_resource *resource,
* We're only interested in _CRS descriptors that are * We're only interested in _CRS descriptors that are
* - address space descriptors for memory or I/O space * - address space descriptors for memory or I/O space
* - non-zero size * - 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); status = acpi_resource_to_address64(resource, addr);
if (ACPI_SUCCESS(status) && if (ACPI_SUCCESS(status) &&
(addr->resource_type == ACPI_MEMORY_RANGE || (addr->resource_type == ACPI_MEMORY_RANGE ||
addr->resource_type == ACPI_IO_RANGE) && addr->resource_type == ACPI_IO_RANGE) &&
addr->address.address_length && addr->address.address_length)
addr->producer_consumer == ACPI_PRODUCER)
return AE_OK; return AE_OK;
return AE_ERROR; return AE_ERROR;