From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl2-f15.google.com (mail-dl2-f15.google.com [74.125.229.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0291E3B19DE for ; Fri, 25 Sep 2026 22:18:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.229.143 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790374699; cv=none; b=BgJqFMllZAmaTAbHGySi+tT4k/NzZFXdi84tofZgigCdZL9eSzketNf1EsDQWHWgl6EhvxJ8ImDItH9DE17vpXVb1eDsAbjUMokrlSfJscp9lezyIkawGZYkNoqX6xNr8IODUwOyc98XkHCaaph+wCkyDhB0fIRU161eEqaHL1s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790374699; c=relaxed/simple; bh=lUyCqvIhkx+oa2eX2J77bBkV43sFd/DsKxrwXJcJW70=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=IgczYO23Yu09FzpV2bydc7BdKfwuKfCITltU+K6xPSebYqqntC7GhDyDYUpU07iRM+KGna4hgPmTxGG3S/nkmDaZl+++IoWbI0lefvny+NwhH6BXMZSB3fHjjXkX56UTCSYPyHnCg1b/Impq7xWWPKWlO8eznZgTEXjkGl41How= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jqK0M+3r; arc=none smtp.client-ip=74.125.229.143 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jqK0M+3r" Received: by mail-dl2-f15.google.com with SMTP id a92af1059eb24-144f9160b81so499992c88.0 for ; Fri, 25 Sep 2026 15:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790374695; x=1790979495; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ayLp4Jx22xan0yoaXXO0H5UJI37HFonSA4zUCdy+nIo=; b=jqK0M+3rOKmnvbUCAihw+0CnJmxPVScYGgTauAfdDzHWgiMVfW72Ga9i6+HDuThXuU 4U6sFRkMObqrl/wYTTFVVwBGXcDlP4Ionpv3mxDVzBZBrL3CGEyawwTfbl7qsr/kkPi2 V8rM7wMyJh7B7UEj4XvR38+CmkaSV8rSb8X43A5qDDJ2ZJZdbBL/zaQj6JzmbxjaM8Q6 tyVfcVJuBqXBVv4lf27RqQgS7vb+erG9qGWfQrDnAkKb9SWQi1pyVkq7wCG/UZw82zsi gbTP+KsDDWiW4JtEnBiVkF60eSmsEizKkfT7x4EWNyrknbhgaiyDF5/6Vv62aTTPX2xp BrcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790374695; x=1790979495; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ayLp4Jx22xan0yoaXXO0H5UJI37HFonSA4zUCdy+nIo=; b=dlnaZoElzh8acdyv/22ZrMXB54BTH6zQy09O+E4nXXah/w83/inVs2KGTuSjVmooYu Mj0PFSGGDODcvblL3ZSWRyvTQ6LmyZdydDtTOlT89U8qD1tI8X1K6TUDqpE5b927cRPW uQrPhEI3OsPNk6B5SQgdTWEB7dAPYqZ+KKZifH4po2GqfVdqjnz6uV4p4DHHuSw85UCJ C7JenjAJ9OXBHzNg8BwnVlYWIgFDqYY7ob6U1CkC/3/hghWEMDgYgDpO6+6A+SGkE6jB 4NgkxDuRZq1mPTF/AEYxKyc22wwrONLlgoI0tZQicNiFo0jZacjcMWhhC4wwh84HQMlP 5pFg== X-Forwarded-Encrypted: i=1; AKwUvBx7AZCwaaIBHMkwsEpbUm5rSr7NrLkNwhGw2BjIfnhheyHDY3k+kQDYjqFSuW6i6rejJg9L+hKneRhoD7EG@vger.kernel.org X-Gm-Message-State: AFuF++nqU1a0KtyJFPRQSly+z2/Df/xKXRiDEgCg/91Baza24eTJWpGm rSrfoFqjv6/kOrQms+5sKR0x/b8mSQ8CiSLua8DUkD6GfM8KRW3zfLrP X-Gm-Gg: AYBFou3G7goWdxkEqk1VjRGvjA0t1VETTJEO5mfd5cPvQ7mMDWmY1Itou0GEwYhiudv A14VgMgasZ0KI7jLnW2cHo2HahHldgcC6cUxhhJxssctyZhpJ75i4DIUqH02Knlo1wOKoJD/lRO fq8N5hfFEHfBtNklYAVSb6kBshk6zfyWSqL4tHBYkSGK0wmP0nvvptoKljCb5vefeBcD5DugisU fygtnKUHF4U76g/3UqqdncgjzxCamKVI7N8wc6KdlYGoKCf5WXHp8U8N9+FwqzzrCe3dKLcwXWT df4xqQL55yfy74Eq2QRMG0p162db65Dk1A6d8/e+l35IEm2ag2Xb39rlex/YawhJToKqAL4FrV7 Hm0E3DQmbQwVPZa+akIqVmXetZXFOVcq3SGfrl/FJ9tgX06qwZEfYVAlaJqmfwFIG2rWQJB7EKI Db7zIurPTWGRpAaIsyN4P8C8/pWfBQzDN24SJ2QBTHhXEzefW0ULCjTkxCTIh8XyOqbrLPdUC5f n/KqPMhvvBqSfw5JKaXwFUMDg9IGaKAEUgOkVg= X-Received: by 2002:a05:7022:288:b0:138:3613:dc6 with SMTP id a92af1059eb24-146ce67ee45mr1270576c88.14.1790374694857; Fri, 25 Sep 2026 15:18:14 -0700 (PDT) Received: from google.com ([2a00:79e0:2ebe:8:375:19cf:5fee:be32]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-145aa0cb6b9sm7166213c88.1.2026.09.25.15.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 15:18:14 -0700 (PDT) Date: Fri, 25 Sep 2026 15:18:10 -0700 From: Dmitry Torokhov To: david@ixit.cz Cc: Maxime Coquelin , Alexandre Torgue , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bjorn Andersson , Konrad Dybcio , Petr Hodina , linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v8 1/5] Input: stmfts - wait for controller ready after reset Message-ID: References: <20260925-stmfts5-v8-0-0fcf49e2c85f@ixit.cz> <20260925-stmfts5-v8-1-0fcf49e2c85f@ixit.cz> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260925-stmfts5-v8-1-0fcf49e2c85f@ixit.cz> On Fri, Sep 25, 2026 at 11:22:19PM +0200, David Heidelberg via B4 Relay wrote: > From: David Heidelberg > > After releasing the reset line stmfts_reset() sleeps a fixed 50 ms and > stmfts_power_on() another 50 ms before the first I2C access. That is > enough for a warm reset, but when both supplies were really cut during > system suspend the controller boots from cold and can need longer. If > it does, the first read fails, stmfts_resume() returns an error and the > touchscreen is left powered off with its interrupt disabled. > > The controller posts a controller ready event once it has booted, and > the event parser already completes cmd_done on it. Enable the interrupt > right after releasing reset and wait for that event instead of sleeping, > giving the controller 300 ms, the total budget the vendor driver allows. > Boards without a reset line keep the old timing. > > Usually phones such as Pixel 4a and Xiaomi Mi 8 needs longer delay, so > without this change touchscreen stops working. > > Fixes: 8a1f9de80e45 ("Input: stmfts - add optional reset GPIO support") > Cc: stable@vger.kernel.org > Co-developed-by: Dmitry Torokhov > Signed-off-by: David Heidelberg > --- > drivers/input/touchscreen/stmfts.c | 60 ++++++++++++++++++++++++-------------- > 1 file changed, 38 insertions(+), 22 deletions(-) > > diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c > index 972687797f826..1720202d6186b 100644 > --- a/drivers/input/touchscreen/stmfts.c > +++ b/drivers/input/touchscreen/stmfts.c > @@ -59,16 +59,18 @@ > #define STMFTS_MASK_X_MSB 0x0f > #define STMFTS_MASK_Y_LSB 0xf0 > > /* key related event masks */ > #define STMFTS_MASK_KEY_NO_TOUCH 0x00 > #define STMFTS_MASK_KEY_MENU 0x01 > #define STMFTS_MASK_KEY_BACK 0x02 > > +#define STMFTS_RESET_TIMEOUT_MS 300 > + > #define STMFTS_EVENT_SIZE 8 > #define STMFTS_STACK_DEPTH 32 > #define STMFTS_DATA_MAX_SIZE (STMFTS_EVENT_SIZE * STMFTS_STACK_DEPTH) > #define STMFTS_MAX_FINGERS 10 > #define STMFTS_DEV_NAME "stmfts" > > static const struct regulator_bulk_data stmfts_supplies[] = { > { .supply = "vdd" }, > @@ -538,25 +540,16 @@ static int stmfts_read_system_info(struct stmfts_data *sdata) > sdata->chip_ver = reg[0]; > sdata->fw_ver = be16_to_cpup((__be16 *)®[2]); > sdata->config_id = reg[4]; > sdata->config_ver = reg[5]; > > return 0; > } > > -static void stmfts_reset(struct stmfts_data *sdata) > -{ > - gpiod_set_value_cansleep(sdata->reset_gpio, 1); > - msleep(20); > - > - gpiod_set_value_cansleep(sdata->reset_gpio, 0); > - msleep(50); > -} > - > static int stmfts_configure(struct stmfts_data *sdata) > { > int err; > > err = stmfts_command(sdata, STMFTS_SYSTEM_RESET); > if (err) > return err; > > @@ -582,53 +575,76 @@ static int stmfts_configure(struct stmfts_data *sdata) > > return 0; > } > > static int stmfts_power_on(struct stmfts_data *sdata) > { > int err; > > + if (sdata->reset_gpio) { > + gpiod_set_value_cansleep(sdata->reset_gpio, 1); > + /* a short delay before powering up */ > + usleep_range(1000, 1500); > + } > + > err = regulator_bulk_enable(ARRAY_SIZE(stmfts_supplies), > sdata->supplies); > if (err) > return err; > > - /* > - * The datasheet does not specify the power on time, but considering > - * that the reset time is < 10ms, I sleep 20ms to be sure > - */ > - msleep(20); > + if (sdata->reset_gpio) { > + reinit_completion(&sdata->cmd_done); > > - if (sdata->reset_gpio) > - stmfts_reset(sdata); > + /* > + * The datasheet does not specify the power on time, but > + * considering that the reset time is < 10ms, sleep for 20ms > + * to be sure before releasing reset line. > + */ > + msleep(20); > + gpiod_set_value_cansleep(sdata->reset_gpio, 0); > > - err = stmfts_read_system_info(sdata); > - if (err) > - goto err_disable_regulators; > + enable_irq(sdata->client->irq); > > - enable_irq(sdata->client->irq); > + if (!wait_for_completion_timeout(&sdata->cmd_done, > + msecs_to_jiffies(STMFTS_RESET_TIMEOUT_MS))) { > + dev_err(&sdata->client->dev, "controller not ready after reset"); > + err = -ETIMEDOUT; > + goto err_disable_irq; > + } > + } else { > + /* > + * We do not know the real controller state (was it powered > + * off or reset). Let's hope that this is enough time to > + * initialize. > + */ > + msleep(70); > + > + enable_irq(sdata->client->irq); Sashiko gave me an idea. What if we do this: diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c index 1720202d6186..e147a27f57b3 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -578,6 +578,7 @@ static int stmfts_configure(struct stmfts_data *sdata) static int stmfts_power_on(struct stmfts_data *sdata) { + unsigned int timeout; int err; if (sdata->reset_gpio) { @@ -591,9 +592,9 @@ static int stmfts_power_on(struct stmfts_data *sdata) if (err) return err; - if (sdata->reset_gpio) { - reinit_completion(&sdata->cmd_done); + reinit_completion(&sdata->cmd_done); + if (sdata->reset_gpio) { /* * The datasheet does not specify the power on time, but * considering that the reset time is < 10ms, sleep for 20ms @@ -602,23 +603,29 @@ static int stmfts_power_on(struct stmfts_data *sdata) msleep(20); gpiod_set_value_cansleep(sdata->reset_gpio, 0); - enable_irq(sdata->client->irq); - - if (!wait_for_completion_timeout(&sdata->cmd_done, - msecs_to_jiffies(STMFTS_RESET_TIMEOUT_MS))) { - dev_err(&sdata->client->dev, "controller not ready after reset"); - err = -ETIMEDOUT; - goto err_disable_irq; - } + timeout = STMFTS_RESET_TIMEOUT_MS; } else { /* * We do not know the real controller state (was it powered * off or reset). Let's hope that this is enough time to * initialize. */ - msleep(70); + timeout = 70; + } - enable_irq(sdata->client->irq); + enable_irq(sdata->client->irq); + + if (!wait_for_completion_timeout(&sdata->cmd_done, + msecs_to_jiffies(timeout))) { + if (sdata->reset_gpio) { + dev_err(&sdata->client->dev, "controller not ready after reset"); + err = -ETIMEDOUT; + goto err_disable_irq; + } + /* + * If we did not reset the countroller ourselves continue + * even if we did not receive "ready" message. + */ } err = stmfts_read_system_info(sdata); No need to resend the series unless there is more feedback on the bindings. Thanks. -- Dmitry