From patchwork Wed May 6 11:13:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 22002 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n46BCOLX022880 for ; Wed, 6 May 2009 11:12:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753954AbZEFLMV (ORCPT ); Wed, 6 May 2009 07:12:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756695AbZEFLMV (ORCPT ); Wed, 6 May 2009 07:12:21 -0400 Received: from moutng.kundenserver.de ([212.227.126.177]:64997 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752981AbZEFLMT (ORCPT ); Wed, 6 May 2009 07:12:19 -0400 Received: from benhur.adnet.avionic-design.de (p548EA4E6.dip0.t-ipconnect.de [84.142.164.230]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1M1f2t3pz6-0001Ih; Wed, 06 May 2009 13:12:16 +0200 Received: from localhost (avionic-0027.adnet.avionic-design.de [172.20.13.142]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id 7B3062C4015; Wed, 6 May 2009 13:12:14 +0200 (CEST) Date: Wed, 6 May 2009 13:13:36 +0200 From: Thierry Reding To: Kwangwoo Lee Cc: Trilok Soni , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: Re: [PATCH] input: Add support for the TSC2003 controller. Message-ID: <20090506111336.GB14326@avionic-design.de> References: <1241006627-22811-1-git-send-email-thierry.reding@avionic-design.de> <5d5443650904290623n3712cd7dja653a139cff2cf6d@mail.gmail.com> <483a38b80904291835p51044741p9bd83d33a40031c@mail.gmail.com> <20090504113751.GA22603@avionic-design.de> <5d5443650905040503n501e3b47qc890dc4c71a85b1c@mail.gmail.com> <20090504145700.GA875@avionic-design.de> <483a38b80905052125r76358182g7ce6b890c921b655@mail.gmail.com> <20090506064529.GA14326@avionic-design.de> <483a38b80905052354m221ddc03tcbe9d35ee902b467@mail.gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <483a38b80905052354m221ddc03tcbe9d35ee902b467@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Provags-ID: V01U2FsdGVkX18MXHLL3qETd5pLZvk7ONBrB7QKA1LvZQCIXfn wuqyLYNYSjauITG6oROQH7hFyiXWLi79gXW7qQrla7+iea+MBJ XhfYvlVzPnzAvWx5EKkZA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * Kwangwoo Lee wrote: > On Wed, May 6, 2009 at 3:45 PM, Thierry Reding > wrote: > > * Kwangwoo Lee wrote: > > [...] > >> Thanks for the patch. It looks good. :) > >> The code in the patch is already merged in the main kernel tree. > >> > >> @@ -235,7 +245,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle) > >>       spin_lock_irqsave(&ts->lock, flags); > >> > >>       if (likely(ts->get_pendown_state())) { > >> -             disable_irq(ts->irq); > >> +             disable_irq_nosync(ts->irq); > >>               hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), > >>                                       HRTIMER_MODE_REL); > >>       } > > > > Oh, I hadn't noticed. I diffed against 2.6.30-rc4. Do you want me to send a > > new patch or will you just rip that piece out? > > Send fixed patch with your Signed-off-by line. Attached is the previous patch with said change removed. Thierry From: Thierry Reding Subject: [PATCH] tsc2007: Fix for I2C controllers that sleep during transfers. This patch fixes the tsc2007 driver with I2C controllers that sleep during transfers. By moving the critical code to a workqueue, I2C transfers can be scheduled to run in non-interrupt context. Signed-off-by: Thierry Reding --- drivers/input/touchscreen/tsc2007.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 4ab0702..2939355 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c @@ -70,6 +70,7 @@ struct ts_event { struct tsc2007 { struct input_dev *input; char phys[32]; + struct work_struct work; struct hrtimer timer; struct ts_event tc; @@ -173,6 +174,9 @@ static void tsc2007_send_event(void *tsc) dev_dbg(&ts->client->dev, "point(%4d,%4d), pressure (%4u)\n", x, y, rt); + } else { + if (!ts->pendown) + ts->pendown = 1; } hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD), @@ -197,11 +201,19 @@ static int tsc2007_read_values(struct tsc2007 *tsc) return 0; } +static void tsc2007_work(struct work_struct *work) +{ + struct tsc2007 *ts = container_of(work, struct tsc2007, work); + tsc2007_read_values(ts); + tsc2007_send_event(ts); +} + static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) { struct tsc2007 *ts = container_of(handle, struct tsc2007, timer); + unsigned long flags = 0; - spin_lock_irq(&ts->lock); + spin_lock_irqsave(&ts->lock, flags); if (unlikely(!ts->get_pendown_state() && ts->pendown)) { struct input_dev *input = ts->input; @@ -217,12 +229,10 @@ static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) } else { /* pen is still down, continue with the measurement */ dev_dbg(&ts->client->dev, "pen is still down\n"); - - tsc2007_read_values(ts); - tsc2007_send_event(ts); + schedule_work(&ts->work); } - spin_unlock_irq(&ts->lock); + spin_unlock_irqrestore(&ts->lock, flags); return HRTIMER_NORESTART; } @@ -252,7 +262,7 @@ static int tsc2007_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct tsc2007 *ts; - struct tsc2007_platform_data *pdata = pdata = client->dev.platform_data; + struct tsc2007_platform_data *pdata = client->dev.platform_data; struct input_dev *input_dev; int err; @@ -279,6 +289,7 @@ static int tsc2007_probe(struct i2c_client *client, hrtimer_init(&ts->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ts->timer.function = tsc2007_timer; + INIT_WORK(&ts->work, tsc2007_work); spin_lock_init(&ts->lock); -- tg: (091438d..) adx/input/tsc2007 (depends on: adx/master)