UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:iio:accel:lis3l02dq move to threaded trigger handling. 

V2: Cleaned up handling of name string.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-05-18 14:41:22 +01:00 committed by Greg Kroah-Hartman
parent 8384d9573e
commit d1dbf01128
3 changed files with 56 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/iio/accel/lis3l02dq.h
View File

@ -150,7 +150,6 @@ Form of high byte dependent on justification set in ctrl reg */
* struct lis3l02dq_state - device instance specific data * struct lis3l02dq_state - device instance specific data
* @helper: data and func pointer allowing generic functions * @helper: data and func pointer allowing generic functions
* @us: actual spi_device * @us: actual spi_device
* @inter: used to check if new interrupt has been triggered
* @trig: data ready trigger registered with iio * @trig: data ready trigger registered with iio
* @tx: transmit buffer * @tx: transmit buffer
* @rx: receive buffer * @rx: receive buffer
@ -159,7 +158,6 @@ Form of high byte dependent on justification set in ctrl reg */
struct lis3l02dq_state { struct lis3l02dq_state {
struct iio_sw_ring_helper_state help; struct iio_sw_ring_helper_state help;
struct spi_device *us; struct spi_device *us;
bool inter;
struct iio_trigger *trig; struct iio_trigger *trig;
u8 *tx; u8 *tx;
u8 *rx; u8 *rx;

6
drivers/staging/iio/accel/lis3l02dq_core.c
View File

@ -15,15 +15,12 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/workqueue.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/list.h>
#include "../iio.h" #include "../iio.h"
#include "../sysfs.h" #include "../sysfs.h"
@ -724,7 +721,6 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
} }
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) { if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
st->inter = 0;
ret = lis3l02dq_probe_trigger(st->help.indio_dev); ret = lis3l02dq_probe_trigger(st->help.indio_dev);
if (ret) if (ret)
goto error_uninitialize_ring; goto error_uninitialize_ring;
@ -800,8 +796,6 @@ static int lis3l02dq_remove(struct spi_device *spi)
if (ret) if (ret)
goto err_ret; goto err_ret;
flush_scheduled_work();
lis3l02dq_remove_trigger(indio_dev); lis3l02dq_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev->ring); iio_ring_buffer_unregister(indio_dev->ring);
lis3l02dq_unconfigure_ring(indio_dev); lis3l02dq_unconfigure_ring(indio_dev);

139
drivers/staging/iio/accel/lis3l02dq_ring.c
View File

