diff options
Diffstat (limited to 'drivers/staging/iio/imu/adis16400_ring.c')
-rw-r--r-- | drivers/staging/iio/imu/adis16400_ring.c | 241 |
1 files changed, 105 insertions, 136 deletions
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c index 33293fba9bcc..2589a7e167e4 100644 --- a/drivers/staging/iio/imu/adis16400_ring.c +++ b/drivers/staging/iio/imu/adis16400_ring.c @@ -9,6 +9,7 @@ #include <linux/slab.h> #include <linux/sysfs.h> #include <linux/list.h> +#include <linux/bitops.h> #include "../iio.h" #include "../sysfs.h" @@ -17,93 +18,6 @@ #include "../trigger.h" #include "adis16400.h" -static IIO_SCAN_EL_C(in0_supply, ADIS16400_SCAN_SUPPLY, - ADIS16400_SUPPLY_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in0_supply, u, 14, 16); - -static IIO_SCAN_EL_C(gyro_x, ADIS16400_SCAN_GYRO_X, ADIS16400_XGYRO_OUT, NULL); -static IIO_SCAN_EL_C(gyro_y, ADIS16400_SCAN_GYRO_Y, ADIS16400_YGYRO_OUT, NULL); -static IIO_SCAN_EL_C(gyro_z, ADIS16400_SCAN_GYRO_Z, ADIS16400_ZGYRO_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(gyro, s, 14, 16); - -static IIO_SCAN_EL_C(accel_x, ADIS16400_SCAN_ACC_X, ADIS16400_XACCL_OUT, NULL); -static IIO_SCAN_EL_C(accel_y, ADIS16400_SCAN_ACC_Y, ADIS16400_YACCL_OUT, NULL); -static IIO_SCAN_EL_C(accel_z, ADIS16400_SCAN_ACC_Z, ADIS16400_ZACCL_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16); - -static IIO_SCAN_EL_C(magn_x, ADIS16400_SCAN_MAGN_X, ADIS16400_XMAGN_OUT, NULL); -static IIO_SCAN_EL_C(magn_y, ADIS16400_SCAN_MAGN_Y, ADIS16400_YMAGN_OUT, NULL); -static IIO_SCAN_EL_C(magn_z, ADIS16400_SCAN_MAGN_Z, ADIS16400_ZMAGN_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(magn, s, 14, 16); - -static IIO_SCAN_EL_C(temp, ADIS16400_SCAN_TEMP, ADIS16400_TEMP_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, s, 12, 16); - -static IIO_SCAN_EL_C(in1, ADIS16400_SCAN_ADC_0, ADIS16400_AUX_ADC, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in1, u, 12, 16); - -static IIO_SCAN_EL_TIMESTAMP(12); -static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64); - -static struct attribute *adis16400_scan_el_attrs[] = { - &iio_scan_el_in0_supply.dev_attr.attr, - &iio_const_attr_in0_supply_index.dev_attr.attr, - &iio_const_attr_in0_supply_type.dev_attr.attr, - &iio_scan_el_gyro_x.dev_attr.attr, - &iio_const_attr_gyro_x_index.dev_attr.attr, - &iio_scan_el_gyro_y.dev_attr.attr, - &iio_const_attr_gyro_y_index.dev_attr.attr, - &iio_scan_el_gyro_z.dev_attr.attr, - &iio_const_attr_gyro_z_index.dev_attr.attr, - &iio_const_attr_gyro_type.dev_attr.attr, - &iio_scan_el_accel_x.dev_attr.attr, - &iio_const_attr_accel_x_index.dev_attr.attr, - &iio_scan_el_accel_y.dev_attr.attr, - &iio_const_attr_accel_y_index.dev_attr.attr, - &iio_scan_el_accel_z.dev_attr.attr, - &iio_const_attr_accel_z_index.dev_attr.attr, - &iio_const_attr_accel_type.dev_attr.attr, - &iio_scan_el_magn_x.dev_attr.attr, - &iio_const_attr_magn_x_index.dev_attr.attr, - &iio_scan_el_magn_y.dev_attr.attr, - &iio_const_attr_magn_y_index.dev_attr.attr, - &iio_scan_el_magn_z.dev_attr.attr, - &iio_const_attr_magn_z_index.dev_attr.attr, - &iio_const_attr_magn_type.dev_attr.attr, - &iio_scan_el_temp.dev_attr.attr, - &iio_const_attr_temp_index.dev_attr.attr, - &iio_const_attr_temp_type.dev_attr.attr, - &iio_scan_el_in1.dev_attr.attr, - &iio_const_attr_in1_index.dev_attr.attr, - &iio_const_attr_in1_type.dev_attr.attr, - &iio_scan_el_timestamp.dev_attr.attr, - &iio_const_attr_timestamp_index.dev_attr.attr, - &iio_const_attr_timestamp_type.dev_attr.attr, - NULL, -}; - -static struct attribute_group adis16400_scan_el_group = { - .attrs = adis16400_scan_el_attrs, - .name = "scan_elements", -}; - -/** - * adis16400_poll_func_th() top half interrupt handler called by trigger - * @private_data: iio_dev - **/ -static void adis16400_poll_func_th(struct iio_dev *indio_dev, s64 time) -{ - struct adis16400_state *st = iio_dev_get_devdata(indio_dev); - st->last_timestamp = time; - schedule_work(&st->work_trigger_to_ring); - /* Indicate that this interrupt is being handled */ - - /* Technically this is trigger related, but without this - * handler running there is currently no way for the interrupt - * to clear. - */ -} - /** * adis16400_spi_read_burst() - read all data registers * @dev: device associated with child of actual device (iio_dev or iio_trig) @@ -113,7 +27,7 @@ static int adis16400_spi_read_burst(struct device *dev, u8 *rx) { struct spi_message msg; struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct adis16400_state *st = iio_dev_get_devdata(indio_dev); + struct adis16400_state *st = iio_priv(indio_dev); u32 old_speed_hz = st->us->max_speed_hz; int ret; @@ -122,12 +36,10 @@ static int adis16400_spi_read_burst(struct device *dev, u8 *rx) .tx_buf = st->tx, .bits_per_word = 8, .len = 2, - .cs_change = 0, }, { .rx_buf = rx, .bits_per_word = 8, .len = 24, - .cs_change = 1, }, }; @@ -152,58 +64,122 @@ static int adis16400_spi_read_burst(struct device *dev, u8 *rx) return ret; } +static const u16 read_all_tx_array[] = { + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_SUPPLY_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_XGYRO_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_YGYRO_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_ZGYRO_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_XACCL_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_YACCL_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_ZACCL_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16350_XTEMP_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16350_YTEMP_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16350_ZTEMP_OUT)), + cpu_to_be16(ADIS16400_READ_REG(ADIS16400_AUX_ADC)), +}; + +static int adis16350_spi_read_all(struct device *dev, u8 *rx) +{ + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct adis16400_state *st = iio_priv(indio_dev); + + struct spi_message msg; + int i, j = 0, ret; + struct spi_transfer *xfers; + + xfers = kzalloc(sizeof(*xfers)*indio_dev->ring->scan_count + 1, + GFP_KERNEL); + if (xfers == NULL) + return -ENOMEM; + + for (i = 0; i < ARRAY_SIZE(read_all_tx_array); i++) + if (indio_dev->ring->scan_mask & (1 << i)) { + xfers[j].tx_buf = &read_all_tx_array[i]; + xfers[j].bits_per_word = 16; + xfers[j].len = 2; + xfers[j + 1].rx_buf = rx + j*2; + j++; + } + xfers[j].bits_per_word = 16; + xfers[j].len = 2; + + spi_message_init(&msg); + for (j = 0; j < indio_dev->ring->scan_count + 1; j++) + spi_message_add_tail(&xfers[j], &msg); + + ret = spi_sync(st->us, &msg); + kfree(xfers); + + return ret; +} + /* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device * specific to be rolled into the core. */ -static void adis16400_trigger_bh_to_ring(struct work_struct *work_s) +static irqreturn_t adis16400_trigger_handler(int irq, void *p) { - struct adis16400_state *st - = container_of(work_s, struct adis16400_state, - work_trigger_to_ring); - struct iio_ring_buffer *ring = st->indio_dev->ring; - - int i = 0; + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->private_data; + struct adis16400_state *st = iio_priv(indio_dev); + struct iio_ring_buffer *ring = indio_dev->ring; + int i = 0, j, ret = 0; s16 *data; - size_t datasize = ring->access.get_bytes_per_datum(ring); + size_t datasize = ring->access->get_bytes_per_datum(ring); + unsigned long mask = ring->scan_mask; data = kmalloc(datasize , GFP_KERNEL); if (data == NULL) { dev_err(&st->us->dev, "memory alloc failed in ring bh"); - return; + return -ENOMEM; } - if (ring->scan_count) - if (adis16400_spi_read_burst(&st->indio_dev->dev, st->rx) >= 0) + if (ring->scan_count) { + if (st->variant->flags & ADIS16400_NO_BURST) { + ret = adis16350_spi_read_all(&indio_dev->dev, st->rx); + if (ret < 0) + return ret; for (; i < ring->scan_count; i++) - data[i] = be16_to_cpup( - (__be16 *)&(st->rx[i*2])); - + data[i] = *(s16 *)(st->rx + i*2); + } else { + ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx); + if (ret < 0) + return ret; + for (; i < indio_dev->ring->scan_count; i++) { + j = __ffs(mask); + mask &= ~(1 << j); + data[i] = be16_to_cpup( + (__be16 *)&(st->rx[j*2])); + } + } + } /* Guaranteed to be aligned with 8 byte boundary */ if (ring->scan_timestamp) - *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp; + *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; + ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp); - ring->access.store_to(ring, - (u8 *) data, - st->last_timestamp); - - iio_trigger_notify_done(st->indio_dev->trig); + iio_trigger_notify_done(indio_dev->trig); kfree(data); - return; + return IRQ_HANDLED; } void adis16400_unconfigure_ring(struct iio_dev *indio_dev) { - kfree(indio_dev->pollfunc); + iio_dealloc_pollfunc(indio_dev->pollfunc); iio_sw_rb_free(indio_dev->ring); } +static const struct iio_ring_setup_ops adis16400_ring_setup_ops = { + .preenable = &iio_sw_ring_preenable, + .postenable = &iio_triggered_ring_postenable, + .predisable = &iio_triggered_ring_predisable, +}; + int adis16400_configure_ring(struct iio_dev *indio_dev) { int ret = 0; - struct adis16400_state *st = indio_dev->dev_data; + struct adis16400_state *st = iio_priv(indio_dev); struct iio_ring_buffer *ring; - INIT_WORK(&st->work_trigger_to_ring, adis16400_trigger_bh_to_ring); ring = iio_sw_rb_allocate(indio_dev); if (!ring) { @@ -212,36 +188,29 @@ int adis16400_configure_ring(struct iio_dev *indio_dev) } indio_dev->ring = ring; /* Effectively select the ring buffer implementation */ - iio_ring_sw_register_funcs(&ring->access); + ring->access = &ring_sw_access_funcs; ring->bpe = 2; - ring->scan_el_attrs = &adis16400_scan_el_group; ring->scan_timestamp = true; - ring->preenable = &iio_sw_ring_preenable; - ring->postenable = &iio_triggered_ring_postenable; - ring->predisable = &iio_triggered_ring_predisable; + ring->setup_ops = &adis16400_ring_setup_ops; ring->owner = THIS_MODULE; - /* Set default scan mode */ - iio_scan_mask_set(ring, iio_scan_el_in0_supply.number); - iio_scan_mask_set(ring, iio_scan_el_gyro_x.number); - iio_scan_mask_set(ring, iio_scan_el_gyro_y.number); - iio_scan_mask_set(ring, iio_scan_el_gyro_z.number); - iio_scan_mask_set(ring, iio_scan_el_accel_x.number); - iio_scan_mask_set(ring, iio_scan_el_accel_y.number); - iio_scan_mask_set(ring, iio_scan_el_accel_z.number); - iio_scan_mask_set(ring, iio_scan_el_magn_x.number); - iio_scan_mask_set(ring, iio_scan_el_magn_y.number); - iio_scan_mask_set(ring, iio_scan_el_magn_z.number); - iio_scan_mask_set(ring, iio_scan_el_temp.number); - iio_scan_mask_set(ring, iio_scan_el_in1.number); - - ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16400_poll_func_th); - if (ret) + ring->scan_mask = st->variant->default_scan_mask; + ring->scan_count = hweight_long(st->variant->default_scan_mask); + + indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, + &adis16400_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "%s_consumer%d", + indio_dev->name, + indio_dev->id); + if (indio_dev->pollfunc == NULL) { + ret = -ENOMEM; goto error_iio_sw_rb_free; + } indio_dev->modes |= INDIO_RING_TRIGGERED; return 0; - error_iio_sw_rb_free: iio_sw_rb_free(indio_dev->ring); return ret; |