From patchwork Thu Mar 3 10:52:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 8491151 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A0599F314 for ; Thu, 3 Mar 2016 10:52:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDF24201BC for ; Thu, 3 Mar 2016 10:52:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7E4E201BB for ; Thu, 3 Mar 2016 10:52:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbcCCKwK (ORCPT ); Thu, 3 Mar 2016 05:52:10 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:54244 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755079AbcCCKwI (ORCPT ); Thu, 3 Mar 2016 05:52:08 -0500 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1abQrW-000322-Kp; Thu, 03 Mar 2016 11:52:06 +0100 Received: from mgr by dude.hi.pengutronix.de with local (Exim 4.86) (envelope-from ) id 1abQrW-0007BK-3F; Thu, 03 Mar 2016 11:52:06 +0100 From: Michael Grzeschik To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, support.opensource@diasemi.com, kernel@pengutronix.de Subject: [PATCH] da9052: ensure da9052_ts_input_open will not lock up on irq flood Date: Thu, 3 Mar 2016 11:52:02 +0100 Message-Id: <1457002322-21953-1-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 2.7.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is possible that da9052_ts_input_open is called and the touchscreen is triggering continuous interrupts. In this case we will never leave da9052_ts_input_open. The da9052_reg_update will never get the i2c bus as the interrupt handler will continuously lock it. This patch switch places of da9052_reg_update and the setting of tsi->stopped. This way its ensured that da9052_ts_input_open will never lockup on interrupt flood. Signed-off-by: Michael Grzeschik --- drivers/input/touchscreen/da9052_tsi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c index 5a013bb..1b136b8 100644 --- a/drivers/input/touchscreen/da9052_tsi.c +++ b/drivers/input/touchscreen/da9052_tsi.c @@ -189,17 +189,20 @@ static int da9052_configure_tsi(struct da9052_tsi *tsi) static int da9052_ts_input_open(struct input_dev *input_dev) { + int val; struct da9052_tsi *tsi = input_get_drvdata(input_dev); - tsi->stopped = false; - mb(); + val = da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, + 1 << 1, 1 << 1); /* Unmask PEN_DOWN event */ da9052_enable_irq(tsi->da9052, DA9052_IRQ_PENDOWN); + tsi->stopped = false; + mb(); + /* Enable Pen Detect Circuit */ - return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, - 1 << 1, 1 << 1); + return val; } static void da9052_ts_input_close(struct input_dev *input_dev)