From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A32F0193457; Tue, 9 Jul 2024 16:26:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542374; cv=none; b=tGDjjbuR1FZ0pa4N0VDooxSw/IaqJbOCy45J/S1h25RKXiGId4Jq4n6ltUsN2oWxiIxW/meGSMuIiUQU69qB1vtpZ0hILJQTjsSLxey56zfcTsBgBanu959iZsf+3DffS3HSPi7pm9fiQA7lbw/18ZAK+Jnjgl8WxrIh128Uge4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542374; c=relaxed/simple; bh=j/xpxN9ieLiUkBfCvAyU5ZQEvyka3gQP1DJZ+4maHP4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=c9JkjfvhQCo8VsVKzJd+/bu1nf+c9vu81bfej6jRtDGT4d2DIy9+jtUCOy1l972GwjfoOwAHATqYfIQjCo88DIgM21p4TeXHqF8S5w+cce8uA7HhU4jSWnSGZ+tVxSo1gMGKJAHxRmVzDkpH+JhXkzQSuUS8NsNl8z+cAxnflAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YZrAZ8IL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YZrAZ8IL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CF12C32786; Tue, 9 Jul 2024 16:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542374; bh=j/xpxN9ieLiUkBfCvAyU5ZQEvyka3gQP1DJZ+4maHP4=; h=From:To:Cc:Subject:Date:From; b=YZrAZ8ILPYyw01koigP6vD7f+sAFPIjEVp6ClhvAWHrdIyBk1Ib3Q3IgNYO3ou0s5 WQnWFfdRIZpIBgcHr4tZsL+uzMc1zmBHS5oNl2KSYEv567o1GjAsRGXAZAu6MvUWl1 4R6u+98I0+8hIj9Rb58FkL0TY7Ft1kHOVpTaL9UydvK8T1ydq/LVLbunSXZJP0qeWl kgn2UDe/t2kNH50PNqMxz6J18Kg8CcDYeBPEbH/6ivYBQtf6aOcNRQMCeVM547+JZR WaZgJhcmx7+s3gNiLqkuRVlkJHXnU7jhTFCdDFJzRm3ngCy9CQGJGZW5f3/NeC1yKS 6ghLwkYoWxucA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jonathan Denose , Dmitry Torokhov , Sasha Levin , jefferymiller@google.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 01/14] Input: elantech - fix touchpad state on resume for Lenovo N24 Date: Tue, 9 Jul 2024 12:25:45 -0400 Message-ID: <20240709162612.32988-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.221 Content-Transfer-Encoding: 8bit From: Jonathan Denose [ Upstream commit a69ce592cbe0417664bc5a075205aa75c2ec1273 ] 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 Link: https://lore.kernel.org/r/20240503155020.v2.1.Ifa0e25ebf968d8f307f58d678036944141ab17e6@changeid Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/mouse/elantech.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 400281feb4e8d..8246662fa60b7 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1476,16 +1476,47 @@ 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 */ static int elantech_reconnect(struct psmouse *psmouse) { + int err; + psmouse_reset(psmouse); if (elantech_detect(psmouse, 0)) return -1; + if (dmi_check_system(elantech_needs_reenable)) { + err = ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE); + if (err) + psmouse_warn(psmouse, "failed to deactivate mouse on %s: %d\n", + psmouse->ps2dev.serio->phys, err); + + err = ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE); + 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.43.0