xen/pci: clean up Kconfig a bit

Cut down on the maze of PCI-related config options.

[ Impact: Kconfig cleanup ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0533a2eb50eab5e2eae92f572ba93a21fba15a8c..36d3a493f4c17c2c1119b5362f17732ba83aecb7 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1883,8 +1883,8 @@ config PCI_OLPC
        depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
 
 config PCI_XEN
-       def_bool y
-       depends on XEN_PCI_PASSTHROUGH || XEN_DOM0_PCI
+       bool
+       select SWIOTLB
 
 config PCI_DOMAINS
        def_bool y

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index b83e119fbeb0d29a832d68d67409ae72bb3a7400..298170e18bbc6ffb3fb637cd9ebfc9ea86880144 100644 (file)
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -36,3 +36,16 @@ config XEN_DEBUG_FS
        help
          Enable statistics output and various tuning options in debugfs.
          Enabling this option may incur a significant performance overhead.
+
+config XEN_DOM0_PCI
+       def_bool y
+       depends on XEN_DOM0 && PCI
+       select PCI_XEN
+
+config XEN_PCI_PASSTHROUGH
+       bool #"Enable support for Xen PCI passthrough devices"
+       depends on XEN && PCI
+       select PCI_XEN
+       help
+         Enable support for passing PCI devices through to
+        unprivileged domains. (COMPLETELY UNTESTED)