@ -1,13 +1,11 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/workqueue.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "../iio.h" #include "../iio.h"
@ -28,37 +26,6 @@ static inline u16 combine_8_to_16(u8 lower, u8 upper)
return _lower | (_upper << 8); return _lower | (_upper << 8);
} }
/**
* lis3l02dq_poll_func_th() top half interrupt handler called by trigger
* @private_data: iio_dev
**/
static void lis3l02dq_poll_func_th(struct iio_dev *indio_dev, s64 time)
{
struct iio_sw_ring_helper_state *h
= iio_dev_get_devdata(indio_dev);
struct lis3l02dq_state *st = lis3l02dq_h_to_s(h);
/* in this case we need to slightly extend the helper function */
iio_sw_poll_func_th(indio_dev, time);
/* Indicate that this interrupt is being handled */
/* Technically this is trigger related, but without this
* handler running there is currently now way for the interrupt
* to clear.
*/
st->inter = 1;
}
/**
* lis3l02dq_data_rdy_trig_poll() the event handler for the data rdy trig
**/
static irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
{
disable_irq_nosync(irq);
iio_trigger_poll(private, iio_get_time_ns());
return IRQ_HANDLED;
}
/** /**
* lis3l02dq_read_accel_from_ring() individual acceleration read from ring * lis3l02dq_read_accel_from_ring() individual acceleration read from ring
**/ **/
@ -153,15 +120,16 @@ static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array)
return ret; return ret;
} }
static void lis3l02dq_trigger_bh_to_ring(struct work_struct *work_s) static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
{ {
struct iio_sw_ring_helper_state *h struct iio_poll_func *pf = p;
= container_of(work_s, struct iio_sw_ring_helper_state, struct iio_dev *indio_dev = pf->private_data;
work_trigger_to_ring); struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev);
struct lis3l02dq_state *st = lis3l02dq_h_to_s(h);
st->inter = 0; h->last_timestamp = pf->timestamp;
iio_sw_trigger_bh_to_ring(work_s); iio_sw_trigger_to_ring(h);
return IRQ_HANDLED;
} }
static int lis3l02dq_get_ring_element(struct iio_sw_ring_helper_state *h, static int lis3l02dq_get_ring_element(struct iio_sw_ring_helper_state *h,
@ -236,7 +204,7 @@ __lis3l02dq_write_data_ready_config(struct device *dev, bool state)
valold = ret | valold = ret |
LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION; LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION;
ret = request_irq(st->us->irq, ret = request_irq(st->us->irq,
lis3l02dq_data_rdy_trig_poll, &iio_trigger_generic_data_rdy_poll,
IRQF_TRIGGER_RISING, "lis3l02dq_datardy", IRQF_TRIGGER_RISING, "lis3l02dq_datardy",
st->trig); st->trig);
if (ret) if (ret)
@ -272,10 +240,10 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig,
__lis3l02dq_write_data_ready_config(&st->help.indio_dev->dev, state); __lis3l02dq_write_data_ready_config(&st->help.indio_dev->dev, state);
if (state == false) { if (state == false) {
/* possible quirk with handler currently worked around /*
by ensuring the work queue is empty */ * A possible quirk with teh handler is currently worked around
flush_scheduled_work(); * by ensuring outstanding read events are cleared.
/* Clear any outstanding ready events */ */
ret = lis3l02dq_read_all(st, NULL); ret = lis3l02dq_read_all(st, NULL);
} }
lis3l02dq_spi_read_reg_8(st->help.indio_dev, lis3l02dq_spi_read_reg_8(st->help.indio_dev,
@ -298,32 +266,23 @@ static const struct attribute_group lis3l02dq_trigger_attr_group = {
/** /**
* lis3l02dq_trig_try_reen() try renabling irq for data rdy trigger * lis3l02dq_trig_try_reen() try renabling irq for data rdy trigger
* @trig: the datardy trigger * @trig: the datardy trigger
* */
* As the trigger may occur on any data element being updated it is
* really rather likely to occur during the read from the previous
* trigger event. The only way to discover if this has occurred on
* boards not supporting level interrupts is to take a look at the line.
* If it is indicating another interrupt and we don't seem to have a
* handler looking at it, then we need to notify the core that we need
* to tell the triggering core to try reading all these again.
**/
static int lis3l02dq_trig_try_reen(struct iio_trigger *trig) static int lis3l02dq_trig_try_reen(struct iio_trigger *trig)
{ {
struct lis3l02dq_state *st = trig->private_data; struct lis3l02dq_state *st = trig->private_data;
enable_irq(st->us->irq); int i;
/* If gpio still high (or high again) */ /* If gpio still high (or high again) */
if (gpio_get_value(irq_to_gpio(st->us->irq))) /* In theory possible we will need to do this several times */
if (st->inter == 0) { for (i = 0; i < 5; i++)
/* already interrupt handler dealing with it */ if (gpio_get_value(irq_to_gpio(st->us->irq)))
disable_irq_nosync(st->us->irq); lis3l02dq_read_all(st, NULL);
if (st->inter == 1) { else
/* interrupt handler snuck in between test break;
* and disable */ if (i == 5)
enable_irq(st->us->irq); printk(KERN_INFO
return 0; "Failed to clear the interrupt for lis3l02dq\n");
}
return -EAGAIN;
}
/* irq reenabled so success! */ /* irq reenabled so success! */
return 0; return 0;
} }
@ -334,17 +293,19 @@ int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
struct iio_sw_ring_helper_state *h struct iio_sw_ring_helper_state *h
= iio_dev_get_devdata(indio_dev); = iio_dev_get_devdata(indio_dev);
struct lis3l02dq_state *st = lis3l02dq_h_to_s(h); struct lis3l02dq_state *st = lis3l02dq_h_to_s(h);
char *name;
st->trig = iio_allocate_trigger(); name = kasprintf(GFP_KERNEL,
if (!st->trig) "lis3l02dq-dev%d",
return -ENOMEM; indio_dev->id);
if (name == NULL) {
st->trig->name = kasprintf(GFP_KERNEL,
"lis3l02dq-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_free_trig; goto error_ret;
}
st->trig = iio_allocate_trigger_named(name);
if (!st->trig) {
ret = -ENOMEM;
goto error_free_name;
} }
st->trig->dev.parent = &st->us->dev; st->trig->dev.parent = &st->us->dev;
@ -355,15 +316,15 @@ int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
st->trig->control_attrs = &lis3l02dq_trigger_attr_group; st->trig->control_attrs = &lis3l02dq_trigger_attr_group;
ret = iio_trigger_register(st->trig); ret = iio_trigger_register(st->trig);
if (ret) if (ret)
goto error_free_trig_name; goto error_free_trig;
return 0; return 0;
error_free_trig_name:
kfree(st->trig->name);
error_free_trig: error_free_trig:
iio_free_trigger(st->trig); iio_free_trigger(st->trig);
error_free_name:
kfree(name);
error_ret:
return ret; return ret;
} }
@ -380,6 +341,7 @@ void lis3l02dq_remove_trigger(struct iio_dev *indio_dev)
void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev) void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev)
{ {
kfree(indio_dev->pollfunc->name);
kfree(indio_dev->pollfunc); kfree(indio_dev->pollfunc);
lis3l02dq_free_buf(indio_dev->ring); lis3l02dq_free_buf(indio_dev->ring);
} }
@ -459,7 +421,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
int ret; int ret;
struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev); struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev);
struct iio_ring_buffer *ring; struct iio_ring_buffer *ring;
INIT_WORK(&h->work_trigger_to_ring, lis3l02dq_trigger_bh_to_ring);
h->get_ring_element = &lis3l02dq_get_ring_element; h->get_ring_element = &lis3l02dq_get_ring_element;
ring = lis3l02dq_alloc_buf(indio_dev); ring = lis3l02dq_alloc_buf(indio_dev);
@ -482,9 +444,20 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
iio_scan_mask_set(ring, 1); iio_scan_mask_set(ring, 1);
iio_scan_mask_set(ring, 2); iio_scan_mask_set(ring, 2);
ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); /* Functions are NULL as we set handler below */
if (ret) indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);
if (indio_dev->pollfunc == NULL) {
ret = -ENOMEM;
goto error_iio_sw_rb_free; goto error_iio_sw_rb_free;
}
indio_dev->pollfunc->private_data = indio_dev;
indio_dev->pollfunc->thread = &lis3l02dq_trigger_handler;
indio_dev->pollfunc->h = &iio_pollfunc_store_time;
indio_dev->pollfunc->type = 0;
indio_dev->pollfunc->name
= kasprintf(GFP_KERNEL, "lis3l02dq_consumer%d", indio_dev->id);
indio_dev->modes |= INDIO_RING_TRIGGERED; indio_dev->modes |= INDIO_RING_TRIGGERED;
return 0; return 0;