mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: Rosen Penev <rosenp@gmail.com>
Cc: "Matthew Garrett" <mjg59@srcf.ucam.org>,
	"Hans de Goede" <hansg@kernel.org>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
	"Darren Hart" <dvhart@linux.intel.com>,
	"Gabriele Mazzotta" <gabriele.mzt@gmail.com>,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] platform/x86: dell-laptop: Don't use an unread keyboard state at init
Date: Fri, 20 Nov 2026 14:28:17 +0100	[thread overview]
Message-ID: <20261120132817.mffko5sujvg2lsjd@pali> (raw)
In-Reply-To: <7d253bc056c2d6f68992d0d046affef331c57830.1794633179.git.rosenp@gmail.com>

On Friday 13 November 2026 22:29:26 Rosen Penev wrote:
> kbd_init_info() ignores the return value of kbd_get_state(). If the
> call fails, the uninitialized state on the stack is used to set
> kbd_previous_level and kbd_previous_mode_bit, which are later sent to
> the BIOS when triggers are enabled or the backlight is turned back on.
> 
> Return the error instead. kbd_get_info() has already filled in
> kbd_info at that point, so clear it as well: level control through
> kbd_get_state() cannot work, and kbd_init() then still registers the
> LED if at least two keyboard backlight tokens are available, which
> works without it.

Why returning the hard error here? At this stage we know that the LED
tokens are available, kbd_get_info() returned success for us. The
kbd_get_state() could have temp issues.

The only problem is with the uninitialized kbd_previous_level and
kbd_previous_mode_bit variables.

What about this?

if (kbd_get_state(&state) == 0) {
	kbd_previous_level = kbd_get_level(&state);
	kbd_previous_mode_bit = state.mode_bit;
} else {
	kbd_previous_level = 0;
	kbd_previous_mode_bit = 0;
}

> Fixes: 02b2aaaa57ab ("platform: x86: dell-laptop: Add support for keyboard backlight")
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
>  drivers/platform/x86/dell/dell-laptop.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/dell/dell-laptop.c b/drivers/platform/x86/dell/dell-laptop.c
> index bee347e1d60c..171728d63c81 100644
> --- a/drivers/platform/x86/dell/dell-laptop.c
> +++ b/drivers/platform/x86/dell/dell-laptop.c
> @@ -1455,7 +1455,12 @@ static inline int kbd_init_info(void)
>  	    dell_smbios_find_token(KBD_LED_AC_TOKEN))
>  		kbd_timeout_ac_supported = true;
>  
> -	kbd_get_state(&state);
> +	ret = kbd_get_state(&state);
> +	if (ret) {
> +		/* Leave level control to the SMBIOS tokens, if there are any */
> +		memset(&kbd_info, 0, sizeof(kbd_info));
> +		return ret;
> +	}
>  
>  	/* NOTE: timeout value is stored in 6 bits so max value is 63 */
>  	if (kbd_info.seconds > 63)
> -- 
> 2.56.0
> 

  reply	other threads:[~2026-11-20 13:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-14  6:20 [PATCH 0/2] hwmon: (dell-smm) Validate pwm and fan_max values Rosen Penev
2026-11-14  6:20 ` [PATCH 1/2] hwmon: (dell-smm) Clamp the pwm value before scaling it Rosen Penev
2026-11-14 16:51   ` Guenter Roeck
2026-11-14  6:20 ` [PATCH 2/2] hwmon: (dell-smm) Reject a fan_max that the BIOS cannot take Rosen Penev
2026-11-14 16:52   ` Guenter Roeck
2026-11-14  6:29 ` [PATCH 0/3] platform/x86: dell-laptop: Fix keyboard backlight and charge threshold handling Rosen Penev
2026-11-14  6:29 ` [PATCH 1/3] platform/x86: dell-laptop: Reject keyboard backlight timeouts that overflow Rosen Penev
2026-11-20 13:18   ` Pali Rohár
2026-11-14  6:29 ` [PATCH 2/3] platform/x86: dell-laptop: Don't use an unread keyboard state at init Rosen Penev
2026-11-20 13:28   ` Pali Rohár [this message]
2026-11-14  6:29 ` [PATCH 3/3] platform/x86: dell-laptop: Parse the charge end threshold as an int Rosen Penev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261120132817.mffko5sujvg2lsjd@pali \
    --to=pali@kernel.org \
    --cc=dvhart@linux.intel.com \
    --cc=gabriele.mzt@gmail.com \
    --cc=hansg@kernel.org \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rosenp@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®