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

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

Merge branch 'for-linus' 

* for-linus:
  PCI: Fix is_added/is_busmaster race condition
  PCI: mobiveil: Avoid integer overflow in IB_WIN_SIZE
  PCI/AER: Work around use-after-free in pcie_do_fatal_recovery()
  PCI: v3-semi: Fix I/O space page leak
  PCI: mediatek: Fix I/O space page leak
  PCI: faraday: Fix I/O space page leak
  PCI: aardvark: Fix I/O space page leak
  PCI: designware: Fix I/O space page leak
  PCI: versatile: Fix I/O space page leak
  PCI: xgene: Fix I/O space page leak
  PCI: OF: Fix I/O space page leak
  PCI: endpoint: Fix NULL pointer dereference error when CONFIGFS is disabled
  PCI: hv: Disable/enable IRQs rather than BH in hv_compose_msi_msg()
  nfp: stop limiting VFs to 0
  PCI/IOV: Reset total_VFs limit after detaching PF driver
  PCI: faraday: Add missing of_node_put()
  PCI: xilinx-nwl: Add missing of_node_put()
  PCI: xilinx: Add missing of_node_put()
  PCI: endpoint: Use after free in pci_epf_unregister_driver()
  PCI: controller: dwc: Do not let PCIE_DW_PLAT_HOST default to yes
  PCI: rcar: Clean up PHY init on failure
  PCI: rcar: Shut the PHY down in failpath
  PCI: controller: Move PCI_DOMAINS selection to arch Kconfig
  PCI: Initialize endpoint library before controllers
  PCI: shpchp: Manage SHPC unconditionally on non-ACPI systems
parents ce397d21 44bda4b7

arch/arm/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -1245,8 +1245,14 @@ config PCI 
	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

	bool

	bool "Support for multiple PCI domains"

	depends on PCI

	help

	  Enable PCI domains kernel management. Say Y if your machine

	  has a PCI bus hierarchy that requires more than one PCI

	  domain (aka segment) to be correctly managed. Say N otherwise.



	  If you don't know what to do here, say N.



config PCI_DOMAINS_GENERIC

	def_bool PCI_DOMAINS

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config ARCH_BCM_IPROC 
	select GPIOLIB

	select ARM_AMBA

	select PINCTRL

	select PCI_DOMAINS if PCI

	help

	  This enables support for systems based on Broadcom IPROC architected SoCs.

	  The IPROC complex contains one or more ARM CPUs along with common

arch/arm/mach-socfpga/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ menuconfig ARCH_SOCFPGA 
	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select MFD_SYSCON

	select PCI_DOMAINS if PCI



if ARCH_SOCFPGA

config SOCFPGA_SUSPEND

arch/powerpc/kernel/pci-common.c

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include <asm/ppc-pci.h>

#include <asm/eeh.h>



#include "../../../drivers/pci/pci.h"



/* hose_spinlock protects accesses to the the phb_bitmap. */

static DEFINE_SPINLOCK(hose_spinlock);

LIST_HEAD(hose_list);
@@ -1014,7 +1016,7 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) 
		/* Cardbus can call us to add new devices to a bus, so ignore

		 * those who are already fully discovered

		 */

		if (dev->is_added)

		if (pci_dev_is_added(dev))

			continue;



		pcibios_setup_device(dev);

arch/powerpc/platforms/powernv/pci-ioda.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include "powernv.h"

#include "pci.h"

#include "../../../../drivers/pci/pci.h"



#define PNV_IODA1_M64_NUM	16	/* Number of M64 BARs	*/

#define PNV_IODA1_M64_SEGS	8	/* Segments per M64 BAR	*/
@@ -3138,7 +3139,7 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) 
	struct pci_dn *pdn;

	int mul, total_vfs;



	if (!pdev->is_physfn || pdev->is_added)

	if (!pdev->is_physfn || pci_dev_is_added(pdev))

		return;



	pdn = pci_get_pdn(pdev);