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

Commit a00c74c1 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi',... 

Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/pm' and 'pci/virtualization' into next

* pci/aspm:
  PCI/ASPM: Remove redundant check of pcie_set_clkpm

* pci/dpc:
  PCI: Remove DPC tristate module option
  PCI: Bind DPC to Root Ports as well as Downstream Ports
  PCI: Fix whitespace in struct dpc_dev
  PCI: Convert Downstream Port Containment driver to use devm_* functions

* pci/hotplug:
  PCI: Allow additional bus numbers for hotplug bridges

* pci/misc:
  PCI: Include <asm/dma.h> for isa_dma_bridge_buggy
  PCI: Make bus_attr_resource_alignment static
  MAINTAINERS: Add file patterns for PCI device tree bindings
  PCI: Fix comment typo

* pci/msi:
  PCI/MSI: irqchip: Fix PCI_MSI dependencies

* pci/pm:
  PCI: pciehp: Ignore interrupts during D3cold
  PCI: Document connection between pci_power_t and hardware PM capability
  PCI: Add runtime PM support for PCIe ports
  ACPI / hotplug / PCI: Runtime resume bridge before rescan
  PCI: Power on bridges before scanning new devices
  PCI: Put PCIe ports into D3 during suspend
  PCI: Don't clear d3cold_allowed for PCIe ports
  PCI / PM: Enforce type casting for pci_power_t

* pci/virtualization:
  PCI: Add ACS quirk for Solarflare SFC9220
  PCI: Add DMA alias quirk for Adaptec 3805
  PCI: Mark Atheros AR9485 and QCA9882 to avoid bus reset
  PCI: Add function 1 DMA alias quirk for Marvell 88SE9182
parents c5cb85b2 a6c1c6f3 a4959d8c e16b4660 2a2aca31 3ee80364 ed91de7e 9fad4012

Documentation/kernel-parameters.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -3016,6 +3016,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		hpmemsize=nn[KMG]	The fixed amount of bus space which is

		hpmemsize=nn[KMG]	The fixed amount of bus space which is

				reserved for hotplug bridge's memory window.

				reserved for hotplug bridge's memory window.

				Default size is 2 megabytes.

				Default size is 2 megabytes.

		hpbussize=nn	The minimum amount of additional bus numbers

				reserved for buses below a hotplug bridge.

				Default is 1.

		realloc=	Enable/disable reallocating PCI bridge resources

		realloc=	Enable/disable reallocating PCI bridge resources

				if allocations done by BIOS are too small to

				if allocations done by BIOS are too small to

				accommodate resources required by all child

				accommodate resources required by all child
@@ -3047,6 +3050,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		compat	Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe

		compat	Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe

			ports driver.

			ports driver.





	pcie_port_pm=	[PCIE] PCIe port power management handling:

		off	Disable power management of all PCIe ports

		force	Forcibly enable power management of all PCIe ports



	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

		nomsi	Do not use MSI for native PCIe PME signaling (this makes

		nomsi	Do not use MSI for native PCIe PME signaling (this makes

			all PCIe root ports use INTx for all services).

			all PCIe root ports use INTx for all services).

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -8678,6 +8678,7 @@ L: linux-pci@vger.kernel.org 
Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git

S:	Supported

S:	Supported

F:	Documentation/devicetree/bindings/pci/

F:	Documentation/PCI/

F:	Documentation/PCI/

F:	drivers/pci/

F:	drivers/pci/

F:	include/linux/pci*

F:	include/linux/pci*

arch/arm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -715,7 +715,7 @@ config ARCH_VIRT 
	depends on ARCH_MULTI_V7

	depends on ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_AMBA

	select ARM_GIC

	select ARM_GIC

	select ARM_GIC_V2M if PCI_MSI

	select ARM_GIC_V2M if PCI

	select ARM_GIC_V3

	select ARM_GIC_V3

	select ARM_PSCI

	select ARM_PSCI

	select HAVE_ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

arch/arm64/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ config ARM64 
	select ARM_ARCH_TIMER

	select ARM_ARCH_TIMER

	select ARM_GIC

	select ARM_GIC

	select AUDIT_ARCH_COMPAT_GENERIC

	select AUDIT_ARCH_COMPAT_GENERIC

	select ARM_GIC_V2M if PCI_MSI

	select ARM_GIC_V2M if PCI

	select ARM_GIC_V3

	select ARM_GIC_V3

	select ARM_GIC_V3_ITS if PCI_MSI

	select ARM_GIC_V3_ITS if PCI

	select ARM_PSCI_FW

	select ARM_PSCI_FW

	select BUILDTIME_EXTABLE_SORT

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	select CLONE_BACKWARDS

arch/x86/pci/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev) 
	if (pci_probe & PCI_NOASSIGN_BARS) {

	if (pci_probe & PCI_NOASSIGN_BARS) {

		/*

		/*

		* If the BIOS did not assign the BAR, zero out the

		* If the BIOS did not assign the BAR, zero out the

		* resource so the kernel doesn't attmept to assign

		* resource so the kernel doesn't attempt to assign

		* it later on in pci_assign_unassigned_resources

		* it later on in pci_assign_unassigned_resources

		*/

		*/

		for (bar = 0; bar <= PCI_STD_RESOURCE_END; bar++) {

		for (bar = 0; bar <= PCI_STD_RESOURCE_END; bar++) {