Linux Input Archive on lore.kernel.org
 help / color / Atom feed
From: Jiada Wang <jiada_wang@mentor.com>
To: <jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
	<rydberg@bitmath.org>, <dmitry.torokhov@gmail.com>,
	<nick@shmanahar.org>, <bsz@semihalf.com>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<erosca@de.adit-jv.com>, <Andrew_Gabbasov@mentor.com>,
	<jiada_wang@mentor.com>
Subject: [PATCH v7 32/48] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc
Date: Wed, 12 Feb 2020 00:42:02 -0800
Message-ID: <20200212084218.32344-33-jiada_wang@mentor.com> (raw)
In-Reply-To: <20200212084218.32344-1-jiada_wang@mentor.com>

From: Kautuk Consul <kautuk_consul@mentor.com>

We now prefer to rely on the calculated CRC and not on the CRC stored in
the file.

The new logic is as follows:
1) stored CRC of file != calculated CRC of file, then refuse the possible
   corrupted file
2) calculated CRC of file != CRC of configuration in controller, then
   update configuration in controller
3) calculated CRC of file == CRC of configuration in controller, then
   ignore configuration file

Signed-off-by: Kautuk Consul <kautuk_consul@mentor.com>
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 65 +++++++++++++-----------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 7316a7613041..3c15ce499e34 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1905,7 +1905,7 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
 	int ret;
 	int offset;
 	int i;
-	u32 info_crc, config_crc, calculated_crc;
+	u32 info_crc, config_crc, calculated_crc = 0;
 	u16 crc_start = 0;
 
 	/* Make zero terminated copy of the OBP_RAW file */
@@ -1968,30 +1968,6 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
 	}
 	cfg.raw_pos += offset;
 
-	/*
-	 * The Info Block CRC is calculated over mxt_info and the object
-	 * table. If it does not match then we are trying to load the
-	 * configuration from a different chip or firmware version, so
-	 * the configuration CRC is invalid anyway.
-	 */
-	if (info_crc == data->info_crc) {
-		if (config_crc == 0 || data->config_crc == 0) {
-			dev_info(dev, "CRC zero, attempting to apply config\n");
-		} else if (config_crc == data->config_crc) {
-			dev_dbg(dev, "Config CRC 0x%06X: OK\n",
-				 data->config_crc);
-			ret = 0;
-			goto release_raw;
-		} else {
-			dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
-				 data->config_crc, config_crc);
-		}
-	} else {
-		dev_warn(dev,
-			 "Warning: Info CRC error - device=0x%06X file=0x%06X\n",
-			 data->info_crc, info_crc);
-	}
-
 	/* Malloc memory to store configuration */
 	cfg.start_ofs = MXT_OBJECT_START +
 			data->info->object_num * sizeof(struct mxt_object) +
@@ -2015,14 +1991,45 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
 	else
 		dev_warn(dev, "Could not find CRC start\n");
 
-	if (crc_start > cfg.start_ofs) {
+	if (crc_start > cfg.start_ofs)
 		calculated_crc = mxt_calculate_crc(cfg.mem,
 						   crc_start - cfg.start_ofs,
 						   cfg.mem_size);
 
-		if (config_crc > 0 && config_crc != calculated_crc)
-			dev_warn(dev, "Config CRC in file inconsistent, calculated=%06X, file=%06X\n",
-				 calculated_crc, config_crc);
+	/* If the CRC stored in the file is not the same as what
+	 * was calculated by mxt_calculate_crc, this means we
+	 * have to refuse the config file and abort download.
+	 */
+	if (config_crc != calculated_crc) {
+		dev_warn(dev,
+			 "Config CRC in file inconsistent, calculated=%06X, file=%06X\n",
+			 calculated_crc, config_crc);
+		ret = 0;
+		goto release_mem;
+	}
+
+	/*
+	 * The Info Block CRC is calculated over mxt_info and the object
+	 * table. If it does not match then we are trying to load the
+	 * configuration from a different chip or firmware version, so
+	 * the configuration CRC is invalid anyway.
+	 */
+	if (info_crc == data->info_crc) {
+		if (config_crc == 0 || data->config_crc == 0) {
+			dev_info(dev, "CRC zero, attempting to apply config\n");
+		} else if (config_crc == data->config_crc) {
+			dev_dbg(dev, "Config CRC 0x%06X: OK\n",
+				data->config_crc);
+			ret = 0;
+			goto release_mem;
+		} else {
+			dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
+				 data->config_crc, config_crc);
+		}
+	} else {
+		dev_warn(dev,
+			 "Warning: Info CRC error - device=0x%06X file=0x%06X\n",
+			 data->info_crc, info_crc);
 	}
 
 	ret = mxt_upload_cfg_mem(data, &cfg);
