Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b60afee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents 7dcca3e9 9fbbda5c

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -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

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -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

arch/ia64/pci/pci.c

+1 −4
Original line number Diff line number Diff line
@@ -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;