From patchwork Wed Jun 7 21:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffery Miller X-Patchwork-Id: 690346 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 866F3C7EE25 for ; Wed, 7 Jun 2023 21:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229556AbjFGVm0 (ORCPT ); Wed, 7 Jun 2023 17:42:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbjFGVmY (ORCPT ); Wed, 7 Jun 2023 17:42:24 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 324FC1FEB for ; Wed, 7 Jun 2023 14:42:17 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bb0d11a56abso10945930276.2 for ; Wed, 07 Jun 2023 14:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686174136; x=1688766136; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=xLLWjQzhR5KtVfvlHwNOB5pnbBRQmuqU1z90zT2+9H8=; b=2eFLJucADSMMVc2guRyqQ0GyD5m8DkbMPfOGF1jdZ//AXmEjRJ463djgtXezxD+tIz 74O8h4MFI0uzXMC9vCPj0aiDngBE0yAJCNY9Rvr6qzvsqG/Nh1skGO+GysXFIX4XPnfF Ioh0izJW/oIwQs2wHAXEDVQaiGAuP8ANZb+tY1H0uqSaSSf+DMvTSNe/e+erwc6R2MwD c7fEEqKB8wfkjmvOWOzW5Po7qGE5n5Mez8JRw2q8zCVPaCYDLiQxoOIOtP/W+CynWK44 w2vGXpspIR5MQnZ4rQm7Aergg9QbgcCiY8PdjEqQXx2mAVKv5BPkjtfCoIbUcn0l+Ffa Yx+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686174136; x=1688766136; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xLLWjQzhR5KtVfvlHwNOB5pnbBRQmuqU1z90zT2+9H8=; b=S5cjlc7/AXT7niqM48X58fAkrkn5sl+hyzR86T7fQva+yoEtBwUG5/3UJTuWWjntLO 8uhx+d2mjMm4NbrzABQ4N1yOixDkQgXRrGNGorlT5u0vJqYuljjwGNh3f7us0cNrut0p grtzXLMzRDNuQbbpab2C44RBjBaBzwJ+UHOPJURpFp4KaOxjZ67aMRNhdIHnjFIjie07 hYwo61JELHUzUVOGeezJPc/mgHm1L0v2MSpK+rNqW7zSa7o+zn2xKqigKpnTlm5IjgwB hghqCSUz3FeWK3JfjFUWph0wOWflWnbFkCAx/A6+nBbxa/wcRzw74ojxFe2n/vgjhuXW JGuA== X-Gm-Message-State: AC+VfDz6Va4jLaSAmiC86BnEwmiyg617vTOMSHg9481H3ru9dNRBWQ3p XYan3J4CkrJZUMkJe74AyhehmfjEK1MWoVjIzbC7 X-Google-Smtp-Source: ACHHUZ5sdWItSYG+ej7HlCgTVMP9bESe2sKYIRai5787TQm4dTZdxWlyRIHa32AZGLWI3BKxFSvAuHYpQt6uQgMkljtt X-Received: from horchata.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:5b3]) (user=jefferymiller job=sendgmr) by 2002:a05:6902:100c:b0:bad:155a:1004 with SMTP id w12-20020a056902100c00b00bad155a1004mr4008262ybt.2.1686174136379; Wed, 07 Jun 2023 14:42:16 -0700 (PDT) Date: Wed, 7 Jun 2023 21:41:57 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230607214212.461815-1-jefferymiller@google.com> Subject: [PATCH v2] Input: synaptics-rmi4 - retry reading SMBus version on resume From: Jeffery Miller To: Dmitry Torokhov Cc: Jonathan Denose , loic.poulain@linaro.org, benjamin.tissoires@redhat.com, Andrew Duggan , Andrew Duggan , Lyude Paul , jdenose@google.com, Jeffery Miller , Benjamin Mugnier , Jonathan Cameron , Luca Ceresoli , " =?utf-8?q?Uwe_Kleine-K=C3=B6ni?= =?utf-8?q?g?= " , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On resume there can be a period of time after the preceding serio_resume -> psmouse_deactivate call where calls to rmi_smb_get_version fail with -ENXIO. The call path in rmi_smb_resume is rmi_smb_resume -> rmi_smb_reset -> rmi_smb_enable_smbus_mode -> rmi_smb_get_version where this failure would occur. Add a 30ms delay and retry in the ENXIO case to ensure the following rmi_driver_resume calls in rmi_smbus_resume can succeed. This behavior was seen on a Lenovo T440p machine that required a delay of approximately 7-12ms. The 30ms delay was chosen based on [1]. With this patch the trimmed resume logs look similar to: ``` psmouse serio1: PM: calling serio_resume+0x0/0x8c @ 5399, parent: i8042 [5399] libps2:__ps2_command:316: psmouse serio1: f5 [] - 0/00000000 [] psmouse serio1: PM: serio_resume+0x0/0x8c returned 0 after 3259 usecs ... rmi4_smbus 0-002c: PM: calling rmi_smb_resume ... @ 5454, parent: i2c-0 ... [5454] i2c_i801:i801_check_post:414: i801_smbus 0000:00:1f.3: No response smbus_result: i2c-0 a=02c f=0000 c=fd BYTE_DATA rd res=-6 rmi4_smbus 0-002c: failed to get SMBus version number! rmi4_smbus 0-002c: sleeping to retry getting the SMBus version number ... rmi4_smbus 0-002c: PM: rmi_smb_resume ... returned 0 after 41351 usecs ``` [1]: https://lore.kernel.org/all/BYAPR03MB47572F2C65E52ED673238D41B2439@BYAPR03MB4757.namprd03.prod.outlook.com/ Signed-off-by: Jeffery Miller --- Early boot dmesg include: ``` rmi4_smbus 0-002c: registering SMbus-connected sensor rmi4_f01 rmi4-00.fn01: found RMI device, manufacturer: Synaptics, product: TM2722-001, fw id: 0 ``` The resume order looks correct. The `psmouse serio1` resume returns before the rmi_smb_resume is called showing the patch from https://lore.kernel.org/all/89456fcd-a113-4c82-4b10-a9bcaefac68f@google.com/ is applied and working for that ordering. I attempted to try to rule out some interaction between the concurrent input resume calls for other i8042 devices. Adding a 7ms delay after psmouse_deactivate which is called in the preceding psmouse serio1 serio_resume function also allows this version call to succeed. If the rmi_smb_probe device_disable_async_suspend patch is applied it will also avoid this issue. However the time between the psmouse_deactivate call for serio_resume and rmi_smb_resume was over 60ms on my test machine. This would naturally be long enough to avoid this particular delay. Changes in v2: - Changed to a single retry of 30ms based on previous feedback. drivers/input/rmi4/rmi_smbus.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index 4bf0e1df6a4a..b6d90c92e8a2 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -45,13 +45,25 @@ static int rmi_smb_get_version(struct rmi_smb_xport *rmi_smb) int retval; /* Check if for SMBus new version device by reading version byte. */ - retval = i2c_smbus_read_byte_data(client, SMB_PROTOCOL_VERSION_ADDRESS); - if (retval < 0) { + for (int i = 0; i < 2; i++) { + if (i > 0) { + dev_warn(&client->dev, "sleeping to retry getting the SMBus version number\n"); + fsleep(30000); + } + retval = i2c_smbus_read_byte_data(client, + SMB_PROTOCOL_VERSION_ADDRESS); + if (retval >= 0) + return retval + 1; + dev_err(&client->dev, "failed to get SMBus version number!\n"); - return retval; + /* There can be a delay on resume where the read returns + * -ENXIO. Retry to allow additional time for the read + * to become responsive. + */ + if (retval != -ENXIO) + break; } - - return retval + 1; + return retval; } /* SMB block write - wrapper over ic2_smb_write_block */