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 03/48] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary
Date: Wed, 12 Feb 2020 00:41:33 -0800
Message-ID: <20200212084218.32344-4-jiada_wang@mentor.com> (raw)
In-Reply-To: <20200212084218.32344-1-jiada_wang@mentor.com>

From: Nick Dyer <nick.dyer@itdev.co.uk>

The workaround of reading all messages until an invalid is received is a
way of forcing the CHG line high, which means that when using
edge-triggered interrupts the interrupt can be acquired.

With level-triggered interrupts the workaround is unnecessary.

Also, most recent maXTouch chips have a feature called RETRIGEN which, when
enabled, reasserts the interrupt line every cycle if there are messages
waiting. This also makes the workaround unnecessary.

Note: the RETRIGEN feature is only in some firmware versions/chips, it's
not valid simply to enable the bit.

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
(cherry picked from ndyer/linux/for-upstream commit 1ae4e8281e491b22442cd5acdfca1862555f8ecb)
[gdavis: Fix conflicts due to v4.6-rc7 commit eb43335c4095 ("Input:
	 atmel_mxt_ts - use mxt_acquire_irq in mxt_soft_reset").]
Signed-off-by: George G. Davis <george_davis@mentor.com>
[jiada: reset use_retrigen_workaround at beginning of mxt_check_retrigen()]
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 51 ++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 550caec1018e..e184d0e67ef8 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/input/mt.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/property.h>
 #include <linux/slab.h>
@@ -129,6 +130,7 @@ struct t9_range {
 /* MXT_SPT_COMMSCONFIG_T18 */
 #define MXT_COMMS_CTRL		0
 #define MXT_COMMS_CMD		1
+#define MXT_COMMS_RETRIGEN      BIT(6)
 
 /* MXT_DEBUG_DIAGNOSTIC_T37 */
 #define MXT_DIAGNOSTIC_PAGEUP	0x01
@@ -308,6 +310,7 @@ struct mxt_data {
 	struct t7_config t7_cfg;
 	struct mxt_dbg dbg;
 	struct gpio_desc *reset_gpio;
+	bool use_retrigen_workaround;
 
 	/* Cached parameters from object table */
 	u16 T5_address;
@@ -318,6 +321,7 @@ struct mxt_data {
 	u16 T71_address;
 	u8 T9_reportid_min;
 	u8 T9_reportid_max;
+	u16 T18_address;
 	u8 T19_reportid;
 	u16 T44_address;
 	u8 T100_reportid_min;
@@ -1190,9 +1194,11 @@ static int mxt_acquire_irq(struct mxt_data *data)
 
 	enable_irq(data->irq);
 
-	error = mxt_process_messages_until_invalid(data);
-	if (error)
-		return error;
+	if (data->use_retrigen_workaround) {
+		error = mxt_process_messages_until_invalid(data);
+		if (error)
+			return error;
+	}
 
 	return 0;
 }
@@ -1282,6 +1288,33 @@ static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off)
 	return crc;
 }
 
+static int mxt_check_retrigen(struct mxt_data *data)
+{
+	struct i2c_client *client = data->client;
+	int error;
+	int val;
+
+	data->use_retrigen_workaround = false;
+
+	if (irq_get_trigger_type(data->irq) & IRQF_TRIGGER_LOW)
+		return 0;
+
+	if (data->T18_address) {
+		error = __mxt_read_reg(client,
+				       data->T18_address + MXT_COMMS_CTRL,
+				       1, &val);
+		if (error)
+			return error;
+
+		if (val & MXT_COMMS_RETRIGEN)
+			return 0;
+	}
+
+	dev_warn(&client->dev, "Enabling RETRIGEN workaround\n");
+	data->use_retrigen_workaround = true;
+	return 0;
+}
+
 static int mxt_prepare_cfg_mem(struct mxt_data *data, struct mxt_cfg *cfg)
 {
 	struct device *dev = &data->client->dev;
@@ -1561,6 +1594,10 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
 
 	mxt_update_crc(data, MXT_COMMAND_BACKUPNV, MXT_BACKUP_VALUE);
 
+	ret = mxt_check_retrigen(data);
+	if (ret)
+		goto release_mem;
+
 	ret = mxt_soft_reset(data);
 	if (ret)
 		goto release_mem;
@@ -1604,6 +1641,7 @@ static void mxt_free_object_table(struct mxt_data *data)
 	data->T71_address = 0;
 	data->T9_reportid_min = 0;
 	data->T9_reportid_max = 0;
+	data->T18_address = 0;
 	data->T19_reportid = 0;
 	data->T44_address = 0;
 	data->T100_reportid_min = 0;
@@ -1678,6 +1716,9 @@ static int mxt_parse_object_table(struct mxt_data *data,
 						object->num_report_ids - 1;
 			data->num_touchids = object->num_report_ids;
 			break;
+		case MXT_SPT_COMMSCONFIG_T18:
+			data->T18_address = object->start_address;
+			break;
 		case MXT_SPT_MESSAGECOUNT_T44:
 			data->T44_address = object->start_address;
 			break;
@@ -2141,6 +2182,10 @@ static int mxt_initialize(struct mxt_data *data)
 		msleep(MXT_FW_RESET_TIME);
 	}
 
+	error = mxt_check_retrigen(data);
+	if (error)
+		return error;
+
 	error = mxt_acquire_irq(data);
 	if (error)
 		return error;
-- 
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 ` Jiada Wang [this message]
2020-03-17 22:44   ` [PATCH v7 03/48] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary 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 ` [PATCH v7 32/48] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
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-4-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