From patchwork Wed Nov 6 07:01:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11229461 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 863D015AB for ; Wed, 6 Nov 2019 07:04:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63B2C21848 for ; Wed, 6 Nov 2019 07:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731264AbfKFHEX (ORCPT ); Wed, 6 Nov 2019 02:04:23 -0500 Received: from esa4.mentor.iphmx.com ([68.232.137.252]:36391 "EHLO esa4.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731263AbfKFHEW (ORCPT ); Wed, 6 Nov 2019 02:04:22 -0500 IronPort-SDR: VfXbary+X/qdUkQ1jP+ZsppThztI+JXeXsprcUxGRttJFPEGIU5rFC/n7OV2KKP5LnqVy+WtfF qKGKlYB8i6EVz99gOuBXltTGBYyHC3jkRrJ6UMBXX9qhA2rzID/sWVKqM/hRiSlkuAFnTsyKJz La8JOzj7xMfO0HxXgHRS/XZmuqt02vd+r+CpHFFsocFZUKtclVk6a1vnU4xqYz4P2dSW9KRke2 8wkjgZe20jQkHz28yd910uCIqLvjOKo3ijiv1Tc70Dy2+/ZZIl4rrcRZR6BKVFGM6McX/smD+/ H5M= X-IronPort-AV: E=Sophos;i="5.68,272,1569312000"; d="scan'208";a="42943693" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 05 Nov 2019 23:04:21 -0800 IronPort-SDR: pTP5fAq+wfMHW3qUSCJ2S5ezIORPk87M0J1YSsj/AcE7dwewg2rd9jxXJgQAfulQpM+5d8e+7J /LK1jWWDETjRTWNg97pGgOndNTRELcOyhv15eD8/yCfyBNPACftMODLhYY+rgm0lobkrCvToe2 9O8GmVLvvWIQUxyagNcs7MUBHdtQ4CTunq1nrpSawzoPIC5E47J4Jt3HNKa5A5GBy+KX5KEJn0 RL6g1+MM50e5hAnj7VjzpKtkk8F4zGbtbBdTIap4jZR+weGuETI1tqKWpHh74ma+V2u6UfixWI 8vE= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v5 39/48] Input: Atmel: improve error handling in mxt_initialize() Date: Wed, 6 Nov 2019 16:01:37 +0900 Message-ID: <20191106070146.18759-40-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191106070146.18759-1-jiada_wang@mentor.com> References: <20191106070146.18759-1-jiada_wang@mentor.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Deepak Das Currently mxt_initialize() tries to probe bootloader mode even if valid bootloader address is not specified. This commit modifies mxt_initialize() to return error if Device is not in appmode and bootloader address is not specified. This commit also returns error code from mxt_send_bootloader_cmd() in mxt_initialize(). Signed-off-by: Deepak Das Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 58 +++++++++++++++++------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 1ebdca1ed815..110c966e7f3a 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -716,17 +716,13 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry) return 0; } -static int mxt_probe_bootloader(struct mxt_data *data, bool alt_address) +static int mxt_probe_bootloader(struct mxt_data *data) { struct device *dev = &data->client->dev; int error; u8 buf[3]; bool crc_failure, extended_id; - error = mxt_lookup_bootloader_address(data, alt_address); - if (error) - return error; - /* Check bootloader status and version information */ error = mxt_bootloader_read(data, buf, sizeof(buf)); if (error) @@ -2923,6 +2919,32 @@ static void mxt_config_cb(const struct firmware *cfg, void *ctx) release_firmware(cfg); } +static int mxt_bootloader_status(struct mxt_data *data) +{ + struct i2c_client *client = data->client; + int error; + + error = mxt_lookup_bootloader_address(data, false); + if (error) { + dev_info(&client->dev, + "Bootloader address is not specified\n"); + return error; + } + /* Check bootloader state */ + error = mxt_probe_bootloader(data); + if (error) { + dev_info(&client->dev, "Trying alternate bootloader address\n"); + mxt_lookup_bootloader_address(data, true); + error = mxt_probe_bootloader(data); + if (error) { + dev_err(&client->dev, + "Chip is not in appmode or bootloader mode\n"); + return error; + } + } + return 0; +} + static int mxt_initialize(struct mxt_data *data) { struct i2c_client *client = data->client; @@ -2934,16 +2956,13 @@ static int mxt_initialize(struct mxt_data *data) if (!error) break; - /* Check bootloader state */ - error = mxt_probe_bootloader(data, false); - if (error) { - dev_info(&client->dev, "Trying alternate bootloader address\n"); - error = mxt_probe_bootloader(data, true); - if (error) { - /* Chip is not in appmode or bootloader mode */ - return error; - } - } + dev_info(&client->dev, + "info block read failed (%d), so try bootloader method\n", + error); + + error = mxt_bootloader_status(data); + if (error) + return error; /* OK, we are in bootloader, see if we can recover */ if (++recovery_attempts > 1) { @@ -2957,7 +2976,9 @@ static int mxt_initialize(struct mxt_data *data) } /* Attempt to exit bootloader into app mode */ - mxt_send_bootloader_cmd(data, false); + error = mxt_send_bootloader_cmd(data, false); + if (error) + return error; msleep(MXT_FW_RESET_TIME); } @@ -3649,8 +3670,11 @@ static int mxt_enter_bootloader(struct mxt_data *data) msleep(MXT_RESET_TIME); + ret = mxt_lookup_bootloader_address(data, false); + if (ret) + return ret; /* Do not need to scan since we know family ID */ - ret = mxt_probe_bootloader(data, 0); + ret = mxt_probe_bootloader(data); if (ret) return ret;