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

Commit 181ffd19 authored by Keith Busch's avatar Keith Busch Committed by Bjorn Helgaas
Browse files

x86/PCI: VMD: Move VMD driver to drivers/pci/host 



Move the driver source and Kconfig to the PCI host bridge drivers directory
and move the config option to a more appropriate sub-menu instead of
occupying the top-level location.

Update the Kconfig option with the X86_64 dependency that was implicitly
included from the previous location, and add information about the module
name when built as a loadable module.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Jon Derrick <jonathan.derrick@intel.com>
parent ee6ee49f

arch/x86/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -2744,19 +2744,6 @@ config PMC_ATOM 
	def_bool y

        depends on PCI



config VMD

	depends on PCI_MSI

	tristate "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.



source "net/Kconfig"



source "drivers/Kconfig"

arch/x86/pci/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ obj-y += bus_numa.o 
obj-$(CONFIG_AMD_NB)		+= amd_bus.o

obj-$(CONFIG_PCI_CNB20LE_QUIRK)	+= broadcom_bus.o



obj-$(CONFIG_VMD) += vmd.o



ifeq ($(CONFIG_PCI_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif

drivers/pci/host/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -274,4 +274,20 @@ config PCIE_ARTPEC6 
	  Say Y here to enable PCIe controller support on Axis ARTPEC-6

	  SoCs.  This PCIe controller uses the DesignWare core.



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

drivers/pci/host/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,3 +31,4 @@ obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += pci-thunder-ecam.o 
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_VMD) += vmd.o

arch/x86/pci/vmd.c→drivers/pci/host/vmd.c

+0 −0

File moved.

View file