Kconfig: cleanup SERIO_I8042 dependencies
Subsystems (10)
v2 cover Kconfig: cleanup SERIO_I8042 dependencies
This patch series removes the messy dependencies from SERIO_I8042 by having it depend on one variable (ARCH_MAY_HAVE_PC_SERIO) and having architectures which need it select that variable in arch/*/Kconfig.
New architectures are unlikely to need SERIO_I8042, so this avoids having an ever growing list of architectures to exclude. If an architecture without i8042 support isn't excluded through the dependency list for SERIO_I8042 or through explicit disabling in a config, it will likely panic on boot with something similar to this (from arm64):
[ 27.426181] [<ffffffc000403b1c>] i8042_flush+0x88/0x10c [ 27.426251] [<ffffffc00084cc2c>] i8042_init+0x58/0xe8 [ 27.426320] [<ffffffc000080bec>] do_one_initcall+0xc4/0x14c [ 27.426404] [<ffffffc000820970>] kernel_init_freeable+0x1a4/0x244 [ 27.426480] [<ffffffc0005a894c>] kernel_init+0x18/0x148 [ 27.426561] Code: d2800c82 f2bf7c02 f2dff7e2 f2ffffe2 (39400042) [ 27.426789] ---[ end trace ac076843cf0f383e ]--- [ 27.426875] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
This is v2 of the patch series. Changes from version 1:
o Added acks. arm, ia64, and sh are only ones without acks.
o Moved select of ARCH_MIGHT_HAVE_PC_SERIO to board-specific Kconfigs for arm and sh.
A tree with these patches is at:
git://github.com/mosalter/linux.git (serio-i8042-v2 branch)
Mark Salter (10):
alpha: select ARCH_MIGHT_HAVE_PC_SERIO
arm: select ARCH_MIGHT_HAVE_PC_SERIO
ia64: select ARCH_MIGHT_HAVE_PC_SERIO
mips: select ARCH_MIGHT_HAVE_PC_SERIO
powerpc: select ARCH_MIGHT_HAVE_PC_SERIO
sh: select ARCH_MIGHT_HAVE_PC_SERIO for SH_CAYMAN
sparc: select ARCH_MIGHT_HAVE_PC_SERIO
unicore32: select ARCH_MIGHT_HAVE_PC_SERIO
x86: select ARCH_MIGHT_HAVE_PC_SERIO
Kconfig: cleanup SERIO_I8042 dependencies
arch/alpha/Kconfig | 1 + arch/arm/mach-footbridge/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/sh/boards/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/input/serio/Kconfig | 11 ++++++++--- 10 files changed, 17 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/10 alpha: select ARCH_MIGHT_HAVE_PC_SERIO
Architectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/alpha/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/alpha/Kconfig +1 -0
@@ -2,6 +2,7 @@ config ALPHA bool default y select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select HAVE_AOUT select HAVE_IDE select HAVE_OPROFILE
Signature · 1 line
1.8.3.1
PATCH v2 2/10 arm: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/arm/mach-footbridge/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-footbridge/Kconfig +1 -0
@@ -85,6 +85,7 @@ config FOOTBRIDGE # Footbridge in host mode config FOOTBRIDGE_HOST bool + select ARCH_MIGHT_HAVE_PC_SERIO # Footbridge in addin mode config FOOTBRIDGE_ADDIN
Signature · 1 line
1.8.3.1
PATCH v2 3/10 ia64: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/ia64/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/ia64/Kconfig +1 -0
@@ -7,6 +7,7 @@ menu "Processor type and features" config IA64 bool select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM)
Signature · 1 line
1.8.3.1
PATCH v2 4/10 mips: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/mips/Kconfig +1 -0
@@ -2,6 +2,7 @@ config MIPS bool default y select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select HAVE_CONTEXT_TRACKING select HAVE_GENERIC_DMA_COHERENT select HAVE_IDE
Signature · 1 line
1.8.3.1
PATCH v2 5/10 powerpc: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/powerpc/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/Kconfig +1 -0
@@ -86,6 +86,7 @@ config PPC bool default y select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select BINFMT_ELF select OF select OF_EARLY_FLATTREE
Signature · 1 line
1.8.3.1
PATCH v2 6/10 sh: select ARCH_MIGHT_HAVE_PC_SERIO for SH_CAYMAN
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO. Cayman board is only sh board which needs this.
--- arch/sh/boards/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/sh/boards/Kconfig +1 -0
@@ -321,6 +321,7 @@ config SH_CAYMAN bool "Hitachi Cayman" depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103 select SYS_SUPPORTS_PCI + select ARCH_MIGHT_HAVE_PC_SERIO config SH_POLARIS bool "SMSC Polaris"
Signature · 1 line
1.8.3.1
PATCH v2 7/10 sparc: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/sparc/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/sparc/Kconfig +1 -0
@@ -13,6 +13,7 @@ config SPARC bool default y select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI + select ARCH_MIGHT_HAVE_PC_SERIO select OF select OF_PROMTREE select HAVE_IDE
Signature · 1 line
1.8.3.1
PATCH v2 8/10 unicore32: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/unicore32/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/unicore32/Kconfig +1 -0
@@ -1,6 +1,7 @@ config UNICORE32 def_bool y select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select HAVE_MEMBLOCK select HAVE_GENERIC_DMA_COHERENT select HAVE_DMA_ATTRS
Signature · 1 line
1.8.3.1
PATCH v2 9/10 x86: select ARCH_MIGHT_HAVE_PC_SERIO
In reply to Mark SalterArchitectures which might use an i8042 for serial IO to keyboard, mouse, etc should select ARCH_MIGHT_HAVE_PC_SERIO.
--- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/x86/Kconfig +1 -0
@@ -23,6 +23,7 @@ config X86 def_bool y select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select HAVE_AOUT if X86_32 select HAVE_UNSTABLE_SCHED_CLOCK select ARCH_SUPPORTS_NUMA_BALANCING
Signature · 1 line
1.8.3.1
PATCH v2 10/10 Kconfig: cleanup SERIO_I8042 dependencies
In reply to Mark SalterRemove messy dependencies from SERIO_I8042 by having it depend on one Kconfig symbol (ARCH_MIGHT_HAVE_PC_SERIO) and having architectures which need it select ARCH_MIGHT_HAVE_PC_SERIO in arch/*/Kconfig. New architectures are unlikely to need SERIO_I8042, so this avoids having an ever growing list of architectures to exclude.
--- drivers/input/serio/Kconfig | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/input/serio/Kconfig +8 -3
@@ -16,14 +16,19 @@ config SERIO To compile this driver as a module, choose M here: the module will be called serio. +config ARCH_MIGHT_HAVE_PC_SERIO + bool + help + Select this config option from the architecture Kconfig if + the architecture might use a PC serio device (i8042) to + communicate with keyboard, mouse, etc. + if SERIO config SERIO_I8042 tristate "i8042 PC Keyboard controller" default y - depends on !PARISC && (!ARM || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ - !ARC + depends on ARCH_MIGHT_HAVE_PC_SERIO help i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices,
Signature · 1 line
1.8.3.1
Quoted 3 lines
This is v2 of the patch series. Changes from version 1:
o Added acks. arm, ia64, and sh are only ones without acks.
ia64 bits look OK