Commit 2eac9c2d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada
Browse files

PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options



Move the definitions to drivers/pci and let the architectures select
them.  Two small differences to before: PCI_DOMAINS_GENERIC now selects
PCI_DOMAINS, cutting down the churn for modern architectures.  As the
only architectured arm did previously also offer PCI_DOMAINS as a user
visible choice in addition to selecting it from the relevant configs,
this is gone now.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent eb01d42a
......@@ -7,6 +7,7 @@ config ALPHA
select ARCH_NO_PREEMPT
select ARCH_USE_CMPXCHG_LOCKREF
select FORCE_PCI if !ALPHA_JENSEN
select PCI_DOMAINS if PCI
select HAVE_AOUT
select HAVE_IDE
select HAVE_OPROFILE
......@@ -321,10 +322,6 @@ config ISA_DMA_API
bool
default y
config PCI_DOMAINS
bool
default y
config PCI_SYSCALL
def_bool PCI
......
......@@ -331,7 +331,7 @@ config ARCH_MULTIPLATFORM
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER
select HAVE_PCI
select PCI_DOMAINS if PCI
select PCI_DOMAINS_GENERIC if PCI
select SPARSE_IRQ
select USE_OF
......@@ -1227,19 +1227,6 @@ config ISA_DMA
config ISA_DMA_API
bool
config PCI_DOMAINS
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
config PCI_NANOENGINE
bool "BSE nanoEngine PCI support"
depends on SA1100_NANOENGINE
......
......@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC
select GPIOLIB
select ARM_AMBA
select PINCTRL
select PCI_DOMAINS if PCI
select PCI_DOMAINS_GENERIC 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
......
......@@ -10,7 +10,7 @@ menuconfig ARCH_SOCFPGA
select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP
select MFD_SYSCON
select PCI_DOMAINS if PCI
select PCI_DOMAINS_GENERIC if PCI
if ARCH_SOCFPGA
config SOCFPGA_SUSPEND
......
......@@ -164,6 +164,7 @@ config ARM64
select OF
select OF_EARLY_FLATTREE
select OF_RESERVED_MEM
select PCI_DOMAINS_GENERIC if PCI
select PCI_ECAM if ACPI
select POWER_RESET
select POWER_SUPPLY
......@@ -288,12 +289,6 @@ config ARCH_PROC_KCORE_TEXT
source "arch/arm64/Kconfig.platforms"
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI
config PCI_SYSCALL
def_bool PCI
......
......@@ -15,6 +15,7 @@ config IA64
select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select FORCE_PCI if (!IA64_HP_SIM)
select PCI_DOMAINS if PCI
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_EXIT_THREAD
select HAVE_IDE
......@@ -544,9 +545,6 @@ if !IA64_HP_SIM
menu "Bus options (PCI, PCMCIA)"
config PCI_DOMAINS
def_bool PCI
config PCI_SYSCALL
def_bool PCI
......
......@@ -36,6 +36,7 @@ config MICROBLAZE
select MODULES_USE_ELF_RELA
select OF
select OF_EARLY_FLATTREE
select PCI_DOMAINS_GENERIC if PCI
select TRACING_SUPPORT
select VIRT_TO_BUS
select CPU_NO_EFFICIENT_FFS
......@@ -267,12 +268,6 @@ endmenu
menu "Bus Options"
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI_DOMAINS
config PCI_SYSCALL
def_bool PCI
......
......@@ -73,7 +73,6 @@ config MIPS
select IRQ_FORCED_THREADING
select MODULES_USE_ELF_RELA if MODULES && 64BIT
select MODULES_USE_ELF_REL if MODULES
select PCI_DOMAINS if PCI
select PERF_USE_VMALLOC
select RTC_LIB
select SYSCTL_EXCEPTION_TRACE
......@@ -3028,19 +3027,14 @@ menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
config HW_HAS_EISA
bool
config PCI_DOMAINS
bool
config PCI_DOMAINS_GENERIC
bool
config PCI_DRIVERS_GENERIC
select PCI_DOMAINS_GENERIC if PCI_DOMAINS
select PCI_DOMAINS_GENERIC if PCI
bool
config PCI_DRIVERS_LEGACY
def_bool !PCI_DRIVERS_GENERIC
select NO_GENERIC_PCI_IOPORT_MAP
select PCI_DOMAINS if PCI
#
# ISA support is now enabled via select. Too many systems still have the one
......
......@@ -236,6 +236,7 @@ config PPC
select OF_RESERVED_MEM
select OLD_SIGACTION if PPC32
select OLD_SIGSUSPEND
select PCI_DOMAINS if PCI
select RTC_LIB
select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE
......@@ -931,9 +932,6 @@ config FSL_GTM
help
Freescale General-purpose Timers support
config PCI_DOMAINS
def_bool PCI
config PCI_SYSCALL
def_bool PCI
......
......@@ -41,6 +41,7 @@ config RISCV
select HAVE_PCI
select MODULES_USE_ELF_RELA if MODULES
select THREAD_INFO_IN_TASK
select PCI_DOMAINS_GENERIC if PCI
select PCI_MSI if PCI
select RISCV_TIMER
select GENERIC_IRQ_MULTI_HANDLER
......@@ -265,12 +266,6 @@ config CMDLINE_FORCE
endmenu
config PCI_DOMAINS
def_bool PCI
config PCI_DOMAINS_GENERIC
def_bool PCI
menu "Power management options"
source kernel/power/Kconfig
......
......@@ -181,6 +181,7 @@ config S390
select NEED_SG_DMA_LENGTH if PCI
select OLD_SIGACTION
select OLD_SIGSUSPEND3
select PCI_DOMAINS if PCI
select PCI_MSI if PCI
select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE
......@@ -724,9 +725,6 @@ config PCI_NR_FUNCTIONS
endif # PCI
config PCI_DOMAINS
def_bool PCI
config HAS_IOMEM
def_bool PCI
......
......@@ -855,9 +855,6 @@ config MAPLE
Dreamcast with a serial line terminal or a remote network
connection.
config PCI_DOMAINS
bool
source "drivers/pcmcia/Kconfig"
endmenu
......
......@@ -90,6 +90,7 @@ config SPARC64
select GENERIC_TIME_VSYSCALL
select ARCH_CLOCKSOURCE_DATA
select ARCH_HAS_PTE_SPECIAL
select PCI_DOMAINS if PCI
config ARCH_DEFCONFIG
string
......@@ -473,9 +474,6 @@ config SUN_LDOMS
Say Y here is you want to support virtual devices via
Logical Domains.
config PCI_DOMAINS
def_bool PCI if SPARC64
config PCI_SYSCALL
def_bool PCI
......
......@@ -197,6 +197,7 @@ config X86
select HOTPLUG_SMT if SMP
select IRQ_FORCED_THREADING
select NEED_SG_DMA_LENGTH
select PCI_DOMAINS if PCI
select PCI_LOCKLESS_CONFIG
select PERF_EVENTS
select RTC_LIB
......@@ -2634,10 +2635,6 @@ config PCI_XEN
depends on PCI && XEN
select SWIOTLB_XEN
config PCI_DOMAINS
def_bool y
depends on PCI
config MMCONF_FAM10H
def_bool y
depends on X86_64 && PCI_MMCONFIG && ACPI
......
......@@ -21,6 +21,15 @@ menuconfig PCI
support for PCI-X and the foundations for PCI Express support.
Say 'Y' here unless you know what you are doing.
config PCI_DOMAINS
bool
depends on PCI
config PCI_DOMAINS_GENERIC
bool
depends on PCI
select PCI_DOMAINS
source "drivers/pci/pcie/Kconfig"
config PCI_MSI
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment