From mboxrd@z Thu Jan 1 00:00:00 1970 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 9BFECC433FE for ; Thu, 14 Oct 2021 04:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7293E60230 for ; Thu, 14 Oct 2021 04:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229513AbhJNEOP (ORCPT ); Thu, 14 Oct 2021 00:14:15 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:36525 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbhJNEOO (ORCPT ); Thu, 14 Oct 2021 00:14:14 -0400 Received: by mail-wr1-f52.google.com with SMTP id o20so15182880wro.3; Wed, 13 Oct 2021 21:12:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=JmxulHP5kQw9R3bKo7IHQWOTf+xB6AvsrMfurN5UR9k=; b=Zi90qSMWlpRO3s/S4B6LPRYHKy2FUyjzviyK+AsC+3HFCtCrhkXb41HMFMVt5F+r0a /OxXBIbitFJsBHZvJW+qW1xscRdufuSsLNMrBUrO9Vl7VS0hQu8bbMHW2cFuEAPAdTJZ eGxVntnfpo3LTjy+PVLqLEV616FHL2k3kWaxIA1yojKQuhtaz32BmPns0wu/kq+8DKdj hUNy30HSR1iN1nSP4hZKC1RsXJlGZoorqNxkGLgXkCFwwZpq3VJFJfT3obq1hbwZRFMy H+12NwgWMhPkdylBEdbJFfYg2fSfznRrgBSKsxL+vZ0nU125K8H5ah3U0lhqJQnqHxVH 1niw== X-Gm-Message-State: AOAM5337PiviuKBiKhVlV47ytSvq2XRN238aqkXCy7jn1WtRaSJ52RU8 XvG1lL2KuK1+II42N4pcUwdbJe0MkNc= X-Google-Smtp-Source: ABdhPJxNF/EOw6Fr1ooUP2mxOGeC5DFpYAE5cWFJWlZGXnD00HuecRhew08Lq93cJ+Q2DqGNjRY3TQ== X-Received: by 2002:adf:a30b:: with SMTP id c11mr3896486wrb.289.1634184728935; Wed, 13 Oct 2021 21:12:08 -0700 (PDT) Received: from ?IPV6:2a0b:e7c0:0:107::70f? ([2a0b:e7c0:0:107::70f]) by smtp.gmail.com with ESMTPSA id h8sm1305014wrm.27.2021.10.13.21.12.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Oct 2021 21:12:08 -0700 (PDT) Message-ID: <63beeeac-f6c6-5780-a089-35e4e75cabb5@kernel.org> Date: Thu, 14 Oct 2021 06:12:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.2 Subject: Re: [PATCH] input&tty: Fix the keyboard led light display problem Content-Language: en-US To: lianzhi chang , linux-kernel@vger.kernel.org Cc: dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org, andriy.shevchenko@linux.intel.com, linux-input@vger.kernel.org, 282827961@qq.com References: <20211014030836.30612-1-changlianzhi@uniontech.com> From: Jiri Slaby In-Reply-To: <20211014030836.30612-1-changlianzhi@uniontech.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14. 10. 21, 5:08, 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 > --- > 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 > #include "input-compat.h" > #include "input-poller.h" > +#include > > MODULE_AUTHOR("Vojtech Pavlik "); > 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) 3 is a magic constant. In fact, you mean "code <= LED_SCROLLL", right? > + 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) Why is the int signed? > +{ > + if (ledstate == -1U) > + ledstate = 0; > + > + if (flag == LED_NUML) { > + ledstate &= ~(1 << 1); ledstate &= ~BIT(VC_NUMLOCK); > + ledstate |= value << 1; What ensures that value is 0 or 1 here? > + } else if (flag == LED_CAPSL) { > + ledstate &= ~(1 << 2); > + ledstate |= value << 2; > + } else if (flag == LED_SCROLLL) { > + ledstate &= ~(1 << 0); > + ledstate |= value << 0; > + } What about something like this (maybe ifs would be shorter, dunno, try it): 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 +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; Can you explain why (not to me, to the commit log)? > 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; The same here. Why this doesn't break the current behaviour. > } > } > > 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); > thanks, -- js suse labs