From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5BEDC1975A for ; Wed, 25 Mar 2020 13:35:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF7E22078A for ; Wed, 25 Mar 2020 13:35:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727869AbgCYNf2 (ORCPT ); Wed, 25 Mar 2020 09:35:28 -0400 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:13584 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbgCYNfZ (ORCPT ); Wed, 25 Mar 2020 09:35:25 -0400 IronPort-SDR: IeyacE2Uj8Or/TZUvTSpgEAdxwQhUBK62vK68jIBANgF+3Sm5r7wrHkysCm9jJKmSKkQHoWIwO TuFmq6WUJUhJs67icVZQtoaaYdo5iaTARDP/wmo2puOtTVlgkAjSiWw8Z2ihCmDqjwCtR1qguu nq6cg4dTrfCbkalPkvGhKlO3ajKYE3+ZuX6C56PrMNW1MPet8M4Ic/Sgj2nWbrIydEeqHutGc3 3wEPoQVBHmMCZM0fmHEiasNkSqQHxx79+kQPpUPdbHKMG0SzCQAVxVcqqZG4Hc7Omc/QkfU7ZF OBw= X-IronPort-AV: E=Sophos;i="5.72,304,1580803200"; d="scan'208";a="47010649" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 25 Mar 2020 05:35:24 -0800 IronPort-SDR: xvcWErKuqwkEm36ta7uf7bRZpwxNvYpVSjw9aq1MHM058Y0ekSNIVkpGD8Pbmps+hKQSUuWFg9 NhZPXGfEu2OWGWq2SmtAPlxOIit27oAqQKI4dM1OhopB8+e9gB8CXZlQ42+HDhYmNFG9kyeHVX GzTWUTA7sy/l1rd6MngEQrXjGlGYLjqNUR94KxkRdrZwF83f84vEBpyuoFf0aC1T/ZvqY4/oVg QupztJtEt6FWou8nGtAke7TgeiMn7XAk3qBFHYceMM78M6D9rZmFg8qZ5zi6CV60rM7cyTyI9J 1VA= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v9 26/55] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Date: Wed, 25 Mar 2020 06:33:05 -0700 Message-ID: <20200325133334.19346-27-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200325133334.19346-1-jiada_wang@mentor.com> References: <20200325133334.19346-1-jiada_wang@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nick Dyer Refactor code to enter bootloader into separate func 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 Add commit description] 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 2c4b68802bc3..11b2f133e6be 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 */ -- 2.17.1