From patchwork Wed Oct 20 06:48:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lianzhi chang X-Patchwork-Id: 12571705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24049C433EF for ; Wed, 20 Oct 2021 06:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A9E061074 for ; Wed, 20 Oct 2021 06:49:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229919AbhJTGv3 (ORCPT ); Wed, 20 Oct 2021 02:51:29 -0400 Received: from smtpbg701.qq.com ([203.205.195.86]:58903 "EHLO smtpproxy21.qq.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229911AbhJTGv3 (ORCPT ); Wed, 20 Oct 2021 02:51:29 -0400 X-QQ-mid: bizesmtp32t1634712543tsu6o2yz Received: from localhost.localdomain (unknown [113.57.152.160]) by esmtp6.qq.com (ESMTP) with id ; Wed, 20 Oct 2021 14:48:56 +0800 (CST) X-QQ-SSF: B1400000002000B0E000000C0000000 X-QQ-FEAT: jfdGVjI73+SU9uLtaMY5biNEfmeD4ocYWQWhOnpNEPnEqsMynZjyFv5G3U2T0 7bQnik5zoOSp3k2jJYTz9N+a3rHgAm7mutcbTmiDo/MBi9Bm8owoDeMyVUxl2pgH3nVG5MM FGUo0JCskFH5KAZ5XyslkDmEfo3jxc635lWPnOZcxLOMu6wQqq+OD4A/dPp6JJTg5zzDsNL A6ndFrZMMsV37WA0iRBFxcU6I0pOmVfdW9i/xK4AbpQcHQUacI4HJSXSgKV66zGVsJBlz8Y hMld0SvMTb+8UK1sTGtP8VC/UO9VyJBMDbMF0H54C4VY0h6e0qX110WENnJXkfvs+kQhaJ6 OwCDiNis+mQp82oIkrK5V0BT6/CGnxsg4XP41IlY5WrTbFpC74= X-QQ-GoodBg: 1 From: lianzhi chang To: linux-kernel@vger.kernel.org Cc: dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org, jirislaby@kernel.org, andriy.shevchenko@linux.intel.com, linux-input@vger.kernel.org, 282827961@qq.com, lianzhi chang Subject: [[PATCH v3 10/20]] input&tty: Fix the keyboard led light display problem Date: Wed, 20 Oct 2021 14:48:42 +0800 Message-Id: <20211020064842.29573-1-changlianzhi@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 --- v2 10/18-->v3 10/20: (1) Abandon the previous modification plan. (2) Added the kbd_update_ledstate function, this function gets the latest state of the led from the input device, and then synchronizes it to the ledstate. The kbd_event function calls it. (3) When the tty's kbdmode==VC_OFF, the tty does not set the keyboard light (modify the kbd_bh function). drivers/tty/vt/keyboard.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index c7fbbcdcc346..5fcdd1805b4d 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1130,6 +1130,22 @@ static void kbd_init_leds(void) #endif +static void kbd_update_ledstate(struct input_dev *dev) +{ + unsigned long leds = (unsigned long)ledstate; + + if (test_bit(EV_LED, dev->evbit)) { + if (ledstate == -1U) + ledstate = 0; + if (!!test_bit(LED_NUML, dev->led) != !!test_bit(VC_NUMLOCK, &leds)) + ledstate ^= BIT(VC_NUMLOCK); + if (!!test_bit(LED_CAPSL, dev->led) != !!test_bit(VC_CAPSLOCK, &leds)) + ledstate ^= BIT(VC_CAPSLOCK); + if (!!test_bit(LED_SCROLLL, dev->led) != !!test_bit(VC_SCROLLOCK, &leds)) + ledstate ^= BIT(VC_SCROLLOCK); + } +} + /* * The leds display either (i) the status of NumLock, CapsLock, ScrollLock, * or (ii) whatever pattern of lights people want to show using KDSETLED, @@ -1249,6 +1265,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(); @@ -1524,6 +1544,8 @@ static void kbd_event(struct input_handle *handle, unsigned int event_type, /* We are called with interrupts disabled, just take the lock */ spin_lock(&kbd_event_lock); + kbd_update_ledstate(handle->dev); + if (event_type == EV_MSC && event_code == MSC_RAW && kbd_is_hw_raw(handle->dev)) kbd_rawcode(value);