From: lianzhi chang <changlianzhi@uniontech.com> To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, 282827961@qq.com, lianzhi chang <changlianzhi@uniontech.com> Subject: [PATCH] input&tty: Fix the keyboard led light display problem Date: Thu, 14 Oct 2021 12:06:48 +0800 [thread overview] Message-ID: <20211014040648.8989-1-changlianzhi@uniontech.com> (raw) 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@uniontech.com> --- drivers/input/input.c | 7 ++++++- drivers/tty/vt/keyboard.c | 22 +++++++++++++++++++++- include/linux/kbd_kern.h | 2 ++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index ccaeb2426385..41f6186a9cc4 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@suse.cz>"); 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 < 3) + 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..005fa5cf2a67 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1140,6 +1140,23 @@ static unsigned char getledstate(void) return ledstate & 0xff; } +void update_value_ledstate(int flag, int value) +{ + if (ledstate == -1U) + ledstate = 0; + + if (flag == LED_NUML) { + ledstate &= ~(1 << 1); + ledstate |= value << 1; + } else if (flag == LED_CAPSL) { + ledstate &= ~(1 << 2); + ledstate |= value << 2; + } else if (flag == LED_SCROLLL) { + ledstate &= ~(1 << 0); + ledstate |= value << 0; + } +} + void setledstate(struct kbd_struct *kb, unsigned int led) { unsigned long flags; @@ -1249,6 +1266,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 +1278,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
WARNING: multiple messages have this Message-ID (diff)
From: lianzhi chang <changlianzhi@uniontech.com> To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, 282827961@qq.com, lianzhi chang <changlianzhi@uniontech.com> Subject: [PATCH] input&tty: Fix the keyboard led light display problem Date: Thu, 14 Oct 2021 12:06:48 +0800 [thread overview] Message-ID: <20211014040648.8989-1-changlianzhi@uniontech.com> (raw) [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 3122 bytes --] 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@uniontech.com> --- drivers/input/input.c | 7 ++++++- drivers/tty/vt/keyboard.c | 22 +++++++++++++++++++++- include/linux/kbd_kern.h | 2 ++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index ccaeb2426385..41f6186a9cc4 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@suse.cz>"); 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 < 3) + 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..005fa5cf2a67 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1140,6 +1140,23 @@ static unsigned char getledstate(void) return ledstate & 0xff; } +void update_value_ledstate(int flag, int value) +{ + if (ledstate == -1U) + ledstate = 0; + + if (flag == LED_NUML) { + ledstate &= ~(1 << 1); + ledstate |= value << 1; + } else if (flag == LED_CAPSL) { + ledstate &= ~(1 << 2); + ledstate |= value << 2; + } else if (flag == LED_SCROLLL) { + ledstate &= ~(1 << 0); + ledstate |= value << 0; + } +} + void setledstate(struct kbd_struct *kb, unsigned int led) { unsigned long flags; @@ -1249,6 +1266,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 +1278,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 \v¸\x12
next reply other threads:[~2021-10-14 4:07 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-14 4:06 lianzhi chang [this message] 2021-10-14 4:06 ` [PATCH] input&tty: Fix the keyboard led light display problem lianzhi chang [not found] <20211014030836.30612-1-changlianzhi@uniontech.com> 2021-10-14 4:12 ` Jiri Slaby [not found] <20211014040508.8367-1-changlianzhi@uniontech.com> 2021-10-14 4:12 ` Jiri Slaby 2021-10-14 7:20 lianzhi chang [not found] <20211014071627.23256-1-changlianzhi@uniontech.com> 2021-10-14 7:34 ` Greg KH 2021-10-14 15:13 ` Andy Shevchenko 2021-10-14 14:55 ` Jiri Slaby 2021-10-14 18:20 ` Dmitry Torokhov 2021-10-14 8:53 lianzhi chang [not found] ` <616827d8.1c69fb81.75aa0.eea0SMTPIN_ADDED_BROKEN@mx.google.com> 2021-10-14 13:21 ` gregkh 2021-10-15 1:20 lianzhi chang 2021-10-15 6:45 lianzhi chang 2021-10-15 6:52 ` Greg KH [not found] ` <616934f3.1c69fb81.59ff6.49d9SMTPIN_ADDED_BROKEN@mx.google.com> 2021-10-15 8:04 ` Greg KH [not found] <61693925.1c69fb81.a058.27f2SMTPIN_ADDED_BROKEN@mx.google.com> 2021-10-15 8:25 ` Greg KH 2021-10-15 8:37 lianzhi chang [not found] <20211015083613.7429-1-changlianzhi@uniontech.com> 2021-10-15 8:41 ` Greg KH [not found] ` <616942b2.1c69fb81.dfbff.25afSMTPIN_ADDED_BROKEN@mx.google.com> 2021-10-15 10:16 ` Greg KH [not found] <35696980-2a55-c5c1-3fa9-eadf251dcdde@uniontech.com> 2021-10-15 13:06 ` Andy Shevchenko
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=20211014040648.8989-1-changlianzhi@uniontech.com \ --to=changlianzhi@uniontech.com \ --cc=282827961@qq.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.