* [PATCH v1 04/10] selftests/kvm: Define _GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
index f3c2239228b1..7422e8ff6bd3 100644
--- a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
+++ b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
@@ -4,6 +4,8 @@
*
* Tests for KVM paravirtual feature disablement
*/
+#define _GNU_SOURCE
+
#include <asm/kvm_para.h>
#include <linux/kvm_para.h>
#include <linux/stringify.h>
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 05/10] selftests/nci: Compile with -D_GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/nci/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/nci/Makefile b/tools/testing/selftests/nci/Makefile
index 47669a1d6a59..f615f5d71f7f 100644
--- a/tools/testing/selftests/nci/Makefile
+++ b/tools/testing/selftests/nci/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-CFLAGS += -Wl,-no-as-needed -Wall
+CFLAGS += -Wl,-no-as-needed -Wall -D_GNU_SOURCE
LDFLAGS += -lpthread
TEST_GEN_PROGS := nci_dev
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 06/10] selftests/net: Define _GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/net/bind_wildcard.c | 1 +
tools/testing/selftests/net/ip_local_port_range.c | 1 +
tools/testing/selftests/net/reuseaddr_ports_exhausted.c | 2 ++
3 files changed, 4 insertions(+)
diff --git a/tools/testing/selftests/net/bind_wildcard.c b/tools/testing/selftests/net/bind_wildcard.c
index b7b54d646b93..be0773cbc15b 100644
--- a/tools/testing/selftests/net/bind_wildcard.c
+++ b/tools/testing/selftests/net/bind_wildcard.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright Amazon.com Inc. or its affiliates. */
+#define _GNU_SOURCE
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/tools/testing/selftests/net/ip_local_port_range.c b/tools/testing/selftests/net/ip_local_port_range.c
index 193b82745fd8..08fbd3449ffa 100644
--- a/tools/testing/selftests/net/ip_local_port_range.c
+++ b/tools/testing/selftests/net/ip_local_port_range.c
@@ -6,6 +6,7 @@
* Tests assume that net.ipv4.ip_local_port_range is [40000, 49999].
* Don't run these directly but with ip_local_port_range.sh script.
*/
+#define _GNU_SOURCE
#include <fcntl.h>
#include <netinet/ip.h>
diff --git a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c b/tools/testing/selftests/net/reuseaddr_ports_exhausted.c
index 066efd30e294..a5c40528837f 100644
--- a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c
+++ b/tools/testing/selftests/net/reuseaddr_ports_exhausted.c
@@ -17,6 +17,8 @@
*
* Author: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
*/
+#define _GNU_SOURCE
+
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/socket.h>
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 07/10] selftests/prctl: Compile with -D_GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/prctl/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/prctl/Makefile b/tools/testing/selftests/prctl/Makefile
index 01dc90fbb509..23d319a7a322 100644
--- a/tools/testing/selftests/prctl/Makefile
+++ b/tools/testing/selftests/prctl/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+CFLAGS += -D_GNU_SOURCE
ifndef CROSS_COMPILE
uname_M := $(shell uname -m 2>/dev/null || echo not)
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 08/10] selftests/rtc: Compile with -D_GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/rtc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/rtc/Makefile b/tools/testing/selftests/rtc/Makefile
index 55198ecc04db..4ef7ee969003 100644
--- a/tools/testing/selftests/rtc/Makefile
+++ b/tools/testing/selftests/rtc/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-CFLAGS += -O3 -Wl,-no-as-needed -Wall
+CFLAGS += -O3 -Wl,-no-as-needed -Wall -D_GNU_SOURCE
LDLIBS += -lrt -lpthread -lm
TEST_GEN_PROGS = rtctest
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 09/10] selftests/tdx: Compile with -D_GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/tdx/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/tdx/Makefile b/tools/testing/selftests/tdx/Makefile
index 306e9c4d5ef7..5a084a792a21 100644
--- a/tools/testing/selftests/tdx/Makefile
+++ b/tools/testing/selftests/tdx/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-CFLAGS += -O3 -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) -static
+CFLAGS += -O3 -Wl,-no-as-needed -Wall -D_GNU_SOURCE $(KHDR_INCLUDES) -static
TEST_GEN_PROGS := tdx_guest_test
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* [PATCH v1 10/10] selftests/user_events: Compiled with -D_GNU_SOURCE
From: Edward Liaw @ 2024-04-30 23:50 UTC (permalink / raw)
To: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Edward Liaw, Andrew Morton, Muhammad Usama Anjum
Cc: linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
asprintf into kselftest_harness.h, which is a GNU extension and needs
_GNU_SOURCE to either be defined prior to including headers or with the
-D_GNU_SOURCE flag passed to the compiler.
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Edward Liaw <edliaw@google.com>
---
tools/testing/selftests/user_events/Makefile | 2 +-
tools/testing/selftests/user_events/abi_test.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/testing/selftests/user_events/Makefile b/tools/testing/selftests/user_events/Makefile
index 10fcd0066203..344a71769113 100644
--- a/tools/testing/selftests/user_events/Makefile
+++ b/tools/testing/selftests/user_events/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES)
+CFLAGS += -Wl,-no-as-needed -Wall -D_GNU_SOURCE $(KHDR_INCLUDES)
LDLIBS += -lrt -lpthread -lm
TEST_GEN_PROGS = ftrace_test dyn_test perf_test abi_test
diff --git a/tools/testing/selftests/user_events/abi_test.c b/tools/testing/selftests/user_events/abi_test.c
index 7288a05136ba..3e3a0327afdc 100644
--- a/tools/testing/selftests/user_events/abi_test.c
+++ b/tools/testing/selftests/user_events/abi_test.c
@@ -5,7 +5,6 @@
* Copyright (c) 2022 Beau Belgrave <beaub@linux.microsoft.com>
*/
-#define _GNU_SOURCE
#include <sched.h>
#include <errno.h>
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* Re: [PATCH v1 00/10] Define _GNU_SOURCE for sources using
From: Mark Brown @ 2024-05-01 1:59 UTC (permalink / raw)
To: Edward Liaw
Cc: shuah, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Sean Christopherson, Paolo Bonzini,
Bongsu Jeon, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen, Dave Hansen,
Andrew Morton, Muhammad Usama Anjum, linux-kernel,
linux-kselftest, kernel-team, linux-sound, linux-input, kvm,
netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-1-edliaw@google.com>
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
On Tue, Apr 30, 2024 at 11:50:09PM +0000, Edward Liaw wrote:
> 809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
> asprintf into kselftest_harness.h, which is a GNU extension and needs
> _GNU_SOURCE to either be defined prior to including headers or with the
> -D_GNU_SOURCE flag passed to the compiler.
This seems like something that should be handled centrally rather than
having to go round and audit the users every time some update is made.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: [PATCH v2] Input: try trimming too long modalias strings
From: Peter Hutterer @ 2024-05-01 3:59 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-input, Jason Andryuk, Hans de Goede, Benjamin Tissoires,
linux-kernel
In-Reply-To: <ZjAWMQCJdrxZkvkB@google.com>
On Mon, Apr 29, 2024 at 02:50:41PM -0700, Dmitry Torokhov wrote:
> If an input device declares too many capability bits then modalias
> string for such device may become too long and not fit into uevent
> buffer, resulting in failure of sending said uevent. This, in turn,
> may prevent userspace from recognizing existence of such devices.
>
> This is typically not a concern for real hardware devices as they have
> limited number of keys, but happen with synthetic devices such as
> ones created by xen-kbdfront driver, which creates devices as being
> capable of delivering all possible keys, since it doesn't know what
> keys the backend may produce.
>
> To deal with such devices input core will attempt to trim key data,
> in the hope that the rest of modalias string will fit in the given
> buffer. When trimming key data it will indicate that it is not
> complete by placing "+," sign, resulting in conversions like this:
>
> old: k71,72,73,74,78,7A,7B,7C,7D,8E,9E,A4,AD,E0,E1,E4,F8,174,
> new: k71,72,73,74,78,7A,7B,7C,+,
>
> This should allow existing udev rules continue to work with existing
> devices, and will also allow writing more complex rules that would
> recognize trimmed modalias and check input device characteristics by
> other means (for example by parsing KEY= data in uevent or parsing
> input device sysfs attributes).
>
> Note that the driver core may try adding more uevent environment
> variables once input core is done adding its own, so when forming
> modalias we can not use the entire available buffer, so we reduce
> it by somewhat an arbitrary amount (96 bytes).
>
> Reported-by: Jason Andryuk <jandryuk@gmail.com>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>
> v2: do not use entire available buffer when formatting modalias, leave
> some space for driver core to add more data.
ftr, there's nothing in the projects I maintain that require those bits
of the modalias, so I'm good :) I'm not aware of any parsers that would
struggle with the + sign here. git grep of systemd doesn't show anything
either, so I think we're good.
Took me an embarrassingly long time to wrap my head around the code but
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Cheers,
Peter
>
> drivers/input/input.c | 108 +++++++++++++++++++++++++++++++++++-------
> 1 file changed, 91 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index b04bcdeee557..045f4b62088a 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -1338,19 +1338,19 @@ static int input_print_modalias_bits(char *buf, int size,
> char name, const unsigned long *bm,
> unsigned int min_bit, unsigned int max_bit)
> {
> - int len = 0, i;
> + int bit = min_bit;
> + int len = 0;
>
> len += snprintf(buf, max(size, 0), "%c", name);
> - for (i = min_bit; i < max_bit; i++)
> - if (bm[BIT_WORD(i)] & BIT_MASK(i))
> - len += snprintf(buf + len, max(size - len, 0), "%X,", i);
> + for_each_set_bit_from(bit, bm, max_bit)
> + len += snprintf(buf + len, max(size - len, 0), "%X,", bit);
> return len;
> }
>
> -static int input_print_modalias(char *buf, int size, const struct input_dev *id,
> - int add_cr)
> +static int input_print_modalias_parts(char *buf, int size, int full_len,
> + const struct input_dev *id)
> {
> - int len;
> + int len, klen, remainder, space;
>
> len = snprintf(buf, max(size, 0),
> "input:b%04Xv%04Xp%04Xe%04X-",
> @@ -1359,8 +1359,48 @@ static int input_print_modalias(char *buf, int size, const struct input_dev *id,
>
> len += input_print_modalias_bits(buf + len, size - len,
> 'e', id->evbit, 0, EV_MAX);
> - len += input_print_modalias_bits(buf + len, size - len,
> +
> + /*
> + * Calculate the remaining space in the buffer making sure we
> + * have place for the terminating 0.
> + */
> + space = max(size - (len + 1), 0);
> +
> + klen = input_print_modalias_bits(buf + len, size - len,
> 'k', id->keybit, KEY_MIN_INTERESTING, KEY_MAX);
> + len += klen;
> +
> + /*
> + * If we have more data than we can fit in the buffer, check
> + * if we can trim key data to fit in the rest. We will indicate
> + * that key data is incomplete by adding "+" sign at the end, like
> + * this: * "k1,2,3,45,+,".
> + *
> + * Note that we shortest key info (if present) is "k+," so we
> + * can only try to trim if key data is longer than that.
> + */
> + if (full_len && size < full_len + 1 && klen > 3) {
> + remainder = full_len - len;
> + /*
> + * We can only trim if we have space for the remainder
> + * and also for at least "k+," which is 3 more characters.
> + */
> + if (remainder <= space - 3) {
> + /*
> + * We are guaranteed to have 'k' in the buffer, so
> + * we need at least 3 additional bytes for storing
> + * "+," in addition to the remainder.
> + */
> + for (int i = size - 1 - remainder - 3; i >= 0; i--) {
> + if (buf[i] == 'k' || buf[i] == ',') {
> + strcpy(buf + i + 1, "+,");
> + len = i + 3; /* Not counting '\0' */
> + break;
> + }
> + }
> + }
> + }
> +
> len += input_print_modalias_bits(buf + len, size - len,
> 'r', id->relbit, 0, REL_MAX);
> len += input_print_modalias_bits(buf + len, size - len,
> @@ -1376,22 +1416,37 @@ static int input_print_modalias(char *buf, int size, const struct input_dev *id,
> len += input_print_modalias_bits(buf + len, size - len,
> 'w', id->swbit, 0, SW_MAX);
>
> - if (add_cr)
> - len += snprintf(buf + len, max(size - len, 0), "\n");
> -
> return len;
> }
>
> +static int input_print_modalias(char *buf, int size, const struct input_dev *id)
> +{
> + int full_len;
> +
> + /*
> + * Printing is done in 2 passes: first one figures out total length
> + * needed for the modalias string, second one will try to trim key
> + * data in case when buffer is too small for the entire modalias.
> + * If the buffer is too small regardless, it will fill as much as it
> + * can (without trimming key data) into the buffer and leave it to
> + * the caller to figure out what to do with the result.
> + */
> + full_len = input_print_modalias_parts(NULL, 0, 0, id);
> + return input_print_modalias_parts(buf, size, full_len, id);
> +}
> +
> static ssize_t input_dev_show_modalias(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> {
> struct input_dev *id = to_input_dev(dev);
> - ssize_t len;
> + size_t len;
>
> - len = input_print_modalias(buf, PAGE_SIZE, id, 1);
> + len = input_print_modalias(buf, PAGE_SIZE, id);
> + if (len < PAGE_SIZE - 2)
> + len += snprintf(buf + len, PAGE_SIZE - len, "\n");
>
> - return min_t(int, len, PAGE_SIZE);
> + return min(len, PAGE_SIZE);
> }
> static DEVICE_ATTR(modalias, S_IRUGO, input_dev_show_modalias, NULL);
>
> @@ -1601,6 +1656,23 @@ static int input_add_uevent_bm_var(struct kobj_uevent_env *env,
> return 0;
> }
>
> +/*
> + * This is a pretty gross hack. When building uevent data the driver core
> + * may try adding more environment variables to kobj_uevent_env without
> + * telling us, so we have no idea how much of the buffer we can use to
> + * avoid overflows/-ENOMEM elsewhere. To work around this let's artificially
> + * reduce amount of memory we will use for the modalias environment variable.
> + *
> + * The potential additions are:
> + *
> + * SEQNUM=18446744073709551615 - (%llu - 28 bytes)
> + * HOME=/ (6 bytes)
> + * PATH=/sbin:/bin:/usr/sbin:/usr/bin (34 bytes)
> + *
> + * 68 bytes total. Allow extra buffer - 96 bytes
> + */
> +#define UEVENT_ENV_EXTRA_LEN 96
> +
> static int input_add_uevent_modalias_var(struct kobj_uevent_env *env,
> const struct input_dev *dev)
> {
> @@ -1610,9 +1682,11 @@ static int input_add_uevent_modalias_var(struct kobj_uevent_env *env,
> return -ENOMEM;
>
> len = input_print_modalias(&env->buf[env->buflen - 1],
> - sizeof(env->buf) - env->buflen,
> - dev, 0);
> - if (len >= (sizeof(env->buf) - env->buflen))
> + (int)sizeof(env->buf) - env->buflen -
> + UEVENT_ENV_EXTRA_LEN,
> + dev);
> + if (len >= ((int)sizeof(env->buf) - env->buflen -
> + UEVENT_ENV_EXTRA_LEN))
> return -ENOMEM;
>
> env->buflen += len;
> --
> 2.44.0.769.g3c40516874-goog
>
>
> --
> Dmitry
^ permalink raw reply
* [PATCH] Input: da7280 - Remove an unused field in struct da7280_haptic
From: Christophe JAILLET @ 2024-05-01 5:05 UTC (permalink / raw)
To: Support Opensource, Dmitry Torokhov
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input
In "struct da7280_haptic", the 'legacy' field is unused.
Remove it.
Found with cppcheck, unusedStructMember.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
This field was added in the initial commit cd3f609823a5 ("hwmon: Input: new
da7280 haptic driver") but was never used.
---
drivers/input/misc/da7280.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
index c1fa75c0f970..1629b7ea4cbd 100644
--- a/drivers/input/misc/da7280.c
+++ b/drivers/input/misc/da7280.c
@@ -230,7 +230,6 @@ struct da7280_haptic {
struct i2c_client *client;
struct pwm_device *pwm_dev;
- bool legacy;
struct work_struct work;
int val;
u16 gain;
--
2.44.0
^ permalink raw reply related
* Re: [PATCH v3 1/3] HID: i2c-hid: Rely on HID descriptor fetch to probe
From: Kenny Levinsen @ 2024-05-01 5:24 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Jiri Kosina, Dmitry Torokhov, Benjamin Tissoires,
Douglas Anderson, Hans de Goede, Maxime Ripard, Kai-Heng Feng,
Johan Hovold, linux-input, linux-kernel, Radoslaw Biernacki,
Lukasz Majczak
In-Reply-To: <ZjFli4zOalXkDWx_@google.com>
On 4/30/24 11:41 PM, Dmitry Torokhov wrote:
> I actually believe there is. On Chromebooks we may source components
> from several vendors and use them in our devices. The components
> are electrically compatible with each other, have exactly the same
> connector, and therefore interchangeable. Because of that at probe time
> we do not quite know if the device is there at given address, or not
> (i.e. the touchpad could be from a different vendor and listening on
> another address) and we need to make a quick determination whether we
> should continue with probe or not.
Maybe I should clarify what I meant: All I2C operations start with the
master writing the slave address to the bus. When a slave reads its own
address off the bus, it pulls the data line low to ACK. If no device is
present on the bus with the specified address, the line stays high which
is a NACK. This means that on the bus level, we have a clear error
condition specifically for no device with the specified address being
present on the bus.
Whether the operation used is a dummy read or our first actual write
should not matter - if the address is not acknowledged, the device is
not present (or able to talk I2C). The problem lies in whether this "no
device present on bus" error is reported clearly to us: Some drivers use
-ENXIO specifically for this, some use it also for NACKs on written
data, some report it but use other return codes for it, etc.
Even if we stick to the smbus probe in the long run, if we get to the
point where we can rely on the error codes from I2C drivers we would be
able to correctly log and propagate other error classes like bus errors
or I2C driver issues which are all currently silenced as "nothing at
address" by the smbus probe.
> I am not sure we can fully unify what Windows does and what Linux does,
> mainly because our firmwares are different (I think Windows devices do a
> lot more device discovery in firmware, Chrome OS historically tried to
> limit amount of code in its firmware). We also need to make sure it
> works on non-ACPI systems/ARM.
Good point. My main focus is also quirky behaviors we have added to
replicate Windows behavior, the smbus probe just stood out in my bus traces.
I already sent
https://lore.kernel.org/all/20240429233924.6453-1-kl@kl.wtf/ which goes
back to improving the bus probe.
^ permalink raw reply
* [PATCH 2/2] Input: tca6416-keypad - Remove unused struct tca6416_drv_data
From: Christophe JAILLET @ 2024-05-01 5:30 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input
In-Reply-To: <926c0f40040671565dcc54d5146a8f9511fb6d46.1714541432.git.christophe.jaillet@wanadoo.fr>
"struct tca6416_drv_data" is unused.
Remove it.
Found with cppcheck, unusedStructMember.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
It was added in the initial commit 30ba3ead0576 ("Input: add keypad driver
for keys interfaced to TCA6416") but was never used.
---
drivers/input/keyboard/tca6416-keypad.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c
index 044401d01bf6..fbc674d7b9f0 100644
--- a/drivers/input/keyboard/tca6416-keypad.c
+++ b/drivers/input/keyboard/tca6416-keypad.c
@@ -32,11 +32,6 @@ static const struct i2c_device_id tca6416_id[] = {
};
MODULE_DEVICE_TABLE(i2c, tca6416_id);
-struct tca6416_drv_data {
- struct input_dev *input;
- struct tca6416_button data[];
-};
-
struct tca6416_keypad_chip {
uint16_t reg_output;
uint16_t reg_direction;
--
2.44.0
^ permalink raw reply related
* [PATCH 1/2] Input: tca6416-keypad - Remove an unused field in struct tca6416_keypad_chip
From: Christophe JAILLET @ 2024-05-01 5:30 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input
In "struct tca6416_keypad_chip", the 'irqnum' field is unused.
Remove it.
Found with cppcheck, unusedStructMember.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
It was added in the initial commit 30ba3ead0576 ("Input: add keypad driver
for keys interfaced to TCA6416") and its users were removed in commit
687fe7dfb736 ("Input: tca6416-keypad - always expect proper IRQ number in
i2c client").
---
drivers/input/keyboard/tca6416-keypad.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c
index 677bc4baa5d1..044401d01bf6 100644
--- a/drivers/input/keyboard/tca6416-keypad.c
+++ b/drivers/input/keyboard/tca6416-keypad.c
@@ -45,7 +45,6 @@ struct tca6416_keypad_chip {
struct i2c_client *client;
struct input_dev *input;
int io_size;
- int irqnum;
u16 pinmask;
bool use_polling;
struct tca6416_button buttons[];
--
2.44.0
^ permalink raw reply related
* Re: [PATCH v1 00/10] Define _GNU_SOURCE for sources using
From: Muhammad Usama Anjum @ 2024-05-01 5:40 UTC (permalink / raw)
To: Mark Brown, Edward Liaw
Cc: Muhammad Usama Anjum, shuah, Jaroslav Kysela, Takashi Iwai,
Jiri Kosina, Benjamin Tissoires, Sean Christopherson,
Paolo Bonzini, Bongsu Jeon, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexandre Belloni, Jarkko Sakkinen,
Dave Hansen, Andrew Morton, linux-kernel, linux-kselftest,
kernel-team, linux-sound, linux-input, kvm, netdev, linux-rtc,
linux-sgx
In-Reply-To: <ZjGiGq-_kUVht63m@finisterre.sirena.org.uk>
Thanks for the fixes.
On 5/1/24 6:59 AM, Mark Brown wrote:
> On Tue, Apr 30, 2024 at 11:50:09PM +0000, Edward Liaw wrote:
>> 809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
>> asprintf into kselftest_harness.h, which is a GNU extension and needs
>> _GNU_SOURCE to either be defined prior to including headers or with the
>> -D_GNU_SOURCE flag passed to the compiler.
>
> This seems like something that should be handled centrally rather than
> having to go round and audit the users every time some update is made.
The easiest way I could think of is to add -D_GNU_SOURCE to KHDR_HEADERS
definition in tools/testing/selftests/Makefile. It wouldn't be obvious from
KHDR_HEADERS name that there could be other flags in it as well though.
--
BR,
Muhammad Usama Anjum
^ permalink raw reply
* [PATCH] Input: matrix_keypad - Remove an unused field in struct matrix_keypad
From: Christophe JAILLET @ 2024-05-01 5:41 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input
In "struct matrix_keypad", the 'gpio_all_disabled' field is unused.
Remove it.
Found with cppcheck, unusedStructMember.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
It was added in commit fb76dd10b911 ("Input: matrix_keypad - add support
for clustered irq") and its users were removed in commit 8cf4b3683a71
("Input: matrix_keypad - consolidate handling of clustered interrupt").
---
drivers/input/keyboard/matrix_keypad.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 695c03e075b5..7a56f3d3aacd 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -37,7 +37,6 @@ struct matrix_keypad {
spinlock_t lock;
bool scan_pending;
bool stopped;
- bool gpio_all_disabled;
};
/*
--
2.44.0
^ permalink raw reply related
* [PATCH] Input: lpc32xx-keys - Remove an unused field in struct lpc32xx_kscan_drv
From: Christophe JAILLET @ 2024-05-01 6:39 UTC (permalink / raw)
To: Dmitry Torokhov, Vladimir Zapolskiy
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input,
linux-arm-kernel
In "struct lpc32xx_kscan_drv", the 'irq' field is unused.
Remove it.
Found with cppcheck, unusedStructMember.
While at it, move the 'row_shift' field in order to fill a hole in the
structure (at least on 64 bits arch).
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
It was added in the initial commit 69690bec400e ("Input: add support for
key scan interface of the LPC32xx SoC") but was never used.
---
drivers/input/keyboard/lpc32xx-keys.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c
index 322a87807159..423035be86fb 100644
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@ -57,14 +57,13 @@ struct lpc32xx_kscan_drv {
struct input_dev *input;
struct clk *clk;
void __iomem *kscan_base;
- unsigned int irq;
u32 matrix_sz; /* Size of matrix in XxY, ie. 3 = 3x3 */
u32 deb_clks; /* Debounce clocks (based on 32KHz clock) */
u32 scan_delay; /* Scan delay (based on 32KHz clock) */
- unsigned short *keymap; /* Pointer to key map for the scan matrix */
unsigned int row_shift;
+ unsigned short *keymap; /* Pointer to key map for the scan matrix */
u8 lastkeystates[8];
};
--
2.44.0
^ permalink raw reply related
* [PATCH] Input: cros_ec_keyb - Remove an unused field in struct cros_ec_keyb
From: Christophe JAILLET @ 2024-05-01 6:49 UTC (permalink / raw)
To: Dmitry Torokhov, Benson Leung, Guenter Roeck
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-input,
chrome-platform
In "struct cros_ec_keyb", the 'keymap_data' field is unused.
Remove it.
Found with cppcheck, unusedStructMember.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.
It was added in the initial commit 6af6dc2d2aa6 ("input: Add ChromeOS EC
keyboard driver") but was never used.
---
drivers/input/keyboard/cros_ec_keyb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 30678a34cf64..12eb9df180ee 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -35,7 +35,6 @@
* @rows: Number of rows in the keypad
* @cols: Number of columns in the keypad
* @row_shift: log2 or number of rows, rounded up
- * @keymap_data: Matrix keymap data used to convert to keyscan values
* @ghost_filter: true to enable the matrix key-ghosting filter
* @valid_keys: bitmap of existing keys for each matrix column
* @old_kb_state: bitmap of keys pressed last scan
@@ -50,7 +49,6 @@ struct cros_ec_keyb {
unsigned int rows;
unsigned int cols;
int row_shift;
- const struct matrix_keymap_data *keymap_data;
bool ghost_filter;
uint8_t *valid_keys;
uint8_t *old_kb_state;
--
2.44.0
^ permalink raw reply related
* Re: [PATCH v1 00/10] Define _GNU_SOURCE for sources using
From: Sean Christopherson @ 2024-05-01 13:24 UTC (permalink / raw)
To: Mark Brown
Cc: Edward Liaw, shuah, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Paolo Bonzini, Bongsu Jeon, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Alexandre Belloni,
Jarkko Sakkinen, Dave Hansen, Andrew Morton, Muhammad Usama Anjum,
linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <ZjGiGq-_kUVht63m@finisterre.sirena.org.uk>
On Wed, May 01, 2024, Mark Brown wrote:
> On Tue, Apr 30, 2024 at 11:50:09PM +0000, Edward Liaw wrote:
> > 809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
> > asprintf into kselftest_harness.h, which is a GNU extension and needs
> > _GNU_SOURCE to either be defined prior to including headers or with the
> > -D_GNU_SOURCE flag passed to the compiler.
>
> This seems like something that should be handled centrally rather than
> having to go round and audit the users every time some update is made.
+1.
And if for some reason unilaterally defining _GNU_SOURCE in
tools/testing/selftests/lib.mk isn't an option, we should at least have
kselftest_harness.h assert instead of making a futile attempt to provide its own
definition, e.g.
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 4fd735e48ee7..6741b4f20f25 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -51,7 +51,7 @@
#define __KSELFTEST_HARNESS_H
#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
+static_assert(0, "Using the kselftests harness requires building with _GNU_SOURCE");
#endif
#include <asm/types.h>
#include <ctype.h>
^ permalink raw reply related
* Re: [PATCH v1 04/10] selftests/kvm: Define _GNU_SOURCE
From: Sean Christopherson @ 2024-05-01 13:26 UTC (permalink / raw)
To: Edward Liaw
Cc: shuah, Mark Brown, Jaroslav Kysela, Takashi Iwai, Jiri Kosina,
Benjamin Tissoires, Paolo Bonzini, Bongsu Jeon, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Alexandre Belloni,
Jarkko Sakkinen, Dave Hansen, Andrew Morton, Muhammad Usama Anjum,
linux-kernel, linux-kselftest, kernel-team, linux-sound,
linux-input, kvm, netdev, linux-rtc, linux-sgx
In-Reply-To: <20240430235057.1351993-5-edliaw@google.com>
On Tue, Apr 30, 2024, Edward Liaw wrote:
> 809216233555 ("selftests/harness: remove use of LINE_MAX") introduced
> asprintf into kselftest_harness.h, which is a GNU extension and needs
> _GNU_SOURCE to either be defined prior to including headers or with the
> -D_GNU_SOURCE flag passed to the compiler.
>
> Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
> Signed-off-by: Edward Liaw <edliaw@google.com>
> ---
> tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c | 2 ++
> 1 file changed, 2 insertions(+)
Regardless of where this series ends up going, this patch can be dropped as I
already have a fix applied for all KVM selftests[*].
Thanks!
[*] https://lore.kernel.org/all/20240423190308.2883084-1-seanjc@google.com
^ permalink raw reply
* [PATCH] Input: elantech - fix touchpad state on resume for Lenovo N24
From: Jonathan Denose @ 2024-05-01 14:02 UTC (permalink / raw)
To: LKML
Cc: linux-input, Jonathan Denose, Dmitry Torokhov, Greg Kroah-Hartman,
Jeffery Miller
The Lenovo N24 on resume becomes stuck in a state where it
sends incorrect packets, causing elantech_packet_check_v4 to fail.
The only way for the device to resume sending the correct packets is for
it to be disabled and then re-enabled.
This change adds a dmi check to trigger this behavior on resume.
Signed-off-by: Jonathan Denose <jdenose@google.com>
---
drivers/input/mouse/elantech.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 4e38229404b4b..e0f3095b4227e 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1476,6 +1476,23 @@ static void elantech_disconnect(struct psmouse *psmouse)
psmouse->private = NULL;
}
+/*
+ * Some hw_version 4 models fail to properly activate absolute mode on
+ * resume without going through disable/enable cycle.
+ */
+static const struct dmi_system_id elantech_needs_reenable[] = {
+#if defined(CONFIG_DMI) && defined(CONFIG_X86)
+ {
+ /* Lenovo N24 */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "81AF"),
+ },
+ },
+#endif
+ { }
+};
+
/*
* Put the touchpad back into absolute mode when reconnecting
*/
@@ -1486,6 +1503,22 @@ static int elantech_reconnect(struct psmouse *psmouse)
if (elantech_detect(psmouse, 0))
return -1;
+ if (dmi_check_system(elantech_needs_reenable)) {
+ int err;
+
+ err = ps2_sendbyte(&psmouse->ps2dev, PSMOUSE_CMD_DISABLE, NULL);
+
+ if (err)
+ psmouse_warn(psmouse, "Failed to deactivate mouse on %s: %d\n",
+ psmouse->ps2dev.serio->phys, err);
+
+ err = ps2_sendbyte(&psmouse->ps2dev, PSMOUSE_CMD_ENABLE, NULL);
+
+ if (err)
+ psmouse_warn(psmouse, "Failed to reactivate mouse on %s: %d\n",
+ psmouse->ps2dev.serio->phys, err);
+ }
+
if (elantech_set_absolute_mode(psmouse)) {
psmouse_err(psmouse,
"failed to put touchpad back into absolute mode.\n");
--
2.45.0.rc0.197.gbae5840b3b-goog
^ permalink raw reply related
* Re: [PATCH v3 1/3] HID: i2c-hid: Rely on HID descriptor fetch to probe
From: Dmitry Torokhov @ 2024-05-01 19:09 UTC (permalink / raw)
To: Kenny Levinsen
Cc: Jiri Kosina, Dmitry Torokhov, Benjamin Tissoires,
Douglas Anderson, Hans de Goede, Maxime Ripard, Kai-Heng Feng,
Johan Hovold, linux-input, linux-kernel, Radoslaw Biernacki,
Lukasz Majczak
In-Reply-To: <26070c7a-4005-4bb4-b4af-779bfc415dea@kl.wtf>
On Wed, May 01, 2024 at 07:24:08AM +0200, Kenny Levinsen wrote:
> On 4/30/24 11:41 PM, Dmitry Torokhov wrote:
> > I actually believe there is. On Chromebooks we may source components
> > from several vendors and use them in our devices. The components
> > are electrically compatible with each other, have exactly the same
> > connector, and therefore interchangeable. Because of that at probe time
> > we do not quite know if the device is there at given address, or not
> > (i.e. the touchpad could be from a different vendor and listening on
> > another address) and we need to make a quick determination whether we
> > should continue with probe or not.
>
> Maybe I should clarify what I meant: All I2C operations start with the
> master writing the slave address to the bus. When a slave reads its own
> address off the bus, it pulls the data line low to ACK. If no device is
> present on the bus with the specified address, the line stays high which is
> a NACK. This means that on the bus level, we have a clear error condition
> specifically for no device with the specified address being present on the
> bus.
>
> Whether the operation used is a dummy read or our first actual write should
> not matter - if the address is not acknowledged, the device is not present
> (or able to talk I2C).
Is it possible for a device to be wedged so hard that it refuses to
acknowledge the address?
> The problem lies in whether this "no device present
> on bus" error is reported clearly to us: Some drivers use -ENXIO
> specifically for this, some use it also for NACKs on written data, some
> report it but use other return codes for it, etc.
>
> Even if we stick to the smbus probe in the long run, if we get to the point
> where we can rely on the error codes from I2C drivers we would be able to
> correctly log and propagate other error classes like bus errors or I2C
> driver issues which are all currently silenced as "nothing at address" by
> the smbus probe.
I think this depends on the answer to the question above. If there is
potential that the chip may stop responding, I still see benefit in
differentiating initial "soft touch" poke vs. hard errors once we
established that there is/was a device and it started misbehaving.
Thanks.
--
Dmitry
^ permalink raw reply
* Re: [PATCH v2] Input: try trimming too long modalias strings
From: Dmitry Torokhov @ 2024-05-01 19:11 UTC (permalink / raw)
To: Jason Andryuk
Cc: linux-input, Hans de Goede, Benjamin Tissoires, Peter Hutterer,
linux-kernel
In-Reply-To: <CAKf6xpsiLbZN=v2G052kuwPLNxmmbt4uoZAM21Zr+RtH0YD8kA@mail.gmail.com>
On Tue, Apr 30, 2024 at 06:25:13PM -0400, Jason Andryuk wrote:
> On Mon, Apr 29, 2024 at 9:04 PM Jason Andryuk <jandryuk@gmail.com> wrote:
> >
> > On Mon, Apr 29, 2024 at 5:50 PM Dmitry Torokhov
> > <dmitry.torokhov@gmail.com> wrote:
> > >
> > > If an input device declares too many capability bits then modalias
> > > string for such device may become too long and not fit into uevent
> > > buffer, resulting in failure of sending said uevent. This, in turn,
> > > may prevent userspace from recognizing existence of such devices.
> > >
> > > This is typically not a concern for real hardware devices as they have
> > > limited number of keys, but happen with synthetic devices such as
> > > ones created by xen-kbdfront driver, which creates devices as being
> > > capable of delivering all possible keys, since it doesn't know what
> > > keys the backend may produce.
> > >
> > > To deal with such devices input core will attempt to trim key data,
> > > in the hope that the rest of modalias string will fit in the given
> > > buffer. When trimming key data it will indicate that it is not
> > > complete by placing "+," sign, resulting in conversions like this:
> > >
> > > old: k71,72,73,74,78,7A,7B,7C,7D,8E,9E,A4,AD,E0,E1,E4,F8,174,
> > > new: k71,72,73,74,78,7A,7B,7C,+,
> > >
> > > This should allow existing udev rules continue to work with existing
> > > devices, and will also allow writing more complex rules that would
> > > recognize trimmed modalias and check input device characteristics by
> > > other means (for example by parsing KEY= data in uevent or parsing
> > > input device sysfs attributes).
> > >
> > > Note that the driver core may try adding more uevent environment
> > > variables once input core is done adding its own, so when forming
> > > modalias we can not use the entire available buffer, so we reduce
> > > it by somewhat an arbitrary amount (96 bytes).
> > >
> > > Reported-by: Jason Andryuk <jandryuk@gmail.com>
> > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> >
> > Tested-by: Jason Andryuk <jandryuk@gmail.com>
> >
> > I don't have the gdm setup available to test, but loginctl looks good
> > showing the Xen Virtual Keyboard assigned to a seat:
> > # loginctl seat-status seat0
> > seat0
> > Devices:
> > ├─/sys/devices/LNXSYSTM:00/LNXPWRBN:00/input/input0
> > │ input:input0 "Power Button"
> > ├─/sys/devices/LNXSYSTM:00/LNXSLPBN:00/input/input1
> > │ input:input1 "Sleep Button"
> > ├─/sys/devices/platform/i8042/serio0/input/input2
> > │ input:input2 "AT Translated Set 2 keyboard"
> > ├─/sys/devices/platform/i8042/serio1/input/input4
> > │ input:input4 "ImExPS/2 Generic Explorer Mouse"
> > ├─/sys/devices/virtual/input/input5
> > │ input:input5 "Xen Virtual Keyboard"
> > │ └─/sys/devices/virtual/input/input5/event4
> > │ input:event4
> > └─/sys/devices/virtual/input/input6
> > input:input6 "Xen Virtual Pointer"
>
> What do you think about Cc: stable@vger.kernel.org? I'd like to get
> the Xen Keyboard working as widely as possible, so I'd like it
> backported if possible.
I am open to it, but I'd like Benjamin/Hans to take a look at this
as well (I see Peter already gave his Reviewed-by).
Thanks.
--
Dmitry
^ permalink raw reply
* Re: [PATCH] Input: elantech - fix touchpad state on resume for Lenovo N24
From: Dmitry Torokhov @ 2024-05-01 19:20 UTC (permalink / raw)
To: Jonathan Denose
Cc: LKML, linux-input, Greg Kroah-Hartman, Jeffery Miller,
Phoenix Huang, Hans de Goede
In-Reply-To: <20240501140231.1.Ifa0e25ebf968d8f307f58d678036944141ab17e6@changeid>
On Wed, May 01, 2024 at 02:02:32PM +0000, Jonathan Denose wrote:
> The Lenovo N24 on resume becomes stuck in a state where it
> sends incorrect packets, causing elantech_packet_check_v4 to fail.
> The only way for the device to resume sending the correct packets is for
> it to be disabled and then re-enabled.
>
> This change adds a dmi check to trigger this behavior on resume.
> Signed-off-by: Jonathan Denose <jdenose@google.com>
Adding a couple more folks to take a look at this...
> ---
>
> drivers/input/mouse/elantech.c | 33 +++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 4e38229404b4b..e0f3095b4227e 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1476,6 +1476,23 @@ static void elantech_disconnect(struct psmouse *psmouse)
> psmouse->private = NULL;
> }
>
> +/*
> + * Some hw_version 4 models fail to properly activate absolute mode on
> + * resume without going through disable/enable cycle.
> + */
> +static const struct dmi_system_id elantech_needs_reenable[] = {
> +#if defined(CONFIG_DMI) && defined(CONFIG_X86)
> + {
> + /* Lenovo N24 */
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "81AF"),
> + },
> + },
> +#endif
> + { }
> +};
> +
> /*
> * Put the touchpad back into absolute mode when reconnecting
> */
> @@ -1486,6 +1503,22 @@ static int elantech_reconnect(struct psmouse *psmouse)
> if (elantech_detect(psmouse, 0))
> return -1;
>
> + if (dmi_check_system(elantech_needs_reenable)) {
> + int err;
> +
> + err = ps2_sendbyte(&psmouse->ps2dev, PSMOUSE_CMD_DISABLE, NULL);
> +
> + if (err)
> + psmouse_warn(psmouse, "Failed to deactivate mouse on %s: %d\n",
> + psmouse->ps2dev.serio->phys, err);
> +
> + err = ps2_sendbyte(&psmouse->ps2dev, PSMOUSE_CMD_ENABLE, NULL);
> +
> + if (err)
> + psmouse_warn(psmouse, "Failed to reactivate mouse on %s: %d\n",
> + psmouse->ps2dev.serio->phys, err);
> + }
> +
> if (elantech_set_absolute_mode(psmouse)) {
> psmouse_err(psmouse,
> "failed to put touchpad back into absolute mode.\n");
> --
> 2.45.0.rc0.197.gbae5840b3b-goog
>
--
Dmitry
^ permalink raw reply
* [dtor-input:next] BUILD SUCCESS 7b4e0b39182cf5e677c1fc092a3ec40e621c25b6
From: kernel test robot @ 2024-05-01 20:10 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next
branch HEAD: 7b4e0b39182cf5e677c1fc092a3ec40e621c25b6 Input: cyapa - add missing input core locking to suspend/resume functions
elapsed time: 1480m
configs tested: 81
configs skipped: 2
The following configs have been built successfully.
More configs may be tested in the coming days.
tested configs:
alpha allnoconfig gcc
alpha allyesconfig gcc
alpha defconfig gcc
arc allnoconfig gcc
arc defconfig gcc
arm allnoconfig clang
arm defconfig clang
arm64 allnoconfig gcc
arm64 defconfig gcc
csky allnoconfig gcc
csky defconfig gcc
hexagon allmodconfig clang
hexagon allnoconfig clang
hexagon allyesconfig clang
hexagon defconfig clang
i386 allmodconfig gcc
i386 allnoconfig gcc
i386 allyesconfig gcc
i386 buildonly-randconfig-001-20240501 clang
i386 buildonly-randconfig-002-20240501 gcc
i386 buildonly-randconfig-003-20240501 clang
i386 buildonly-randconfig-004-20240501 gcc
i386 buildonly-randconfig-005-20240501 gcc
i386 buildonly-randconfig-006-20240501 clang
i386 defconfig clang
i386 randconfig-001-20240501 gcc
i386 randconfig-002-20240501 clang
i386 randconfig-003-20240501 gcc
i386 randconfig-004-20240501 gcc
i386 randconfig-005-20240501 clang
i386 randconfig-006-20240501 clang
i386 randconfig-011-20240501 gcc
i386 randconfig-012-20240501 gcc
i386 randconfig-013-20240501 gcc
i386 randconfig-014-20240501 gcc
i386 randconfig-015-20240501 gcc
i386 randconfig-016-20240501 gcc
loongarch allmodconfig gcc
loongarch allnoconfig gcc
loongarch defconfig gcc
m68k allmodconfig gcc
m68k allnoconfig gcc
m68k allyesconfig gcc
m68k defconfig gcc
microblaze allmodconfig gcc
microblaze allnoconfig gcc
microblaze allyesconfig gcc
microblaze defconfig gcc
mips allnoconfig gcc
mips allyesconfig gcc
nios2 allmodconfig gcc
nios2 allnoconfig gcc
nios2 allyesconfig gcc
nios2 defconfig gcc
openrisc allnoconfig gcc
openrisc defconfig gcc
parisc allnoconfig gcc
parisc defconfig gcc
parisc64 defconfig gcc
powerpc allnoconfig gcc
riscv allnoconfig gcc
riscv defconfig clang
riscv rv32_defconfig clang
s390 allnoconfig clang
s390 defconfig clang
sh allnoconfig gcc
sh defconfig gcc
sparc allnoconfig gcc
sparc defconfig gcc
sparc64 defconfig gcc
um allmodconfig clang
um allnoconfig clang
um allyesconfig gcc
um defconfig clang
um i386_defconfig gcc
um x86_64_defconfig clang
x86_64 allnoconfig clang
x86_64 allyesconfig clang
x86_64 defconfig gcc
x86_64 rhel-8.3-rust clang
xtensa allnoconfig gcc
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply
* [PATCH v3 0/2] Input: add ft5426
From: Andreas Kemnade @ 2024-05-01 20:47 UTC (permalink / raw)
To: dmitry.torokhov, robh, krzk+dt, conor+dt, o.rempel, andreas,
u.kleine-koenig, hdegoede, oliver.graute, ye.xingchen,
p.puschmann, linux-input, devicetree, linux-kernel,
andy.shevchenko, felix
Changes in v3:
- reorder compatible also in driver
Changes in v2:
- reorder compatible
Andreas Kemnade (2):
dt-bindings: input: touchscreen: edt-ft5x06: Add ft5426
Input: edt-ft5x06 - add ft5426
.../devicetree/bindings/input/touchscreen/edt-ft5x06.yaml | 1 +
drivers/input/touchscreen/edt-ft5x06.c | 1 +
2 files changed, 2 insertions(+)
--
2.39.2
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox