move CONFIG_THINKPAD_ACPI_UNSAFE_LEDS compile config to thinkpad_acpi.unsafe_leds module parameter so there is no more need to re-compile to control important LEDs, which is unsafe Signed-off-by: Milan Hauth <milahu@xxxxxxxxx> --- usage echo 'options thinkpad_acpi unsafe_leds=Y' \ | sudo tee /etc/modprobe.d/thinkpad_acpi-unsafe_leds.conf for ((i=0;i<=15;i=i+1)); do echo "$i off" | sudo tee /proc/acpi/ibm/led; done this will only disable power, battery, standby, dock LEDs but will keep wifi, bluetooth, harddrive, AC power LEDs [and maybe more] references [SOLVED] ThinkPad LED's control / Laptop Issues / Arch Linux Forums https://bbs.archlinux.org/viewtopic.php?id=177337#p1384354 thinkpad-acpi: restrict access to some firmware LEDs commit a4d5effcc73749ee3ebbf578d162905e6fa4e07d date 2009-04-04 patches --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -88,6 +88,27 @@ #include <linux/uaccess.h> #include <acpi/battery.h> #include <acpi/video.h> +#include <linux/moduleparam.h> + +/* parameters for module thinkpad_acpi */ + +/* + * parameter unsafe_leds + * + * Allow control of important LEDs? (unsafe) + * N = no [default] + * Y = yes + * + * docs: + * Documentation/laptops/thinkpad-acpi.txt + * section 'LED control' + * + * moved from compile config + * CONFIG_THINKPAD_ACPI_UNSAFE_LEDS + */ +static bool unsafe_leds = false; +module_param(unsafe_leds, bool, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); +MODULE_PARM_DESC(unsafe_leds, "Allow control of important LEDs? (unsafe)"); /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0 @@ -5754,11 +5775,10 @@ static const char * const tpacpi_led_nam static inline bool tpacpi_is_led_restricted(const unsigned int led) { -#ifdef CONFIG_THINKPAD_ACPI_UNSAFE_LEDS - return false; -#else - return (1U & (TPACPI_SAFE_LEDS >> led)) == 0; -#endif + if (unsafe_leds) + return false; + else + return (1U & (TPACPI_SAFE_LEDS >> led)) == 0; } static int led_get_status(const unsigned int led) @@ -6048,9 +6068,9 @@ static int __init led_init(struct ibm_in } } -#ifdef CONFIG_THINKPAD_ACPI_UNSAFE_LEDS - pr_notice("warning: userspace override of important firmware LEDs is enabled\n"); -#endif + if (unsafe_leds) + pr_notice("warning: userspace override of important firmware LEDs is enabled\n"); + return 0; } --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -507,29 +507,6 @@ config THINKPAD_ACPI_DEBUG If you are not sure, say N here. -config THINKPAD_ACPI_UNSAFE_LEDS - bool "Allow control of important LEDs (unsafe)" - depends on THINKPAD_ACPI - ---help--- - Overriding LED state on ThinkPads can mask important - firmware alerts (like critical battery condition), or misled - the user into damaging the hardware (undocking or ejecting - the bay while buses are still active), etc. - - LED control on the ThinkPad is write-only (with very few - exceptions on very ancient models), which makes it - impossible to know beforehand if important information will - be lost when one changes LED state. - - Users that know what they are doing can enable this option - and the driver will allow control of every LED, including - the ones on the dock stations. - - Never enable this option on a distribution kernel. - - Say N here, unless you are building a kernel for your own - use, and need to control the important firmware LEDs. - config THINKPAD_ACPI_VIDEO bool "Video output control support" depends on THINKPAD_ACPI --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -740,8 +740,8 @@ buses are still active), or mask an impo empty battery, or a broken battery), access to most LEDs is restricted. -Unrestricted access to all LEDs requires that thinkpad-acpi be -compiled with the CONFIG_THINKPAD_ACPI_UNSAFE_LEDS option enabled. +Unrestricted access to all LEDs requires setting the parameter +thinkpad_acpi.unsafe_leds to Y. Distributions must never enable this option. Individual users that are aware of the consequences are welcome to enabling it.
