From patchwork Wed May 10 19:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffery Miller X-Patchwork-Id: 681044 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 16ACEC77B7D for ; Wed, 10 May 2023 19:27:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235979AbjEJT1g (ORCPT ); Wed, 10 May 2023 15:27:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjEJT1f (ORCPT ); Wed, 10 May 2023 15:27:35 -0400 Received: from mail-io1-xd49.google.com (mail-io1-xd49.google.com [IPv6:2607:f8b0:4864:20::d49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19EED65AA for ; Wed, 10 May 2023 12:27:34 -0700 (PDT) Received: by mail-io1-xd49.google.com with SMTP id ca18e2360f4ac-76984376366so1116720239f.3 for ; Wed, 10 May 2023 12:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683746853; x=1686338853; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=+inPJYpepp+ACSZW6BIAIkEOqyig746NS3gZIOmFwLQ=; b=zAfktYe/8hlDQRg91R5fUACj36UXWDHKU/UIuEYzUEIk9dDY8wfLWMXG5vSC6exkMH 0+QVCoHESA6ZzzB+eh1uqdT6Xv9b4Gp5yrJVf7LB7ZcfMVLw0WDt3F5kPoIi7YKe6Uv/ bo/qeYoqkBFePfOglnJ3I7Az3aq4uWI+H0rO9eKhwHJqAuWD4MlnqsCWgckrUktuYFyb 0KftK9Qj5XguVZ5y2eWS9t2mJkTFIIWn9v2ZKRrcfwOye7NSIqemsoamkbBI2o6gCSqk ZWUMl8h18R+q53P56RwclMicEaDlYdEdxxtq0qDVedDGTMy9aFbGJ0OQf/A/ei+tsJ2d 3nrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683746853; x=1686338853; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+inPJYpepp+ACSZW6BIAIkEOqyig746NS3gZIOmFwLQ=; b=LopEisdkMRnXNQ4h+8NccSq5sLyOYXuScAi1IHgcnrJEXzGUPLb1XsJks/XAE9Pj+0 QKJAbazsBWXq/pmRUWzBAoFkH5ZJGXVKIcqIKayvtnCNMEBzdz98HG64me6QkmhREQ/L WZxz7x/A4y/QpQ+6hMyN3XT5+jo8U3dF0xeKJFpy4Gf+DqU8pcCbdbEvqx3VKc15IlGz 6wHMxzsaL52HtC09oFQSXGQyPB3O0J0gaXXu8fUX+dVzlxzoOyzI/Ax8LJAEa58dtjwQ TXLNbJZQnZ4aXEQQb6FZH50Fd3VBp5xm6DfwEVuvJkLRZlyw2nQJLwUSWWw4UH0fRE9v bl5A== X-Gm-Message-State: AC+VfDzpBKrXIKzaiQJHiKv13Zr9/ezaBGY9xLpBPTYnJaVwZlLua22B bzFZ+FXWj8pYxL5rhZa5xY3x8is9iNLhQjLKISA4 X-Google-Smtp-Source: ACHHUZ5fUmC0jL3VmaEhyRVfEVXyS7Zoj1O33yPSXCgoxzEUOxS+A7eDVyegeF8lL3pumdyUt/HOlmRpfNJJtuhYhwB/ X-Received: from horchata.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:5b3]) (user=jefferymiller job=sendgmr) by 2002:a5e:dd05:0:b0:760:efd4:9582 with SMTP id t5-20020a5edd05000000b00760efd49582mr8964611iop.2.1683746853439; Wed, 10 May 2023 12:27:33 -0700 (PDT) Date: Wed, 10 May 2023 19:27:22 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230510192731.300786-1-jefferymiller@google.com> Subject: [PATCH] Input: synaptics-rmi4 - retry reading SMBus version on resume From: Jeffery Miller To: Dmitry Torokhov Cc: Andrew Duggan , Jonathan Denose , jdenose@google.com, Lyude Paul , loic.poulain@linaro.org, benjamin.tissoires@redhat.com, Andrew Duggan , Jeffery Miller , Jonathan Cameron , Maximilian Luz , Miguel Ojeda , " =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= " , 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. Adding a retry loop ensures that after rmi_smb_reset returns 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 retry limit of 5 is chosen to be larger than this observed delay. 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 21351 usecs ``` 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. drivers/input/rmi4/rmi_smbus.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index 4bf0e1df6a4a..386e80ae141b 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -43,15 +43,26 @@ static int rmi_smb_get_version(struct rmi_smb_xport *rmi_smb) { struct i2c_client *client = rmi_smb->client; int retval; + int tries = 0; /* 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) { - dev_err(&client->dev, "failed to get SMBus version number!\n"); - return retval; - } + do { + if (tries > 0) { + dev_warn(&client->dev, "sleeping to retry getting the SMBus version number\n"); + fsleep(5000); + } + retval = i2c_smbus_read_byte_data(client, + SMB_PROTOCOL_VERSION_ADDRESS); + if (retval >= 0) + return retval + 1; - return retval + 1; + dev_err(&client->dev, "failed to get SMBus version number!\n"); + /* On resume the read of the version can + * momentarily return -ENXIO. + * Retry to allow additional time for it to succeed. + */ + } while (retval == -ENXIO && tries++ < 5); + return retval; } /* SMB block write - wrapper over ic2_smb_write_block */