On Sat, Feb 12, 2022 at 01:56:53PM +0100, Mateusz Jończyk wrote: > In Kconfig, inside the "Processor type and features" menu, there is > the CONFIG_I8K option: "Dell i8k legacy laptop support". This is > very confusing - enabling CONFIG_I8K is not required for the kernel to > support old Dell laptops. This option is specific to the dell-smm-hwmon > driver, which mostly exports some hardware monitoring information and > allows the user to change fan speed. > > This option is misplaced, so move CONFIG_I8K to drivers/hwmon/Kconfig, > where it belongs. > > Also, modify the dependency order - change > select SENSORS_DELL_SMM > to > depends on SENSORS_DELL_SMM > as it is just a configuration option of dell-smm-hwmon. This includes > changing the option type from tristate to bool. It was tristate because > it could select CONFIG_SENSORS_DELL_SMM=m . > > When running "make oldconfig" on configurations with > CONFIG_SENSORS_DELL_SMM enabled , this change will result in an > additional question (which could be printed several times during > bisecting). I think that tidying up the configuration is worth it, > though. > > Next patch tweaks the description of CONFIG_I8K. > > Signed-off-by: Mateusz Jończyk <mat.jonczyk@xxxxx> > Cc: Pali Rohár <pali@xxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> > Cc: Jean Delvare <jdelvare@xxxxxxxx> > Cc: Guenter Roeck <linux@xxxxxxxxxxxx> > Cc: Mark Gross <markgross@xxxxxxxxxx> > Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx> > Reviewed-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Acked-by: Borislav Petkov <bp@xxxxxxx> Applied to hwmon-next. Thanks, Guenter > --- > > v2: > - do not drop "depends on PROC_FS" from CONFIG_I8K > > Thanks to all for reviewing. > Mr Randy Dunlap: The first patch just moves CONFIG_I8K, without modifying > the help text. > > arch/x86/Kconfig | 17 ----------------- > drivers/hwmon/Kconfig | 16 ++++++++++++++++ > 2 files changed, 16 insertions(+), 17 deletions(-) > > > base-commit: dfd42facf1e4ada021b939b4e19c935dcdd55566 > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 9f5bd41bf660..71d4ddd48c02 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -1275,23 +1275,6 @@ config TOSHIBA > Say Y if you intend to run this kernel on a Toshiba portable. > Say N otherwise. > > -config I8K > - tristate "Dell i8k legacy laptop support" > - depends on HWMON > - depends on PROC_FS > - select SENSORS_DELL_SMM > - help > - This option enables legacy /proc/i8k userspace interface in hwmon > - dell-smm-hwmon driver. Character file /proc/i8k reports bios version, > - temperature and allows controlling fan speeds of Dell laptops via > - System Management Mode. For old Dell laptops (like Dell Inspiron 8000) > - it reports also power and hotkey status. For fan speed control is > - needed userspace package i8kutils. > - > - Say Y if you intend to run this kernel on old Dell laptops or want to > - use userspace package i8kutils. > - Say N otherwise. > - > config X86_REBOOTFIXUPS > bool "Enable X86 board specific fixups for reboot" > depends on X86_32 > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig > index 8df25f1079ba..1ee4e5eff567 100644 > --- a/drivers/hwmon/Kconfig > +++ b/drivers/hwmon/Kconfig > @@ -505,6 +505,22 @@ config SENSORS_DELL_SMM > When option I8K is also enabled this driver provides legacy /proc/i8k > userspace interface for i8kutils package. > > +config I8K > + bool "Dell i8k legacy laptop support" > + depends on SENSORS_DELL_SMM > + depends on PROC_FS > + help > + This option enables legacy /proc/i8k userspace interface in hwmon > + dell-smm-hwmon driver. Character file /proc/i8k reports bios version, > + temperature and allows controlling fan speeds of Dell laptops via > + System Management Mode. For old Dell laptops (like Dell Inspiron 8000) > + it reports also power and hotkey status. For fan speed control is > + needed userspace package i8kutils. > + > + Say Y if you intend to run this kernel on old Dell laptops or want to > + use userspace package i8kutils. > + Say N otherwise. > + > config SENSORS_DA9052_ADC > tristate "Dialog DA9052/DA9053 ADC" > depends on PMIC_DA9052
