From patchwork Fri Nov 22 08:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11257399 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 752A514C0 for ; Fri, 22 Nov 2019 08:25:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F7532071C for ; Fri, 22 Nov 2019 08:25:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727418AbfKVIZU (ORCPT ); Fri, 22 Nov 2019 03:25:20 -0500 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:52499 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727415AbfKVIZU (ORCPT ); Fri, 22 Nov 2019 03:25:20 -0500 IronPort-SDR: AE4rsWmIvCjm3c8QrExfcc7G0lgPnPKxgVGrYRPrtxkQlUr9/pev5I4p1l/2hy8LuknpeCT8ds LNlMxLHTdelvhbDWt6gu0uNTu9bc2PsFp5ULosoMx+zclEFWVL+jzEbV/WaDYNk8F0EcsYX44r MW/BbDwN33AAcZNx1//I/NUrSXqE7jyW02dUBCA2wgjGpZKbuCJ7HsWR/lL6vTmkxJrvt4iI+x dNgDQFMjJFGVzfVMHQa/xLTzHMEO43TqbAR9DhpPM0BoBTvXxp+0312jV45S+WKlqGfO9R/wJp RLU= X-IronPort-AV: E=Sophos;i="5.69,229,1571731200"; d="scan'208";a="43358922" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 22 Nov 2019 00:25:19 -0800 IronPort-SDR: SoHED8XtekJl5VOTOSyaV+oV7992iFOM8QdaHBWijnwM6H6IpcbltXEJagGeqNcTKTXN4vz6Ik 65iMt3HsiCt6AyXzpTRnUHUKL+4HLTUmsFq7xNef4Uf80n2gMIOlnc1JrdS2wCFTgeKA/XYLKd 3Gbq8zrEVBoCUomBEefefVADm4tduUyjFM+C0toYrThT8d5GKSljdmlgLSHK9lzQ6WnI1JWhQy yzMMHu5od5gjFN663o6C2xJA1tRhAi6hpwxV3q+Enq/E484us7pwthKIqzoQn9ZhNbeB4Tw1gB Rno= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v6 20/48] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Date: Fri, 22 Nov 2019 17:23:34 +0900 Message-ID: <20191122082402.18173-21-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191122082402.18173-1-jiada_wang@mentor.com> References: <20191122082402.18173-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: Nick Dyer Signed-off-by: Nick Dyer (cherry picked from ndyer/linux/for-upstream commit bedd706a32522b946467e15f4f4f24de86a1b4d7) [gdavis: Resolve forward port conflicts due to applying upstream commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform data support").] Signed-off-by: George G. Davis [jiada: Squash change from ndyer/linux/for-upstream commit d691d3ee6c6de84b38464a42 3207b3e23cb9dc3a - Input: atmel_mxt_ts - check firmware format before entering bootloader] Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 43 +++++++++++++++--------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 44bb77c0159c..04627db23ad2 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3257,23 +3257,10 @@ static int mxt_check_firmware_format(struct device *dev, return -EINVAL; } -static int mxt_load_fw(struct device *dev) +static int mxt_enter_bootloader(struct mxt_data *data) { - struct mxt_data *data = dev_get_drvdata(dev); - struct mxt_flash f = { 0, }; int ret; - ret = request_firmware(&f.fw, data->fw_name, dev); - if (ret) { - dev_err(dev, "Unable to open firmware %s\n", data->fw_name); - return ret; - } - - /* Check for incorrect enc file */ - ret = mxt_check_firmware_format(dev, f.fw); - if (ret) - goto release_firmware; - if (data->suspended) { if (data->suspend_mode == MXT_SUSPEND_REGULATOR) mxt_regulator_enable(data); @@ -3291,14 +3278,14 @@ static int mxt_load_fw(struct device *dev) ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_BOOT_VALUE, false); if (ret) - goto release_firmware; + return ret; msleep(MXT_RESET_TIME); /* Do not need to scan since we know family ID */ ret = mxt_lookup_bootloader_address(data, 0); if (ret) - goto release_firmware; + return ret; mxt_sysfs_remove(data); mxt_free_input_device(data); @@ -3309,6 +3296,30 @@ static int mxt_load_fw(struct device *dev) reinit_completion(&data->bl_completion); + return 0; +} + +static int mxt_load_fw(struct device *dev) +{ + struct mxt_data *data = dev_get_drvdata(dev); + struct mxt_flash f = { 0, }; + int ret; + + ret = request_firmware(&f.fw, data->fw_name, dev); + if (ret) { + dev_err(dev, "Unable to open firmware %s\n", data->fw_name); + return ret; + } + + /* Check for incorrect enc file */ + ret = mxt_check_firmware_format(dev, f.fw); + if (ret) + goto release_firmware; + + ret = mxt_enter_bootloader(data); + if (ret) + goto release_firmware; + ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false); if (ret) { /* Bootloader may still be unlocked from previous attempt */