From patchwork Fri May 8 05:56:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11535559 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 2D70A1668 for ; Fri, 8 May 2020 05:58:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 204C121582 for ; Fri, 8 May 2020 05:58:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727857AbgEHF6J (ORCPT ); Fri, 8 May 2020 01:58:09 -0400 Received: from esa3.mentor.iphmx.com ([68.232.137.180]:21990 "EHLO esa3.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727845AbgEHF6D (ORCPT ); Fri, 8 May 2020 01:58:03 -0400 IronPort-SDR: 2a7qAso0NO5AqX95IfmXTU8K9VZuY9qv8cHmnEVQ7lgM4wUbyrV7hyFIvGBpNbGw0Bst5k9lTu FkGT7rP7LQZMVkqgIOzQ7GPnkHDUwy28qfMQAmwd8b6HXhXSS3WgdM0vFpEE+SMjvoj5DEHyGo d+MJkeey+vg0R2SU+oDt7SrNLwK5NU59HX7nbmyWQDJF9HHSzcf4h5uW0D6t3aaQTpDyC35wZR 1+xFcJGqzxeZsUC80PuEmMGm/pu6yCkQaJYedk7hg0dC7v472i2avETo7l4PcR+AcPezch9zI7 XfQ= X-IronPort-AV: E=Sophos;i="5.73,366,1583222400"; d="scan'208";a="48651936" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 07 May 2020 21:58:03 -0800 IronPort-SDR: hnz4C4/0vT9/YY/AtJJC4ZYXzX4W/sd8jyPkF6L1yj5OxBRuE7N8u7TRHPoILZm28uAQcgGmfx Bt7X/7YWozYs3ZvsgJbLXBstRbtxGsYlxSFJTEyX7wOZBpKnfE7FqlnCUZwaZ1+MEiE6qTFbLn 2KSUMBSTcXyhAlCLjTkl9lhqFmu+7RRZe2jCfY8VZuw6BASX75Ov9FFQvBbxG9+3rJCJkm8sE2 rlyvpx13/NEU2/Km0X89qCvkkEXnQhP7iCUn5a4Wv6gNZgIyNL58b1ufTIjSG1t/OaYDoKgHlT WQk= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v11 16/56] Input: atmel_mxt_ts - allow specification of firmware file name Date: Thu, 7 May 2020 22:56:16 -0700 Message-ID: <20200508055656.96389-17-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508055656.96389-1-jiada_wang@mentor.com> References: <20200508055656.96389-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 f8783e37436f..0e30ff372a43 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;