On Thu, Oct 14, 2021 at 03:16:27PM +0800, lianzhi chang wrote:
> Switching from the desktop environment to the tty environment,
> the state of the keyboard led lights and the state of the keyboard
> lock are inconsistent. This is because the attribute kb->kbdmode
> of the tty bound in the desktop environment (xorg) is set to
> VC_OFF, which causes the ledstate and kb->ledflagstate
> values of the bound tty to always be 0, which causes the switch
> from the desktop When to the tty environment, the LED light
> status is inconsistent with the keyboard lock status.
>
> Signed-off-by: lianzhi chang <changlianzhi@xxxxxxxxxxxxx>
> ---
> drivers/input/input.c | 7 ++++++-
> drivers/tty/vt/keyboard.c | 30 +++++++++++++++++++++++++++++-
> include/linux/kbd_kern.h | 2 ++
> 3 files changed, 37 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index ccaeb2426385..43c09700bf68 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -25,6 +25,7 @@
> #include <linux/rcupdate.h>
> #include "input-compat.h"
> #include "input-poller.h"
> +#include <linux/kbd_kern.h>
>
> MODULE_AUTHOR("Vojtech Pavlik <vojtech@xxxxxxx>");
> MODULE_DESCRIPTION("Input core");
> @@ -472,8 +473,12 @@ void input_inject_event(struct input_handle *handle,
>
> rcu_read_lock();
> grab = rcu_dereference(dev->grab);
> - if (!grab || grab == handle)
> + if (!grab || grab == handle) {
> input_handle_event(dev, type, code, value);
> +
> + if (type == EV_LED && code < LED_SCROLLL)
> + update_value_ledstate(code, value);
> + }
> rcu_read_unlock();
>
> spin_unlock_irqrestore(&dev->event_lock, flags);
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index c7fbbcdcc346..f612ed5c647f 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
> @@ -1140,6 +1140,31 @@ static unsigned char getledstate(void)
> return ledstate & 0xff;
> }
>
> +void update_value_ledstate(unsigned int flag, unsigned int value)
> +{
> + unsigned int bit;
> +
> + switch (flag) {
> + case LED_NUML:
> + bit = VC_NUMLOCK;
> + break;
> + case LED_CAPSL:
> + bit = VC_CAPSLOCK;
> + break;
> + case LED_SCROLLL:
> + bit = VC_SCROLLOCK;
> + break;
> + default:
> + WARN_ON_ONCE(1);
> + return;
> + }
> +
> + if (value)
> + ledstate |= BIT(bit);
> + else
> + ledstate &= ~BIT(BIT);
> +}
> +
> void setledstate(struct kbd_struct *kb, unsigned int led)
> {
> unsigned long flags;
> @@ -1249,6 +1274,10 @@ static void kbd_bh(struct tasklet_struct *unused)
> {
> unsigned int leds;
> unsigned long flags;
> + struct kbd_struct *kb = kbd_table + fg_console;
> +
> + if (kb->kbdmode == VC_OFF)
> + return;
>
> spin_lock_irqsave(&led_lock, flags);
> leds = getleds();
> @@ -1257,7 +1286,6 @@ static void kbd_bh(struct tasklet_struct *unused)
>
> if (leds != ledstate) {
> kbd_propagate_led_state(ledstate, leds);
> - ledstate = leds;
> }
> }
>
> diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
> index c40811d79769..36a3402658e6 100644
> --- a/include/linux/kbd_kern.h
> +++ b/include/linux/kbd_kern.h
> @@ -62,6 +62,8 @@ extern int kbd_init(void);
>
> extern void setledstate(struct kbd_struct *kbd, unsigned int led);
>
> +extern void update_value_ledstate(int flag, int value);
> +
> extern int do_poke_blanked_console;
>
> extern void (*kbd_ledfunc)(unsigned int led);
> --
> 2.20.1
>
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him
a patch that has triggered this response. He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created. Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.
You are receiving this message because of the following common error(s)
as indicated below:
- This looks like a new version of a previously submitted patch, but you
did not list below the --- line any changes from the previous version.
Please read the section entitled "The canonical patch format" in the
kernel file, Documentation/SubmittingPatches for what needs to be done
here to properly describe this.
If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.
thanks,
greg k-h's patch email bot
