Commit 551cf601 authored Nov 03, 2022 by Hans de Goede Committed by sanglipeng Jul 25, 2023

Input: goodix - try resetting the controller when no config is set

stable inclusion
from stable-v5.10.157
commit c1620e996d0a4ed7a3001cca755cff013944850d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MU59

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c1620e996d0a4ed7a3001cca755cff013944850d



--------------------------------

[ Upstream commit c7e37cc6 ]

On ACPI systems (irq_pin_access_method == IRQ_PIN_ACCESS_ACPI_*) the driver
does not reset the controller at probe time, because sometimes the system
firmware loads a config and resetting might loose this config.

On the Nanote UMPC-01 device OTOH the config is in flash of the controller,
the controller needs a reset to load this; and the system firmware does not
reset the controller on a cold boot.

To fix the Nanote UMPC-01 touchscreen not working on a cold boot, try
resetting the controller and then re-reading the config when encountering
a config with 0 width/height/max_touch_num value and the controller has
not already been reset by goodix_ts_probe().

This should be safe to do in general because normally we should never
encounter a config with 0 width/height/max_touch_num. Doing this in
general not only avoids the need for a DMI quirk, but also might help
other systems.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Bastien Nocera <hadess@hadess.net>
Link: https://lore.kernel.org/r/20221025122930.421377-2-hdegoede@redhat.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 8fb051f0

drivers/input/touchscreen/goodix.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -1059,6 +1059,7 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
		input_set_abs_params(ts->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
		input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);

		retry_read_config:
		/* Read configuration and apply touchscreen parameters */
		goodix_read_config(ts);

		@@ -1066,6 +1067,16 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
		touchscreen_parse_properties(ts->input_dev, true, &ts->prop);

		if (!ts->prop.max_x \|\| !ts->prop.max_y \|\| !ts->max_touch_num) {
		if (!ts->reset_controller_at_probe &&
		ts->irq_pin_access_method != IRQ_PIN_ACCESS_NONE) {
		dev_info(&ts->client->dev, "Config not set, resetting controller\n");
		/* Retry after a controller reset */
		ts->reset_controller_at_probe = true;
		error = goodix_reset(ts);
		if (error)
		return error;
		goto retry_read_config;
		}
		dev_err(&ts->client->dev,
		"Invalid config (%d, %d, %d), using defaults\n",
		ts->prop.max_x, ts->prop.max_y, ts->max_touch_num);