* Kwangwoo Lee wrote:
> On Wed, May 6, 2009 at 3:45 PM, Thierry Reding
> <thierry.reding@xxxxxxxxxxxxxxxxx> 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 <thierry.reding@xxxxxxxxxxxxxxxxx>
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 <thierry.reding@xxxxxxxxxxxxxxxxx>
---
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)
