From patchwork Wed Nov 6 07:01:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11229427 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 23CC615AB for ; Wed, 6 Nov 2019 07:02:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0218F206DF for ; Wed, 6 Nov 2019 07:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731466AbfKFHCx (ORCPT ); Wed, 6 Nov 2019 02:02:53 -0500 Received: from esa1.mentor.iphmx.com ([68.232.129.153]:18550 "EHLO esa1.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730804AbfKFHCw (ORCPT ); Wed, 6 Nov 2019 02:02:52 -0500 IronPort-SDR: N7CQWHQo28sz0nRtrtORoKoqvITkChUz059rfBFULRxeF/YQTfhPE5leQ5BA2rirBsgcMHjX9C VWuu6Lwzy6+kALlbZl3MKMFnHxb9FIJEWEO95Z0vX+Ok5W8Mq1IheWekGijtFlB5a5qB43xdep ICgiTeZeA/vhFeKlf9Y2E6eB+ybVEHr2UGT+QGIfF9IxiJWHcl1zc38ZDWlvvSP8kBOJ5Lsi15 UzTiQT25PNUF9PufeWXePg5PYXvu+9651rSMsnsbAFsve5zN6qm8ZYNDwfzRE3vJXnVPbVhpzl wxw= X-IronPort-AV: E=Sophos;i="5.68,272,1569312000"; d="scan'208";a="44759240" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 05 Nov 2019 23:02:51 -0800 IronPort-SDR: aQrSRhAT+6EPF3FlTmRVki75Y9VDxompuhfgc3+dbdNonPXHkH2bLBuPZtUY59HfmatJfmNhC7 /UxRbLqXT29MXlGgo1IJtOJmbD5o31aerZm1R9DAvYROluhYRi6an4SeHm/HxITVCkP9PZMRw0 7OG9EwFQIOFTIbfQQcTEFvqVyBn9C30p28Uaefl7GGN0yyZ23lwKs8muoxZCc+e3NnloJt6w9Q hc2GZua7fcCwcpImExmbHKpa8g764fd6kvxeCNj03EKMhteMz+pta+m3z05XfbEotCq9WRAuj2 x88= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v5 15/48] Input: atmel_mxt_ts - allow specification of firmware file name Date: Wed, 6 Nov 2019 16:01:13 +0900 Message-ID: <20191106070146.18759-16-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: Nick Dyer On platforms which have multiple device instances using this driver, the firmware may be different on each device. This patch makes the user give the name of the firmware file when flashing. This also prevents accidental triggering of the firmware load process. Signed-off-by: Nick Dyer Acked-by: Benson Leung Acked-by: Yufeng Shen (cherry picked from ndyer/linux/for-upstream commit 76ebb7cee971cb42dfb0a3a9224403b8b09abcf1) [gdavis: Forward port and fix conflicts.] Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 43 ++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index c551ec93ca54..a0e367bc6e83 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -33,8 +33,7 @@ #include #include -/* Firmware files */ -#define MXT_FW_NAME "maxtouch.fw" +/* Configuration file */ #define MXT_CFG_NAME "maxtouch.cfg" #define MXT_CFG_MAGIC "OBP_RAW V1" @@ -335,6 +334,7 @@ struct mxt_data { bool use_retrigen_workaround; struct regulator *reg_vdd; struct regulator *reg_avdd; + char *fw_name; /* Cached parameters from object table */ u16 T5_address; @@ -3207,7 +3207,7 @@ static int mxt_check_firmware_format(struct device *dev, return -EINVAL; } -static int mxt_load_fw(struct device *dev, const char *fn) +static int mxt_load_fw(struct device *dev) { struct mxt_data *data = dev_get_drvdata(dev); const struct firmware *fw = NULL; @@ -3217,9 +3217,9 @@ static int mxt_load_fw(struct device *dev, const char *fn) unsigned int frame = 0; int ret; - ret = request_firmware(&fw, fn, dev); + ret = request_firmware(&fw, data->fw_name, dev); if (ret) { - dev_err(dev, "Unable to open firmware %s\n", fn); + dev_err(dev, "Unable to open firmware %s\n", data->fw_name); return ret; } @@ -3339,6 +3339,33 @@ static int mxt_load_fw(struct device *dev, const char *fn) return ret; } +static int mxt_update_file_name(struct device *dev, char **file_name, + const char *buf, size_t count) +{ + char *file_name_tmp; + + /* Simple sanity check */ + if (count > 64) { + dev_warn(dev, "File name too long\n"); + return -EINVAL; + } + + file_name_tmp = krealloc(*file_name, count + 1, GFP_KERNEL); + if (!file_name_tmp) + return -ENOMEM; + + *file_name = file_name_tmp; + memcpy(*file_name, buf, count); + + /* Echo into the sysfs entry may append newline at the end of buf */ + if (buf[count - 1] == '\n') + (*file_name)[count - 1] = '\0'; + else + (*file_name)[count] = '\0'; + + return 0; +} + static ssize_t mxt_update_fw_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -3346,7 +3373,11 @@ static ssize_t mxt_update_fw_store(struct device *dev, struct mxt_data *data = dev_get_drvdata(dev); int error; - error = mxt_load_fw(dev, MXT_FW_NAME); + error = mxt_update_file_name(dev, &data->fw_name, buf, count); + if (error) + return error; + + error = mxt_load_fw(dev); if (error) { dev_err(dev, "The firmware update failed(%d)\n", error); count = error;