From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 5 Oct 2016 19:00:21 +0000 (-0500)
Subject: Merge branch 'pci/host-vmd' into next
X-Git-Tag: v4.9-rc1~92^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bdf530984d10b6b88b10a6d03057409a3f1c6897;p=linux.git

Merge branch 'pci/host-vmd' into next

* pci/host-vmd:
  x86/PCI: VMD: Move VMD driver to drivers/pci/host
  x86/PCI: VMD: Synchronize with RCU freeing MSI IRQ descs
  x86/PCI: VMD: Eliminate index member from IRQ list
  x86/PCI: VMD: Eliminate vmd_vector member from list type
  x86/PCI: VMD: Convert to use pci_alloc_irq_vectors() API
  x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count
  PCI: Use positive flags in pci_alloc_irq_vectors()
  PCI: Update "pci=resource_alignment" documentation

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile
---

bdf530984d10b6b88b10a6d03057409a3f1c6897
diff --cc drivers/pci/host/Kconfig
index 90f5e89854be,93865eb2c4c8..d7e7c0a827c3
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -274,15 -274,20 +274,31 @@@ config PCIE_ARTPEC
  	  Say Y here to enable PCIe controller support on Axis ARTPEC-6
  	  SoCs.  This PCIe controller uses the DesignWare core.
  
 +config PCIE_ROCKCHIP
 +	bool "Rockchip PCIe controller"
 +	depends on ARCH_ROCKCHIP
 +	depends on OF
 +	depends on PCI_MSI_IRQ_DOMAIN
 +	select MFD_SYSCON
 +	help
 +	  Say Y here if you want internal PCI support on Rockchip SoC.
 +	  There is 1 internal PCIe port available to support GEN2 with
 +	  4 slots.
 +
+ config VMD
+ 	depends on PCI_MSI && X86_64
+ 	tristate "Intel Volume Management Device Driver"
+ 	default N
+ 	---help---
+ 	  Adds support for the Intel Volume Management Device (VMD). VMD is a
+ 	  secondary PCI host bridge that allows PCI Express root ports,
+ 	  and devices attached to them, to be removed from the default
+ 	  PCI domain and placed within the VMD domain. This provides
+ 	  more bus resources than are otherwise possible with a
+ 	  single domain. If you know your system provides one of these and
+ 	  has devices attached to it, say Y; if you are not sure, say N.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called vmd.
+ 
  endmenu
diff --cc drivers/pci/host/Makefile
index a8afc16b0299,afea1c61e45a..084cb4983645
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -31,4 -31,4 +31,5 @@@ obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += 
  obj-$(CONFIG_PCI_HOST_THUNDER_PEM) += pci-thunder-pem.o
  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
 +obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
+ obj-$(CONFIG_VMD) += vmd.o