-- 
2.17.1


  parent reply index

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-12  8:41 [PATCH v7 00/48] atmel_mxt_ts misc Jiada Wang
2020-02-12  8:41 ` [PATCH v7 01/48] Input: introduce input_mt_report_slot_inactive Jiada Wang
2020-02-12  8:41 ` [PATCH v7 02/48] Input: atmel_mxt_ts - rework sysfs init/remove Jiada Wang
2020-02-12  8:41 ` [PATCH v7 03/48] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Jiada Wang
2020-03-17 22:44   ` Dmitry Osipenko
2020-03-18 13:02     ` Wang, Jiada
2020-02-12  8:41 ` [PATCH v7 04/48] Input: atmel_mxt_ts - split large i2c transfers into blocks Jiada Wang
2020-02-12  8:41 ` [PATCH v7 05/48] Input: atmel_mxt_ts - output status from T48 Noise Supression Jiada Wang
2020-02-12  8:41 ` [PATCH v7 06/48] Input: atmel_mxt_ts - output status from T42 Touch Suppression Jiada Wang
2020-02-12  8:41 ` [PATCH v7 07/48] Input: atmel_mxt_ts - implement T9 vector/orientation support Jiada Wang
2020-02-12  8:41 ` [PATCH v7 08/48] Input: atmel_mxt_ts - implement T15 Key Array support Jiada Wang
2020-02-12  8:41 ` [PATCH v7 09/48] Input: atmel_mxt_ts - handle reports from T47 Stylus object Jiada Wang
2020-02-12  8:41 ` [PATCH v7 10/48] Input: atmel_mxt_ts - implement support for T107 active stylus Jiada Wang
2020-02-12  8:41 ` [PATCH v7 11/48] Input: atmel_mxt_ts - add debug for T92 gesture and T93 touch seq msgs Jiada Wang
2020-02-12  8:41 ` [PATCH v7 12/48] Input: atmel_mxt_ts - release touch state during suspend Jiada Wang
2020-02-12  8:41 ` [PATCH v7 13/48] Input: atmel_mxt_ts - add regulator control support Jiada Wang
2020-03-12 15:26   ` Dmitry Osipenko
2020-02-12  8:41 ` [PATCH v7 14/48] Input: atmel_mxt_ts - report failures in suspend/resume Jiada Wang
2020-02-12  8:41 ` [PATCH v7 15/48] Input: atmel_mxt_ts - allow specification of firmware file name Jiada Wang
2020-02-12  8:41 ` [PATCH v7 16/48] Input: atmel_mxt_ts - handle cfg filename via pdata/sysfs Jiada Wang
2020-02-12  8:41 ` [PATCH v7 17/48] Input: atmel_mxt_ts - allow input name to be specified in platform data Jiada Wang
2020-02-12  8:41 ` [PATCH v7 18/48] Input: atmel_mxt_ts - add config checksum attribute to sysfs Jiada Wang
2020-02-12  8:41 ` [PATCH v7 19/48] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2020-02-12  8:41 ` [PATCH v7 20/48] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2020-02-12  8:41 ` [PATCH v7 21/48] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2020-02-12  8:41 ` [PATCH v7 22/48] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2020-03-12 15:28   ` Dmitry Osipenko
2020-02-12  8:41 ` [PATCH v7 23/48] Input: atmel_mxt_ts - rename bl_completion to chg_completion Jiada Wang
2020-02-12  8:41 ` [PATCH v7 24/48] Input: atmel_mxt_ts - make bootloader interrupt driven Jiada Wang
2020-02-12  8:41 ` [PATCH v7 25/48] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Jiada Wang
2020-02-12  8:41 ` [PATCH v7 26/48] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2020-02-12  8:41 ` [PATCH v7 27/48] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
2020-02-12  8:41 ` [PATCH v7 28/48] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2020-02-12  8:41 ` [PATCH v7 29/48] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2020-02-12  8:42 ` [PATCH v7 30/48] Input: atmel_mxt_ts - eliminate data->raw_info_block Jiada Wang
2020-02-12  8:42 ` [PATCH v7 31/48] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2020-02-12  8:42 ` Jiada Wang [this message]
2020-02-12  8:42 ` [PATCH v7 33/48] input: atmel_mxt_ts: export GPIO reset line via sysfs Jiada Wang
2020-02-12  8:42 ` [PATCH v7 34/48] input: atmel_mxt_ts: Add Missing Delay for reset handling of Atmel touch panel controller in detachable displays Jiada Wang
2020-02-12  8:42 ` [PATCH v7 35/48] Input: atmel_mxt_ts: Add support for run self-test routine Jiada Wang
2020-02-12  8:42 ` [PATCH v7 36/48] Input: atmel_mxt_ts: Limit the max bytes transferred in an i2c transaction Jiada Wang
2020-02-12  8:42 ` [PATCH v7 37/48] Input: atmel_mxt_ts: return error from mxt_process_messages_until_invalid() Jiada Wang
2020-02-12  8:42 ` [PATCH v7 38/48] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2020-02-12  8:42 ` [PATCH v7 39/48] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2020-02-12  8:42 ` [PATCH v7 40/48] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2020-02-12  8:42 ` [PATCH v7 41/48] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2020-02-12  8:42 ` [PATCH v7 42/48] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
2020-02-12  8:42 ` [PATCH v7 43/48] Input: Atmel: use T44 object to process " Jiada Wang
2020-02-12  8:42 ` [PATCH v7 44/48] Input: atmel_mxt_ts: use gpiod_set_value_cansleep for reset pin Jiada Wang
2020-02-12  8:42 ` [PATCH v7 45/48] input: touchscreen: atmel_mxt_ts: Added sysfs entry for touchscreen status Jiada Wang
2020-02-12  8:42 ` [PATCH v7 46/48] input: atmel_mxt_ts: added sysfs interface to update atmel T38 data Jiada Wang
2020-02-12  8:42 ` [PATCH v7 47/48] Input: atmel_mxt_ts: Implement synchronization during various operation Jiada Wang
2020-02-12  8:42 ` [PATCH v7 48/48] Input: atmel_mxt_ts - Fix compilation warning Jiada Wang
2020-03-11  1:09 ` [PATCH v7 00/48] atmel_mxt_ts misc Wang, Jiada
2020-03-12 15:21 ` Dmitry Osipenko
2020-03-16  6:50   ` Wang, Jiada
2020-03-20  3:37   ` Wang, Jiada
2020-03-20 15:53     ` Dmitry Osipenko
2020-03-23  2:25       ` Wang, Jiada
2020-03-24 14:54         ` Dmitry Osipenko
2020-03-24 15:03           ` Dmitry Osipenko
2020-03-25 12:13           ` Wang, Jiada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200212084218.32344-33-jiada_wang@mentor.com \
    --to=jiada_wang@mentor.com \
    --cc=Andrew_Gabbasov@mentor.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=bsz@semihalf.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=erosca@de.adit-jv.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nick@shmanahar.org \
    --cc=rydberg@bitmath.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux Input Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-input/0 linux-input/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-input linux-input/ https://lore.kernel.org/linux-input \
		linux-input@vger.kernel.org
	public-inbox-index linux-input

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-input


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git