From patchwork Fri Feb 28 17:12:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 11412971 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 B2B0F159A for ; Fri, 28 Feb 2020 17:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C442246AC for ; Fri, 28 Feb 2020 17:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbgB1RM3 (ORCPT ); Fri, 28 Feb 2020 12:12:29 -0500 Received: from muru.com ([72.249.23.125]:58216 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725886AbgB1RM3 (ORCPT ); Fri, 28 Feb 2020 12:12:29 -0500 Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id B024D815B; Fri, 28 Feb 2020 17:13:13 +0000 (UTC) From: Tony Lindgren To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Merlijn Wajer , Pavel Machek , ruleh , Sebastian Reichel Subject: [PATCH 1/3] Input: omap4-keypad - configure interrupt as level Date: Fri, 28 Feb 2020 09:12:21 -0800 Message-Id: <20200228171223.11444-2-tony@atomide.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200228171223.11444-1-tony@atomide.com> References: <20200228171223.11444-1-tony@atomide.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The interrupt should be level high for SoC internal devices. Otherwise interrupts may not be seen after a wake-up event. Cc: Arthur Demchenkov Cc: Merlijn Wajer Cc: Pavel Machek Cc: ruleh Cc: Sebastian Reichel Signed-off-by: Tony Lindgren --- drivers/input/keyboard/omap4-keypad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c --- a/drivers/input/keyboard/omap4-keypad.c +++ b/drivers/input/keyboard/omap4-keypad.c @@ -344,7 +344,8 @@ static int omap4_keypad_probe(struct platform_device *pdev) } error = request_threaded_irq(keypad_data->irq, omap4_keypad_irq_handler, - omap4_keypad_irq_thread_fn, IRQF_ONESHOT, + omap4_keypad_irq_thread_fn, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "omap4-keypad", keypad_data); if (error) { dev_err(&pdev->dev, "failed to register interrupt\n"); From patchwork Fri Feb 28 17:12:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 11412963 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 ED0C9924 for ; Fri, 28 Feb 2020 17:12:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC470246AC for ; Fri, 28 Feb 2020 17:12:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726901AbgB1RMd (ORCPT ); Fri, 28 Feb 2020 12:12:33 -0500 Received: from muru.com ([72.249.23.125]:58220 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726860AbgB1RMa (ORCPT ); Fri, 28 Feb 2020 12:12:30 -0500 Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 11C1B8186; Fri, 28 Feb 2020 17:13:14 +0000 (UTC) From: Tony Lindgren To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Merlijn Wajer , Pavel Machek , ruleh , Sebastian Reichel Subject: [PATCH 2/3] Input: omap4-keypad - disable unused long interrupts Date: Fri, 28 Feb 2020 09:12:22 -0800 Message-Id: <20200228171223.11444-3-tony@atomide.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200228171223.11444-1-tony@atomide.com> References: <20200228171223.11444-1-tony@atomide.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org We are not using the long interrupts and they produce extra interrupts. Let's not enable them at all. Note that also the v3.0.8 Linux Android kernel has long interrupts disabled. Cc: Arthur Demchenkov Cc: Merlijn Wajer Cc: Pavel Machek Cc: ruleh Cc: Sebastian Reichel Signed-off-by: Tony Lindgren --- drivers/input/keyboard/omap4-keypad.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c --- a/drivers/input/keyboard/omap4-keypad.c +++ b/drivers/input/keyboard/omap4-keypad.c @@ -176,10 +176,9 @@ static int omap4_keypad_open(struct input_dev *input) kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS, kbd_read_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS)); kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQENABLE, - OMAP4_DEF_IRQENABLE_EVENTEN | - OMAP4_DEF_IRQENABLE_LONGKEY); + OMAP4_DEF_IRQENABLE_EVENTEN); kbd_writel(keypad_data, OMAP4_KBD_WAKEUPENABLE, - OMAP4_DEF_WUP_EVENT_ENA | OMAP4_DEF_WUP_LONG_KEY_ENA); + OMAP4_DEF_WUP_EVENT_ENA); enable_irq(keypad_data->irq); From patchwork Fri Feb 28 17:12:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 11412967 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 B056A924 for ; Fri, 28 Feb 2020 17:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99CD3246A0 for ; Fri, 28 Feb 2020 17:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbgB1RMc (ORCPT ); Fri, 28 Feb 2020 12:12:32 -0500 Received: from muru.com ([72.249.23.125]:58232 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726674AbgB1RMc (ORCPT ); Fri, 28 Feb 2020 12:12:32 -0500 Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 69D4281CC; Fri, 28 Feb 2020 17:13:16 +0000 (UTC) From: Tony Lindgren To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Merlijn Wajer , Pavel Machek , Sebastian Reichel , ruleh Subject: [PATCH 3/3] Input: omap4-keypad - check state again for lost key-up interrupts Date: Fri, 28 Feb 2020 09:12:23 -0800 Message-Id: <20200228171223.11444-4-tony@atomide.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200228171223.11444-1-tony@atomide.com> References: <20200228171223.11444-1-tony@atomide.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org We only have partial errata i689 implemented with Commit 6c3516fed7b6 ("Input: omap-keypad - fix keyboard debounce configuration"). We are still missing the check for lost key-up interrupts as described in the omap4 silicon errata documentation as Errata ID i689 "1.32 Keyboard Key Up Event Can Be Missed": "When a key is released for a time shorter than the debounce time, in-between 2 key press (KP1 and KP2), the keyboard state machine will go to idle mode and will never detect the key release (after KP1, and also after KP2), and thus will never generate a new IRQ indicating the key release." Let's check the keyboard state with delayed_work after each event. And if the problem state is detect, let's clear all events. Cc: Arthur Demchenkov Cc: Merlijn Wajer Cc: Pavel Machek Cc: Sebastian Reichel Signed-off-by: Tony Lindgren --- drivers/input/keyboard/omap4-keypad.c | 56 ++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c --- a/drivers/input/keyboard/omap4-keypad.c +++ b/drivers/input/keyboard/omap4-keypad.c @@ -71,6 +71,8 @@ struct omap4_keypad { void __iomem *base; bool irq_wake_enabled; unsigned int irq; + struct delayed_work key_work; + struct mutex lock; /* for key scan */ unsigned int rows; unsigned int cols; @@ -119,16 +121,22 @@ static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) return IRQ_NONE; } -static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) +static bool omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, bool clear) { - struct omap4_keypad *keypad_data = dev_id; struct input_dev *input_dev = keypad_data->input; unsigned char key_state[ARRAY_SIZE(keypad_data->key_state)]; unsigned int col, row, code, changed; - u32 *new_state = (u32 *) key_state; - - *new_state = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE31_0); - *(new_state + 1) = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE63_32); + u32 *rows_lo = (u32 *)key_state; + u32 *rows_hi = rows_lo + 1; + + mutex_lock(&keypad_data->lock); + if (clear) { + *rows_lo = 0; + *rows_hi = 0; + } else { + *rows_lo = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE31_0); + *rows_hi = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE63_32); + } for (row = 0; row < keypad_data->rows; row++) { changed = key_state[row] ^ keypad_data->key_state[row]; @@ -151,6 +159,20 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) memcpy(keypad_data->key_state, key_state, sizeof(keypad_data->key_state)); + mutex_unlock(&keypad_data->lock); + + return *rows_lo || *rows_hi; +} + +static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) +{ + struct omap4_keypad *keypad_data = dev_id; + bool events; + + events = omap4_keypad_scan_keys(keypad_data, false); + if (events) + schedule_delayed_work(&keypad_data->key_work, + msecs_to_jiffies(50)); /* clear pending interrupts */ kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS, @@ -159,6 +181,25 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) return IRQ_HANDLED; } +/* + * Errata ID i689 "1.32 Keyboard Key Up Event Can Be Missed". + * Interrupt may not happen for key-up events. + */ +static void omap4_keypad_work(struct work_struct *work) +{ + struct omap4_keypad *keypad_data = + container_of(work, struct omap4_keypad, key_work.work); + bool events; + u32 active; + + active = kbd_readl(keypad_data, OMAP4_KBD_STATEMACHINE); + if (active) + return; + + dev_dbg(keypad_data->input->dev.parent, "idle with events\n"); + events = omap4_keypad_scan_keys(keypad_data, true); +} + static int omap4_keypad_open(struct input_dev *input) { struct omap4_keypad *keypad_data = input_get_drvdata(input); @@ -251,6 +292,8 @@ static int omap4_keypad_probe(struct platform_device *pdev) } keypad_data->irq = irq; + mutex_init(&keypad_data->lock); + INIT_DELAYED_WORK(&keypad_data->key_work, omap4_keypad_work); error = omap4_keypad_parse_dt(&pdev->dev, keypad_data); if (error) @@ -387,6 +430,7 @@ static int omap4_keypad_remove(struct platform_device *pdev) struct resource *res; free_irq(keypad_data->irq, keypad_data); + cancel_delayed_work_sync(&keypad_data->key_work); pm_runtime_disable(&pdev->dev); From patchwork Fri Feb 28 18:02:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 11413125 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 07CB5138D for ; Fri, 28 Feb 2020 18:03:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5303246AE for ; Fri, 28 Feb 2020 18:03:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726791AbgB1SCr (ORCPT ); Fri, 28 Feb 2020 13:02:47 -0500 Received: from muru.com ([72.249.23.125]:58278 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgB1SCr (ORCPT ); Fri, 28 Feb 2020 13:02:47 -0500 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 5C966806C; Fri, 28 Feb 2020 18:03:31 +0000 (UTC) Date: Fri, 28 Feb 2020 10:02:43 -0800 From: Tony Lindgren To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Merlijn Wajer , Pavel Machek , Sebastian Reichel , ruleh Subject: [PATCHv2 4/3] Input: omap4-keypad - scan the keys in two phases to detect lost key-up Message-ID: <20200228180243.GM37466@atomide.com> References: <20200228171223.11444-1-tony@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200228171223.11444-1-tony@atomide.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org In addition to handling errata i689 for idle with state, we must also check for lost key up interrupts on fast key presses. For example rapidly pressing shift-shift-j can sometimes produce a J instead of j. Let's fix the issue by scanning the keyboard in two phases. First we scan for any key up events that we may have missed, and then we scan for key down events. Cc: Arthur Demchenkov Cc: Merlijn Wajer Cc: Pavel Machek Cc: Sebastian Reichel Signed-off-by: Tony Lindgren --- drivers/input/keyboard/omap4-keypad.c | 48 ++++++++++++++++++--------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c --- a/drivers/input/keyboard/omap4-keypad.c +++ b/drivers/input/keyboard/omap4-keypad.c @@ -109,6 +109,34 @@ static void kbd_write_irqreg(struct omap4_keypad *keypad_data, keypad_data->base + keypad_data->irqreg_offset + offset); } +static void omap4_keypad_scan_state(struct omap4_keypad *keypad_data, + unsigned char *key_state, + bool down) +{ + struct input_dev *input_dev = keypad_data->input; + unsigned int col, row, code, changed; + bool key_down; + + for (row = 0; row < keypad_data->rows; row++) { + changed = key_state[row] ^ keypad_data->key_state[row]; + if (!changed) + continue; + + for (col = 0; col < keypad_data->cols; col++) { + if (changed & (1 << col)) { + code = MATRIX_SCAN_CODE(row, col, + keypad_data->row_shift); + key_down = key_state[row] & (1 << col); + if (key_down != down) + continue; + input_event(input_dev, EV_MSC, MSC_SCAN, code); + input_report_key(input_dev, + keypad_data->keymap[code], + key_down); + } + } + } +} /* Interrupt handlers */ static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) @@ -125,7 +153,6 @@ static bool omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, bool clear) { struct input_dev *input_dev = keypad_data->input; unsigned char key_state[ARRAY_SIZE(keypad_data->key_state)]; - unsigned int col, row, code, changed; u32 *rows_lo = (u32 *)key_state; u32 *rows_hi = rows_lo + 1; @@ -138,22 +165,11 @@ static bool omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, bool clear) *rows_hi = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE63_32); } - for (row = 0; row < keypad_data->rows; row++) { - changed = key_state[row] ^ keypad_data->key_state[row]; - if (!changed) - continue; + /* Scan for key up evetns for lost key-up interrupts */ + omap4_keypad_scan_state(keypad_data, key_state, false); - for (col = 0; col < keypad_data->cols; col++) { - if (changed & (1 << col)) { - code = MATRIX_SCAN_CODE(row, col, - keypad_data->row_shift); - input_event(input_dev, EV_MSC, MSC_SCAN, code); - input_report_key(input_dev, - keypad_data->keymap[code], - key_state[row] & (1 << col)); - } - } - } + /* Scan for key down events */ + omap4_keypad_scan_state(keypad_data, key_state, true); input_sync(input_dev);