From patchwork Thu Aug 18 09:24:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 9287119 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D732E60574 for ; Thu, 18 Aug 2016 09:32:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C81C128AE2 for ; Thu, 18 Aug 2016 09:32:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCEF128FF0; Thu, 18 Aug 2016 09:32:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 684F128B28 for ; Thu, 18 Aug 2016 09:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753457AbcHRJcy (ORCPT ); Thu, 18 Aug 2016 05:32:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38182 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965AbcHRJcx (ORCPT ); Thu, 18 Aug 2016 05:32:53 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F36B830; Thu, 18 Aug 2016 09:25:20 +0000 (UTC) Received: from plouf.banquise.eu.com (ovpn-116-62.ams2.redhat.com [10.36.116.62]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7I9OpXS026888; Thu, 18 Aug 2016 05:25:18 -0400 From: Benjamin Tissoires To: Dmitry Torokhov , Lyude Paul , Andrew Duggan , Christopher Heiny , Dennis Wassenberg Cc: Peter Hutterer , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH 11/11] Input: synaptics-rmi4 - smbus: on resume, try 3 times if init fails Date: Thu, 18 Aug 2016 11:24:49 +0200 Message-Id: <1471512289-10648-12-git-send-email-benjamin.tissoires@redhat.com> In-Reply-To: <1471512289-10648-1-git-send-email-benjamin.tissoires@redhat.com> References: <1471512289-10648-1-git-send-email-benjamin.tissoires@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 18 Aug 2016 09:25:20 +0000 (UTC) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In some rare cases, we can't retrieve the SMBus version and so we fail binding the touchpad back. Instead of leaving a touchpad dead, try again to reinitialize it. Signed-off-by: Benjamin Tissoires --- drivers/input/rmi4/rmi_smbus.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index 023dbd5..a8e4af6 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -265,10 +265,29 @@ static int rmi_smb_reset(struct rmi_transport_dev *xport, u16 reset_addr) { struct rmi_smb_xport *rmi_smb = container_of(xport, struct rmi_smb_xport, xport); + struct i2c_client *client = rmi_smb->client; + struct rmi_device_platform_data *pdata; + int tries, ret; rmi_smb_clear_state(rmi_smb); - return rmi_smb_enable_smbus_mode(rmi_smb); + for (tries = 3; tries > 0; tries--) { + ret = rmi_smb_enable_smbus_mode(rmi_smb); + if (!ret) + break; + + /* we failed enabling SMBus, try again later */ + msleep(500); + } + + if (ret < 0) { + dev_warn(&client->dev, + "failed to enable SMBus mode, giving up.\n"); + pdata = dev_get_platdata(&rmi_smb->client->dev); + rmi_transport_enable(pdata, false); + } + + return ret; } static const struct rmi_transport_ops rmi_smb_ops = {