platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol
PATCH 1/1 platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
---
This has been tested on both new types of keyboard backlight being supported. KBD_BL_TRISTATE_AUTO is used for keyboards that support automatic brightness. AUTO is reported as '0' with this patch, as it doesn't fit numerically, I'm not sure how else to report AUTO, hopefully someone has some insight :)
--- drivers/platform/x86/ideapad-laptop.c | 107 ++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 7 deletions(-)
drivers/platform/x86/ideapad-laptop.c +100 -7
@@ -85,6 +85,21 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;
@@ -122,6 +137,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;
@@ -242,6 +258,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);
@@ -1272,14 +1298,42 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value = (value &0xFFFF ) >>1 ; + +if (value >=0 && value <=2 ) { +/* Off, low or high */ +return value; + }else if (value ==3 ) { +/* Auto, report as off */ +return 0 ; + }else { +/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %i" , + value); +return -EINVAL ; + } + } + + + err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)
@@ -1291,13 +1345,27 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_clastatic int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (type ==KBD_BL_TRISTATE || + type ==KBD_BL_TRISTATE_AUTO ) { +if (brightness >=0 && brightness <=2 ) { + value = (brightness <<16 ) | (type <<4 ) |KBD_BL_COMMAND_SET ; + }else { +return -EINVAL ; + } + + err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err; priv->kbd_bl.last_brightness = brightness; -return 0 ; }
@@ -1344,8 +1412,14 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) { + priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;
@@ -1456,6 +1530,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :case 1 :/* * Some IdeaPads report event 1 every ~20
@@ -1557,13 +1632,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val)) priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,0x1 , &val)) { +if (val ==0x5 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==0x7 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %i" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Signature · 1 line
2.40.1.521.gf1e218fcd8
Ilpo Järvinen
maintainerQuoted 76 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>---
This has been tested on both new types of keyboard backlight being supported.
KBD_BL_TRISTATE_AUTOis used for keyboards that support automatic brightness. AUTO is reported as '0' with this patch, as it doesn't fit numerically, I'm not sure how else to report AUTO, hopefully someone has some insight :)--- drivers/platform/x86/ideapad-laptop.c | 107 ++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 7 deletions(-)drivers/platform/x86/ideapad-laptop.c +28
-2@@ -85,6 +85,21 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +137,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +258,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1272,14 +1298,42 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); + if (priv->kbd_bl.type == KBD_BL_TRISTATE ||
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1314
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +10
-0+ priv->kbd_bl.type == KBD_BL_TRISTATE_AUTO) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value = (value &0xFFFF ) >>1 ;
You should define a field for thiswith GENMASK() and use FIELD_GET() instead of manual masking and shifting.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1316
Quoted 2 lines
drivers/platform/x86/ideapad-laptop.c +2
-0+ +if (value >=0 && value <=2 ) {
How can unsigned long be < 0??
If that 2 is the same as priv->kbd_bl.led.max_brightness, it would make sense to use it rather than literal.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1322
Quoted 6 lines
drivers/platform/x86/ideapad-laptop.c +6
-0+/* Off, low or high */ +return value; + }else if (value ==3 ) { +/* Auto, report as off */ +return 0 ; + }else {
Since those blocks above return, the elses are unnecessary.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1331
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %i" , + value); +return -EINVAL ; + } + } + +
Remove one of the newlines.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +2
-1+ err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,13 +1345,27 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1354
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-1static int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (type ==KBD_BL_TRISTATE || + type ==KBD_BL_TRISTATE_AUTO ) { +if (brightness >=0 && brightness <=2 ) {
Brightness is unsigned int so no need for < 0 check.
Reverse the logic here:
if (brightness > 2) return -EINVAL;
...as it avoid the need to use else.
Consider using .max_brightness here too.
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1355
Quoted 1 line
drivers/platform/x86/ideapad-laptop.c +1
-0+ value = (brightness <<16 ) | (type <<4 ) |KBD_BL_COMMAND_SET ;
There would also be a readability benefit for these if you define these as fields and use FIELD_PREP().
Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +4
-0+ }else { +return -EINVAL ; + } +
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1300
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +4
-1+ err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err; priv->kbd_bl.last_brightness = brightness; -
Stray change.
drivers/platform/x86/ideapad-laptop.c static int ideapad_kbd_bl_init(struct ideapad_private *priv) · line 1416
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +2
-0return 0 ; }@@ -1344,8 +1412,14 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) {
Please add a helper for this check as it seems to appear multiple times in this patch.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +5
-1+ priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;
drivers/platform/x86/ideapad-laptop.c static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) · line 1533
Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +1
-0@@ -1456,6 +1530,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :
Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Quoted 14 lines
drivers/platform/x86/ideapad-laptop.c +3
-1case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1632,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val))
drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1650
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-0priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,0x1 , &val)) { +if (val ==0x5 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==0x7 ) {
Name these three literals with defines.
Quoted 13 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+ priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %i" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Signature · 1 line
i.
Thanks for the quick review, I've addressed most of the comments for V2, do you want that submitted in this thread, or should I create a new one?
Quoted 5 lines
Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Sorry, I have no idea about the other events. I can do this one if you'd like, or leave a comment for the future if you'd rather they all be done together.
Quoted 256 lines · Ilpo Järvinen
Quoted 76 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>---
This has been tested on both new types of keyboard backlight being supported.
KBD_BL_TRISTATE_AUTOis used for keyboards that support automatic brightness. AUTO is reported as '0' with this patch, as it doesn't fit numerically, I'm not sure how else to report AUTO, hopefully someone has some insight :)--- drivers/platform/x86/ideapad-laptop.c | 107 ++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 7 deletions(-)drivers/platform/x86/ideapad-laptop.c +28
-2@@ -85,6 +85,21 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +137,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +258,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1272,14 +1298,42 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); + if (priv->kbd_bl.type == KBD_BL_TRISTATE ||drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1314
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +10
-0+ priv->kbd_bl.type == KBD_BL_TRISTATE_AUTO) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value = (value &0xFFFF ) >>1 ;You should define a field for thiswith
GENMASK()and useFIELD_GET()instead of manual masking and shifting.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1316
Quoted 2 lines
drivers/platform/x86/ideapad-laptop.c +2
-0+ +if (value >=0 && value <=2 ) {How can unsigned long be < 0??
If that 2 is the same as
priv->kbd_bl.led.max_brightness, it would make sense to use it rather than literal.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1322
Quoted 6 lines
drivers/platform/x86/ideapad-laptop.c +6
-0+/* Off, low or high */ +return value; + }else if (value ==3 ) { +/* Auto, report as off */ +return 0 ; + }else {Since those blocks above return, the elses are unnecessary.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1331
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %i" , + value); +return -EINVAL ; + } + } + +Remove one of the newlines.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +2
-1+ err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,13 +1345,27 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cladrivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1354
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-1static int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (type ==KBD_BL_TRISTATE || + type ==KBD_BL_TRISTATE_AUTO ) { +if (brightness >=0 && brightness <=2 ) {Brightness is unsigned int so no need for < 0 check.
Reverse the logic here:
if (brightness > 2)
return-EINVAL;...as it avoid the need to use else.
Consider using .max_brightness here too.
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1355
Quoted 1 line
drivers/platform/x86/ideapad-laptop.c +1
-0+ value = (brightness <<16 ) | (type <<4 ) |KBD_BL_COMMAND_SET ;There would also be a readability benefit for these if you define these as fields and use
FIELD_PREP().Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +4
-0+ }else { +return -EINVAL ; + } +drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1300
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +4
-1+ err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err; priv->kbd_bl.last_brightness = brightness; -Stray change.
drivers/platform/x86/ideapad-laptop.c static int ideapad_kbd_bl_init(struct ideapad_private *priv) · line 1416
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +2
-0return 0 ; }@@ -1344,8 +1412,14 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) {Please add a helper for this check as it seems to appear multiple times in this patch.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +5
-1+ priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;drivers/platform/x86/ideapad-laptop.c static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) · line 1533
Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +1
-0@@ -1456,6 +1530,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Quoted 14 lines
drivers/platform/x86/ideapad-laptop.c +3
-1case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1632,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val))drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1650
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-0priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,0x1 , &val)) { +if (val ==0x5 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==0x7 ) {Name these three literals with defines.
drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1662
Quoted 13 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+ priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %i" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )--
i.
Hi Stuart,
Quoted 3 lines · Stuart
Thanks for the quick review, I've addressed most of the comments for V2, do you want that submitted in this thread, or should I create a new one?
Either way is fine, just pick which way you prefer.
Regards,
Hans
Quoted 269 lines
Quoted 5 lines
Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Sorry, I have no idea about the other events. I can do this one if you'd like, or leave a comment for the future if you'd rather they all be done together.
Quoted 256 lines · Ilpo Järvinen
Quoted 76 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>---
This has been tested on both new types of keyboard backlight being supported.
KBD_BL_TRISTATE_AUTOis used for keyboards that support automatic brightness. AUTO is reported as '0' with this patch, as it doesn't fit numerically, I'm not sure how else to report AUTO, hopefully someone has some insight :)--- drivers/platform/x86/ideapad-laptop.c | 107 ++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 7 deletions(-)drivers/platform/x86/ideapad-laptop.c +28
-2@@ -85,6 +85,21 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +137,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +258,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1272,14 +1298,42 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); + if (priv->kbd_bl.type == KBD_BL_TRISTATE ||drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1314
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +10
-0+ priv->kbd_bl.type == KBD_BL_TRISTATE_AUTO) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value = (value &0xFFFF ) >>1 ;You should define a field for thiswith
GENMASK()and useFIELD_GET()instead of manual masking and shifting.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1316
Quoted 2 lines
drivers/platform/x86/ideapad-laptop.c +2
-0+ +if (value >=0 && value <=2 ) {How can unsigned long be < 0??
If that 2 is the same as
priv->kbd_bl.led.max_brightness, it would make sense to use it rather than literal.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1322
Quoted 6 lines
drivers/platform/x86/ideapad-laptop.c +6
-0+/* Off, low or high */ +return value; + }else if (value ==3 ) { +/* Auto, report as off */ +return 0 ; + }else {Since those blocks above return, the elses are unnecessary.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1331
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %i" , + value); +return -EINVAL ; + } + } + +Remove one of the newlines.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +2
-1+ err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,13 +1345,27 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cladrivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1354
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-1static int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (type ==KBD_BL_TRISTATE || + type ==KBD_BL_TRISTATE_AUTO ) { +if (brightness >=0 && brightness <=2 ) {Brightness is unsigned int so no need for < 0 check.
Reverse the logic here:
if (brightness > 2)
return-EINVAL;...as it avoid the need to use else.
Consider using .max_brightness here too.
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1355
Quoted 1 line
drivers/platform/x86/ideapad-laptop.c +1
-0+ value = (brightness <<16 ) | (type <<4 ) |KBD_BL_COMMAND_SET ;There would also be a readability benefit for these if you define these as fields and use
FIELD_PREP().Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +4
-0+ }else { +return -EINVAL ; + } +drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1300
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +4
-1+ err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err; priv->kbd_bl.last_brightness = brightness; -Stray change.
drivers/platform/x86/ideapad-laptop.c static int ideapad_kbd_bl_init(struct ideapad_private *priv) · line 1416
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +2
-0return 0 ; }@@ -1344,8 +1412,14 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) {Please add a helper for this check as it seems to appear multiple times in this patch.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +5
-1+ priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;drivers/platform/x86/ideapad-laptop.c static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) · line 1533
Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +1
-0@@ -1456,6 +1530,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Quoted 14 lines
drivers/platform/x86/ideapad-laptop.c +3
-1case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1632,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val))drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1650
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-0priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,0x1 , &val)) { +if (val ==0x5 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==0x7 ) {Name these three literals with defines.
drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1662
Quoted 13 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+ priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %i" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )--
i.
PATCH v2 1/1 platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
---
v1 -> v2:
- Replace keyboard identification hex literals with defines
- Use a helper macro for checking a keyboard type is tristate
- Reworked ideapad_kbd_bl_brightness_set
- Reworked ideapad_kbd_bl_brightness_get
- Clean up newlines and stray change
- Use GENMASK, FIELD_GET and FIELD_PUT instead of manual masking and shifting
- Correct format specifiers for new warnings
--- drivers/platform/x86/ideapad-laptop.c | 113 ++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 6 deletions(-)
drivers/platform/x86/ideapad-laptop.c +107 -6
@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/backlight.h> +#include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/debugfs.h>
@@ -85,6 +86,32 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_QUERY_TYPE 0x1 +#define KBD_BL_TRISTATE_TYPE 0x5 +#define KBD_BL_TRISTATE_AUTO_TYPE 0x7 + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 + +#define KBD_BL_GET_BRIGHTNESS_MASK GENMASK(15, 0) +#define KBD_BL_SET_BRIGHTNESS_MASK GENMASK(19, 16) +#define KBD_BL_SET_TYPE_MASK GENMASK(7, 4) + +#define CHECK_KBD_BL_TRISTATE (TYPE ) (TYPE == KBD_BL_TRISTATE || \ + TYPE == KBD_BL_TRISTATE_AUTO) +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;
@@ -122,6 +149,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;
@@ -242,6 +270,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);
@@ -1272,14 +1310,39 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); +if (CHECK_KBD_BL_TRISTATE (priv->kbd_bl.type)) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value =FIELD_GET (KBD_BL_GET_BRIGHTNESS_MASK , value) >>1 ; + +/* Off, low or high */ +if (value <= priv->kbd_bl.led.max_brightness) +return value; + +/* Auto, report as off */ +if (value == priv->kbd_bl.led.max_brightness +1 ) +return 0 ; + +/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %lu" , value); +return -EINVAL ; + } + + err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)
@@ -1291,7 +1354,21 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_clastatic int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (CHECK_KBD_BL_TRISTATE (type)) { +if (brightness > priv->kbd_bl.led.max_brightness) +return -EINVAL ; + + value =FIELD_PREP (KBD_BL_SET_BRIGHTNESS_MASK , brightness) | +FIELD_PREP (KBD_BL_SET_TYPE_MASK , type) | +KBD_BL_COMMAND_SET ; + err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err;
@@ -1344,8 +1421,13 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (CHECK_KBD_BL_TRISTATE (priv->kbd_bl.type)) { + priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;
@@ -1456,6 +1538,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :case 1 :/* * Some IdeaPads report event 1 every ~20
@@ -1557,13 +1640,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val)) priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,KBD_BL_QUERY_TYPE , &val)) { +if (val ==KBD_BL_TRISTATE_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==KBD_BL_TRISTATE_AUTO_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %lu" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Signature · 1 line
2.40.1.521.gf1e218fcd8
Ilpo Järvinen
maintainerQuoted 6 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>---
Quoted 8 lines
v1 -> v2:
- Replace keyboard identification hex literals with defines
- Use a helper macro for checking a keyboard type is tristate
- Reworkedideapad_kbd_bl_brightness_set
- Reworkedideapad_kbd_bl_brightness_get
- Clean up newlines and stray change
- Use GENMASK,FIELD_GETandFIELD_PUTinstead of manual masking and shifting
- Correct format specifiers for new warnings
Thanks, looks better already. A few follow up comments still below.
Quoted 32 lines
--- drivers/platform/x86/ideapad-laptop.c | 113 ++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 6 deletions(-)drivers/platform/x86/ideapad-laptop.c +13
-0@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/backlight.h> +#include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/debugfs.h> @@ -85,6 +86,32 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; +
drivers/platform/x86/ideapad-laptop.c enum { · line 110
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +10
-0+#define KBD_BL_QUERY_TYPE 0x1 +#define KBD_BL_TRISTATE_TYPE 0x5 +#define KBD_BL_TRISTATE_AUTO_TYPE 0x7 + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 + +#define KBD_BL_GET_BRIGHTNESS_MASK GENMASK(15, 0) +#define KBD_BL_SET_BRIGHTNESS_MASK GENMASK(19, 16) +#define KBD_BL_SET_TYPE_MASK GENMASK(7, 4)
You can use _MASK if you want but it usually adds little to no value only increasing the line numbers.
drivers/platform/x86/ideapad-laptop.c enum { · line 113
Quoted 2 lines
drivers/platform/x86/ideapad-laptop.c +2
-0+#define CHECK_KBD_BL_TRISTATE (TYPE ) (TYPE == KBD_BL_TRISTATE || \ + TYPE == KBD_BL_TRISTATE_AUTO)
Do a static function instead, there's nothing that requires macro for this.
Quoted 31 lines
drivers/platform/x86/ideapad-laptop.c +12
-0+struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +149,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +270,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1272,14 +1310,39 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1318
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +4
-2static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); +if (CHECK_KBD_BL_TRISTATE (priv->kbd_bl.type)) { + err = eval_kblc(priv->adev->handle, + (priv->kbd_bl.type << 4) | KBD_BL_COMMAND_GET,
Use FIELD_PREP(KBL_BL_GET_TYPE, priv->kbd_bl.type) here too.
Or ... Do GET and SET happen to share the field structure here in which case you could name it as KBD_BL_COMMAND_TYPE and not one for set and get?
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1325
Quoted 7 lines
drivers/platform/x86/ideapad-laptop.c +7
-0+ &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value =FIELD_GET (KBD_BL_GET_BRIGHTNESS_MASK , value) >>1 ;
Why is this >> 1 here? Is it that the least-significant bit is not part of the field? (In which case you want take that into account in the field's GENMASK()).
Signature · 1 line
i.
Quoted 104 lines
drivers/platform/x86/ideapad-laptop.c +58
-4+ +/* Off, low or high */ +if (value <= priv->kbd_bl.led.max_brightness) +return value; + +/* Auto, report as off */ +if (value == priv->kbd_bl.led.max_brightness +1 ) +return 0 ; + +/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %lu" , value); +return -EINVAL ; + } + + err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,7 +1354,21 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_clastatic int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (CHECK_KBD_BL_TRISTATE (type)) { +if (brightness > priv->kbd_bl.led.max_brightness) +return -EINVAL ; + + value =FIELD_PREP (KBD_BL_SET_BRIGHTNESS_MASK , brightness) | +FIELD_PREP (KBD_BL_SET_TYPE_MASK , type) | +KBD_BL_COMMAND_SET ; + err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err;@@ -1344,8 +1421,13 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (CHECK_KBD_BL_TRISTATE (priv->kbd_bl.type)) { + priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;@@ -1456,6 +1538,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1640,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val)) priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,KBD_BL_QUERY_TYPE , &val)) { +if (val ==KBD_BL_TRISTATE_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==KBD_BL_TRISTATE_AUTO_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %lu" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Stuart Hayhurst
AppliedPATCH v3 1/1 platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
---
Thanks, applied your feedback
v1 -> v2:
- Replace keyboard identification hex literals with defines
- Use a helper macro for checking a keyboard type is tristate
- Reworked ideapad_kbd_bl_brightness_set
- Reworked ideapad_kbd_bl_brightness_get
- Clean up newlines and stray change
- Use GENMASK, FIELD_GET and FIELD_PUT instead of manual masking and shifting
- Correct format specifiers for new warnings
v2 -> v3:
- Use named define for keyboard brightness event
- Replaced CHECK_KBD_BL_TRISTATE macro with static function
- Dropped _MASK suffix for bit masking
- Use FIELD_PREP for the get command too
- Ignore least significant bit in KBD__BL_GET_BRIGHTNESS mask
--- drivers/platform/x86/ideapad-laptop.c | 118 ++++++++++++++++++++++++-- 1 file changed, 112 insertions(+), 6 deletions(-)
drivers/platform/x86/ideapad-laptop.c +112 -6
@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/backlight.h> +#include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/debugfs.h>
@@ -85,6 +86,31 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_QUERY_TYPE 0x1 +#define KBD_BL_TRISTATE_TYPE 0x5 +#define KBD_BL_TRISTATE_AUTO_TYPE 0x7 + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +#define KBD_BL_COMMAND_TYPE GENMASK(7, 4) + +#define KBD_BL_GET_BRIGHTNESS GENMASK(15, 1) +#define KBD_BL_SET_BRIGHTNESS GENMASK(19, 16) + +#define KBD_BL_KBLC_CHANGED_EVENT 12 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;
@@ -122,6 +148,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;
@@ -242,6 +269,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);
@@ -1270,16 +1307,47 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)/* * keyboard backlight */ +static int ideapad_kbd_bl_check_tristate (int type) +{ +return (type ==KBD_BL_TRISTATE ) || (type ==KBD_BL_TRISTATE_AUTO ); +} +static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); +if (ideapad_kbd_bl_check_tristate (priv->kbd_bl.type)) { + err =eval_kblc (priv->adev->handle, +FIELD_PREP (KBD_BL_COMMAND_TYPE , priv->kbd_bl.type) | +KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value =FIELD_GET (KBD_BL_GET_BRIGHTNESS , value); + +/* Off, low or high */ +if (value <= priv->kbd_bl.led.max_brightness) +return value; + +/* Auto, report as off */ +if (value == priv->kbd_bl.led.max_brightness +1 ) +return 0 ; + +/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %lu" , value); +return -EINVAL ; + } + + err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)
@@ -1291,7 +1359,21 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_clastatic int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (ideapad_kbd_bl_check_tristate (type)) { +if (brightness > priv->kbd_bl.led.max_brightness) +return -EINVAL ; + + value =FIELD_PREP (KBD_BL_SET_BRIGHTNESS , brightness) | +FIELD_PREP (KBD_BL_COMMAND_TYPE , type) | +KBD_BL_COMMAND_SET ; + err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err;
@@ -1344,8 +1426,13 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (ideapad_kbd_bl_check_tristate (priv->kbd_bl.type)) { + priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;
@@ -1456,6 +1543,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case KBD_BL_KBLC_CHANGED_EVENT :case 1 :/* * Some IdeaPads report event 1 every ~20
@@ -1557,13 +1645,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val)) priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,KBD_BL_QUERY_TYPE , &val)) { +if (val ==KBD_BL_TRISTATE_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==KBD_BL_TRISTATE_AUTO_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %lu" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Signature · 1 line
2.40.1.521.gf1e218fcd8
Hans de Goede
AppliedHi Stuart,
Quoted 4 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>
Thank you for your patch and thank you Ilpo for the reviews.
This looks good to me now. The merge window for 6.6 opened yesterday, so the timing of this is a bit unfortunate. Since I know that various users have actually been asking about this functionality and since this seems a reasonably isolated patch I've decided to still merge this now (just in time for 6.6).
I hope I'm not going to regret this :) In the worse case we
can always revert this and try again for 6.7 .
I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the current merge-window.
Regards,
Hans
Quoted 223 lines
---
Thanks, applied your feedback
v1 -> v2:
- Replace keyboard identification hex literals with defines
- Use a helper macro for checking a keyboard type is tristate
- Reworkedideapad_kbd_bl_brightness_set
- Reworkedideapad_kbd_bl_brightness_get
- Clean up newlines and stray change
- Use GENMASK,FIELD_GETandFIELD_PUTinstead of manual masking and shifting
- Correct format specifiers for new warningsv2 -> v3:
- Use named define for keyboard brightness event
- ReplacedCHECK_KBD_BL_TRISTATEmacro with static function
- Dropped_MASKsuffix for bit masking
- UseFIELD_PREPfor the get command too
- Ignore least significant bit inKBD__BL_GET_BRIGHTNESSmask--- drivers/platform/x86/ideapad-laptop.c | 118 ++++++++++++++++++++++++-- 1 file changed, 112 insertions(+), 6 deletions(-)drivers/platform/x86/ideapad-laptop.c +112
-6@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/backlight.h> +#include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/debugfs.h> @@ -85,6 +86,31 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_QUERY_TYPE 0x1 +#define KBD_BL_TRISTATE_TYPE 0x5 +#define KBD_BL_TRISTATE_AUTO_TYPE 0x7 + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +#define KBD_BL_COMMAND_TYPE GENMASK(7, 4) + +#define KBD_BL_GET_BRIGHTNESS GENMASK(15, 1) +#define KBD_BL_SET_BRIGHTNESS GENMASK(19, 16) + +#define KBD_BL_KBLC_CHANGED_EVENT 12 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +148,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +269,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1270,16 +1307,47 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)/* * keyboard backlight */ +static int ideapad_kbd_bl_check_tristate (int type) +{ +return (type ==KBD_BL_TRISTATE ) || (type ==KBD_BL_TRISTATE_AUTO ); +} +static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); +if (ideapad_kbd_bl_check_tristate (priv->kbd_bl.type)) { + err =eval_kblc (priv->adev->handle, +FIELD_PREP (KBD_BL_COMMAND_TYPE , priv->kbd_bl.type) | +KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value =FIELD_GET (KBD_BL_GET_BRIGHTNESS , value); + +/* Off, low or high */ +if (value <= priv->kbd_bl.led.max_brightness) +return value; + +/* Auto, report as off */ +if (value == priv->kbd_bl.led.max_brightness +1 ) +return 0 ; + +/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %lu" , value); +return -EINVAL ; + } + + err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,7 +1359,21 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_clastatic int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (ideapad_kbd_bl_check_tristate (type)) { +if (brightness > priv->kbd_bl.led.max_brightness) +return -EINVAL ; + + value =FIELD_PREP (KBD_BL_SET_BRIGHTNESS , brightness) | +FIELD_PREP (KBD_BL_COMMAND_TYPE , type) | +KBD_BL_COMMAND_SET ; + err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err;@@ -1344,8 +1426,13 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (ideapad_kbd_bl_check_tristate (priv->kbd_bl.type)) { + priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;@@ -1456,6 +1543,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case KBD_BL_KBLC_CHANGED_EVENT :case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1645,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val)) priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,KBD_BL_QUERY_TYPE , &val)) { +if (val ==KBD_BL_TRISTATE_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==KBD_BL_TRISTATE_AUTO_TYPE ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %lu" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )
Ilpo Järvinen
maintainerQuoted 7 lines · Stuart
Thanks for the quick review, I've addressed most of the comments for V2, do you want that submitted in this thread, or should I create a new one?
Quoted 2 lines
Could these bits too be named with defines, it would be helpful for those reading the code?
Quoted 6 lines
Quoted 2 lines
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Sorry, I have no idea about the other events. I can do this one if you'd like, or leave a comment for the future if you'd rather they all be done together.
No worries, I assumed you might not know about them.
Lets just have the named define for this and leave the others as they are (hopefully one day we can get them named as well).
Signature · 1 line
i.
Quoted 259 lines
Quoted 256 lines · Ilpo Järvinen
Quoted 76 lines · Stuart Hayhurst
Newer Lenovo laptops seem to use the KBLC symbol to control the backlight Add support for handling the keyboard backlight on these devices
Signed-off-by Stuart Hayhurst <[email protected]>---
This has been tested on both new types of keyboard backlight being supported.
KBD_BL_TRISTATE_AUTOis used for keyboards that support automatic brightness. AUTO is reported as '0' with this patch, as it doesn't fit numerically, I'm not sure how else to report AUTO, hopefully someone has some insight :)--- drivers/platform/x86/ideapad-laptop.c | 107 ++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 7 deletions(-)drivers/platform/x86/ideapad-laptop.c +28
-2@@ -85,6 +85,21 @@ enum { SALS_FNLOCK_OFF = 0xf, }; +/* +* These correspond to the number of supported states - 1 +* Future keyboard types may need a new system, if there's a collision +* KBD_BL_TRISTATE_AUTO has no way to report or set the auto state +* so it effectively has 3 states, but needs to handle 4 +*/ +enum { +KBD_BL_STANDARD =1 , +KBD_BL_TRISTATE =2 , +KBD_BL_TRISTATE_AUTO =3 , +}; + +#define KBD_BL_COMMAND_GET 0x2 +#define KBD_BL_COMMAND_SET 0x3 +struct ideapad_dytc_priv {enum platform_profile_option current_profile;struct platform_profile_handler pprof;@@ -122,6 +137,7 @@ struct ideapad_private { } features;struct {bool initialized; +int type;struct led_classdev led;unsigned int last_brightness; } kbd_bl;@@ -242,6 +258,16 @@ static int exec_sals(acpi_handle handle, unsigned long arg)return exec_simple_method (handle,"SALS" , arg); } +static int exec_kblc (acpi_handle handle,unsigned long arg) +{ +return exec_simple_method (handle,"KBLC" , arg); +} + +static int eval_kblc (acpi_handle handle,unsigned long cmd,unsigned long *res) +{ +return eval_int_with_arg (handle,"KBLC" , cmd, res); +} +static int eval_dytc (acpi_handle handle,unsigned long cmd,unsigned long *res) {return eval_int_with_arg (handle,"DYTC" , cmd, res);@@ -1272,14 +1298,42 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv)*/ static int ideapad_kbd_bl_brightness_get (struct ideapad_private *priv) { -unsigned long hals; +unsigned long value;int err; - err =eval_hals (priv->adev->handle, &hals); + if (priv->kbd_bl.type == KBD_BL_TRISTATE ||drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1314
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +10
-0+ priv->kbd_bl.type == KBD_BL_TRISTATE_AUTO) { + err =eval_kblc (priv->adev->handle, + (priv->kbd_bl.type <<4 ) |KBD_BL_COMMAND_GET , + &value); + +if (err) +return err; + +/* Convert returned value to brightness level */ + value = (value &0xFFFF ) >>1 ;You should define a field for thiswith
GENMASK()and useFIELD_GET()instead of manual masking and shifting.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1316
Quoted 2 lines
drivers/platform/x86/ideapad-laptop.c +2
-0+ +if (value >=0 && value <=2 ) {How can unsigned long be < 0??
If that 2 is the same as
priv->kbd_bl.led.max_brightness, it would make sense to use it rather than literal.drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1322
Quoted 6 lines
drivers/platform/x86/ideapad-laptop.c +6
-0+/* Off, low or high */ +return value; + }else if (value ==3 ) { +/* Auto, report as off */ +return 0 ; + }else {Since those blocks above return, the elses are unnecessary.
drivers/platform/x86/ideapad-laptop.c static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) · line 1331
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+/* Unknown value */ +dev_warn (&priv->platform_device->dev, +"Unknown keyboard backlight value: %i" , + value); +return -EINVAL ; + } + } + +Remove one of the newlines.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +2
-1+ err =eval_hals (priv->adev->handle, &value);if (err)return err; -return !!test_bit (HALS_KBD_BL_STATE_BIT , &hals); +return !!test_bit (HALS_KBD_BL_STATE_BIT , &value); }static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get (struct led_classdev *led_cdev)@@ -1291,13 +1345,27 @@ static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cladrivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1354
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-1static int ideapad_kbd_bl_brightness_set (struct ideapad_private *priv,unsigned int brightness) { -int err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); +int err; +unsigned long value; +int type = priv->kbd_bl.type; + +if (type ==KBD_BL_TRISTATE || + type ==KBD_BL_TRISTATE_AUTO ) { +if (brightness >=0 && brightness <=2 ) {Brightness is unsigned int so no need for < 0 check.
Reverse the logic here:
if (brightness > 2)
return-EINVAL;...as it avoid the need to use else.
Consider using .max_brightness here too.
drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1355
Quoted 1 line
drivers/platform/x86/ideapad-laptop.c +1
-0+ value = (brightness <<16 ) | (type <<4 ) |KBD_BL_COMMAND_SET ;There would also be a readability benefit for these if you define these as fields and use
FIELD_PREP().Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +4
-0+ }else { +return -EINVAL ; + } +drivers/platform/x86/ideapad-laptop.c static enum led_brightness ideapad_kbd_bl_led_cdev_brightness_get(struct led_cla · line 1300
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +4
-1+ err =exec_kblc (priv->adev->handle, value); + }else { + err =exec_sals (priv->adev->handle, brightness ?SALS_KBD_BL_ON :SALS_KBD_BL_OFF ); + }if (err)return err; priv->kbd_bl.last_brightness = brightness; -Stray change.
drivers/platform/x86/ideapad-laptop.c static int ideapad_kbd_bl_init(struct ideapad_private *priv) · line 1416
Quoted 9 lines
drivers/platform/x86/ideapad-laptop.c +2
-0return 0 ; }@@ -1344,8 +1412,14 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv) priv->kbd_bl.last_brightness = brightness; +if (priv->kbd_bl.type ==KBD_BL_TRISTATE || + priv->kbd_bl.type ==KBD_BL_TRISTATE_AUTO ) {Please add a helper for this check as it seems to appear multiple times in this patch.
Quoted 11 lines
drivers/platform/x86/ideapad-laptop.c +5
-1+ priv->kbd_bl.led.max_brightness =2 ; + }else { + priv->kbd_bl.led.max_brightness =1 ; + } + priv->kbd_bl.led.name ="platform::" LED_FUNCTION_KBD_BACKLIGHT ; - priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ;drivers/platform/x86/ideapad-laptop.c static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) · line 1533
Quoted 4 lines
drivers/platform/x86/ideapad-laptop.c +1
-0@@ -1456,6 +1530,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)case 2 :ideapad_backlight_notify_power (priv);break ; +case 12 :Could these bits too be named with defines, it would be helpful for those reading the code?
(If you can add the names to all these other bits too, it should be put into own patch and not into this one.)
Quoted 14 lines
drivers/platform/x86/ideapad-laptop.c +3
-1case 1 :/* * Some IdeaPads report event 1 every ~20 @@ -1557,13 +1632,31 @@ static void ideapad_check_features(struct ideapad_private *priv)if (test_bit (HALS_FNLOCK_SUPPORT_BIT , &val)) priv->features.fn_lock = true; -if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) +if (test_bit (HALS_KBD_BL_SUPPORT_BIT , &val)) { priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_STANDARD ; + }if (test_bit (HALS_USB_CHARGING_SUPPORT_BIT , &val))drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1650
Quoted 10 lines
drivers/platform/x86/ideapad-laptop.c +7
-0priv->features.usb_charging = true; } } + +if (acpi_has_method (handle,"KBLC" )) { +if (!eval_kblc (priv->adev->handle,0x1 , &val)) { +if (val ==0x5 ) { + priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE ; + }else if (val ==0x7 ) {Name these three literals with defines.
drivers/platform/x86/ideapad-laptop.c static void ideapad_check_features(struct ideapad_private *priv) · line 1662
Quoted 13 lines
drivers/platform/x86/ideapad-laptop.c +9
-0+ priv->features.kbd_bl = true; + priv->kbd_bl.type =KBD_BL_TRISTATE_AUTO ; + }else { +dev_warn (&priv->platform_device->dev, +"Unknown keyboard type: %i" , + val); + } + } + } }#if IS_ENABLED (CONFIG_ACPI_WMI )--
i.