Commit b0fc6783 authored by Stefan Popa's avatar Stefan Popa Committed by Jonathan Cameron
Browse files

iio: accel: adxl372: Add support for FIFO peak mode 



By default, if all three channels (x, y, z) are enabled, sample sets of
concurrent 3-axis data is stored in the FIFO. This patch adds the option
to configure the FIFO to store peak acceleration (x, y and z) of every
over-threshold event. When pushing to iio buffer we push only enabled
axis data.

Currently the driver configures adxl372 to work in loop mode.
The inactivity and activity timings  decide how fast the chip
will loop through the awake and waiting states and the
thresholds on x,y,z axis decide when activity or inactivity
will be detected.

This patch adds standard events sysfs entries for the inactivity
and activity timings: thresh_falling_period/thresh_rising_period
and for the in_accel_x_thresh_falling/rising_value.

Signed-off-by: default avatarStefan Popa <stefan.popa@analog.com>
Signed-off-by: default avatarAlexandru Tachici <alexandru.tachici@analog.com>
Link: https://lore.kernel.org/r/20200810093257.65929-2-alexandru.tachici@analog.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 50677d28

drivers/iio/accel/adxl372.c

+299 −12
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright 2018 Analog Devices Inc.

 */



#include <linux/bitfield.h>

#include <linux/bitops.h>

#include <linux/interrupt.h>

#include <linux/irq.h>
@@ -113,6 +114,11 @@ 
#define ADXL372_STATUS_1_AWAKE(x)		(((x) >> 6) & 0x1)

#define ADXL372_STATUS_1_ERR_USR_REGS(x)	(((x) >> 7) & 0x1)



/* ADXL372_STATUS_2 */

#define ADXL372_STATUS_2_INACT(x)		(((x) >> 4) & 0x1)

#define ADXL372_STATUS_2_ACT(x)			(((x) >> 5) & 0x1)

#define ADXL372_STATUS_2_AC2(x)			(((x) >> 6) & 0x1)



/* ADXL372_INT1_MAP */

#define ADXL372_INT1_MAP_DATA_RDY_MSK		BIT(0)

#define ADXL372_INT1_MAP_DATA_RDY_MODE(x)	(((x) & 0x1) << 0)
@@ -131,8 +137,17 @@ 
#define ADXL372_INT1_MAP_LOW_MSK		BIT(7)

#define ADXL372_INT1_MAP_LOW_MODE(x)		(((x) & 0x1) << 7)



/* ADX372_THRESH */

#define ADXL372_THRESH_VAL_H_MSK	GENMASK(10, 3)

#define ADXL372_THRESH_VAL_H_SEL(x)	FIELD_GET(ADXL372_THRESH_VAL_H_MSK, x)

#define ADXL372_THRESH_VAL_L_MSK	GENMASK(2, 0)

#define ADXL372_THRESH_VAL_L_SEL(x)	FIELD_GET(ADXL372_THRESH_VAL_L_MSK, x)



/* The ADXL372 includes a deep, 512 sample FIFO buffer */

#define ADXL372_FIFO_SIZE			512

#define ADXL372_X_AXIS_EN(x)			((x) & BIT(0))

#define ADXL372_Y_AXIS_EN(x)			((x) & BIT(1))

#define ADXL372_Z_AXIS_EN(x)			((x) & BIT(2))



/*

 * At +/- 200g with 12-bit resolution, scale is computed as:
@@ -222,6 +237,20 @@ static const struct adxl372_axis_lookup adxl372_axis_lookup_table[] = { 
	{ BIT(0) | BIT(1) | BIT(2), ADXL372_XYZ_FIFO },

};



static const struct iio_event_spec adxl372_events[] = {

	{

		.type = IIO_EV_TYPE_THRESH,

		.dir = IIO_EV_DIR_RISING,

		.mask_separate = BIT(IIO_EV_INFO_VALUE),

		.mask_shared_by_all = BIT(IIO_EV_INFO_PERIOD) | BIT(IIO_EV_INFO_ENABLE),

	}, {

		.type = IIO_EV_TYPE_THRESH,

		.dir = IIO_EV_DIR_FALLING,

		.mask_separate = BIT(IIO_EV_INFO_VALUE),

		.mask_shared_by_all = BIT(IIO_EV_INFO_PERIOD) | BIT(IIO_EV_INFO_ENABLE),

	},

};



#define ADXL372_ACCEL_CHANNEL(index, reg, axis) {			\

	.type = IIO_ACCEL,						\

	.address = reg,							\
@@ -239,6 +268,8 @@ static const struct adxl372_axis_lookup adxl372_axis_lookup_table[] = { 
		.shift = 4,						\

		.endianness = IIO_BE,					\

	},								\

	.event_spec = adxl372_events,					\

	.num_event_specs = ARRAY_SIZE(adxl372_events)			\

}



static const struct iio_chan_spec adxl372_channels[] = {
@@ -252,8 +283,10 @@ struct adxl372_state { 
	struct device			*dev;

	struct regmap			*regmap;

	struct iio_trigger		*dready_trig;

	struct iio_trigger		*peak_datardy_trig;

	enum adxl372_fifo_mode		fifo_mode;

	enum adxl372_fifo_format	fifo_format;

	unsigned int			fifo_axis_mask;

	enum adxl372_op_mode		op_mode;

	enum adxl372_act_proc_mode	act_proc_mode;

	enum adxl372_odr		odr;
@@ -261,10 +294,12 @@ struct adxl372_state { 
	u32				act_time_ms;

	u32				inact_time_ms;

	u8				fifo_set_size;

	u8				int1_bitmask;

	u8				int2_bitmask;

	unsigned long			int1_bitmask;

	unsigned long			int2_bitmask;

	u16				watermark;

	__be16				fifo_buf[ADXL372_FIFO_SIZE];

	bool				peak_fifo_mode_en;

	struct mutex			threshold_m; /* lock for threshold */

};



static const unsigned long adxl372_channel_masks[] = {
@@ -276,6 +311,46 @@ static const unsigned long adxl372_channel_masks[] = { 
	0

};



static ssize_t adxl372_read_threshold_value(struct iio_dev *indio_dev, unsigned int addr,

					    u16 *threshold)

{

	struct adxl372_state *st = iio_priv(indio_dev);

	__be16 raw_regval;

	u16 regval;

	int ret;



	ret = regmap_bulk_read(st->regmap, addr, &raw_regval, sizeof(raw_regval));

	if (ret < 0)

		return ret;



	regval = be16_to_cpu(raw_regval);

	regval >>= 5;



	*threshold = regval;



	return 0;

}



static ssize_t adxl372_write_threshold_value(struct iio_dev *indio_dev, unsigned int addr,

					     u16 threshold)

{

	struct adxl372_state *st = iio_priv(indio_dev);

	int ret;



	mutex_lock(&st->threshold_m);

	ret = regmap_write(st->regmap, addr, ADXL372_THRESH_VAL_H_SEL(threshold));

	if (ret < 0)

		goto unlock;



	ret = regmap_update_bits(st->regmap, addr + 1, GENMASK(7, 5),

				 ADXL372_THRESH_VAL_L_SEL(threshold) << 5);



unlock:

	mutex_unlock(&st->threshold_m);



	return ret;

}



static int adxl372_read_axis(struct adxl372_state *st, u8 addr)

{

	__be16 regval;
@@ -453,8 +528,8 @@ static int adxl372_set_inactivity_time_ms(struct adxl372_state *st, 
}



static int adxl372_set_interrupts(struct adxl372_state *st,

				  unsigned char int1_bitmask,

				  unsigned char int2_bitmask)

				  unsigned long int1_bitmask,

				  unsigned long int2_bitmask)

{

	int ret;
@@ -523,6 +598,39 @@ static int adxl372_get_status(struct adxl372_state *st, 
	return ret;

}



static void adxl372_arrange_axis_data(struct adxl372_state *st, __be16 *sample)

{

	__be16	axis_sample[3];

	int i = 0;



	memset(axis_sample, 0, 3 * sizeof(__be16));

	if (ADXL372_X_AXIS_EN(st->fifo_axis_mask))

		axis_sample[i++] = sample[0];

	if (ADXL372_Y_AXIS_EN(st->fifo_axis_mask))

		axis_sample[i++] = sample[1];

	if (ADXL372_Z_AXIS_EN(st->fifo_axis_mask))

		axis_sample[i++] = sample[2];



	memcpy(sample, axis_sample, 3 * sizeof(__be16));

}



static void adxl372_push_event(struct iio_dev *indio_dev, s64 timestamp, u8 status2)

{

	unsigned int ev_dir = IIO_EV_DIR_NONE;



	if (ADXL372_STATUS_2_ACT(status2))

		ev_dir = IIO_EV_DIR_RISING;



	if (ADXL372_STATUS_2_INACT(status2))

		ev_dir = IIO_EV_DIR_FALLING;



	if (ev_dir != IIO_EV_DIR_NONE)

		iio_push_event(indio_dev,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X_OR_Y_OR_Z,

						  IIO_EV_TYPE_THRESH, ev_dir),

			       timestamp);

}



static irqreturn_t adxl372_trigger_handler(int irq, void  *p)

{

	struct iio_poll_func *pf = p;
@@ -536,6 +644,8 @@ static irqreturn_t adxl372_trigger_handler(int irq, void *p) 
	if (ret < 0)

		goto err;



	adxl372_push_event(indio_dev, iio_get_time_ns(indio_dev), status2);



	if (st->fifo_mode != ADXL372_FIFO_BYPASSED &&

	    ADXL372_STATUS_1_FIFO_FULL(status1)) {

		/*
@@ -554,9 +664,13 @@ static irqreturn_t adxl372_trigger_handler(int irq, void *p) 
			goto err;



		/* Each sample is 2 bytes */

		for (i = 0; i < fifo_entries; i += st->fifo_set_size)

		for (i = 0; i < fifo_entries; i += st->fifo_set_size) {

			/* filter peak detection data */

			if (st->peak_fifo_mode_en)

				adxl372_arrange_axis_data(st, &st->fifo_buf[i]);

			iio_push_to_buffers(indio_dev, &st->fifo_buf[i]);

		}

	}

err:

	iio_trigger_notify_done(indio_dev->trig);

	return IRQ_HANDLED;
@@ -723,6 +837,129 @@ static int adxl372_write_raw(struct iio_dev *indio_dev, 
	}

}



static int adxl372_read_event_value(struct iio_dev *indio_dev, const struct iio_chan_spec *chan,

				    enum iio_event_type type, enum iio_event_direction dir,

				    enum iio_event_info info, int *val, int *val2)

{

	struct adxl372_state *st = iio_priv(indio_dev);

	unsigned int addr;

	u16 raw_value;

	int ret;



	switch (info) {

	case IIO_EV_INFO_VALUE:

		switch (dir) {

		case IIO_EV_DIR_RISING:

			addr = ADXL372_X_THRESH_ACT_H + 2 * chan->scan_index;

			ret = adxl372_read_threshold_value(indio_dev, addr, &raw_value);

			if (ret < 0)

				return ret;

			*val = raw_value * ADXL372_USCALE;

			*val2 = 1000000;

			return IIO_VAL_FRACTIONAL;

		case IIO_EV_DIR_FALLING:

			addr = ADXL372_X_THRESH_INACT_H + 2 * chan->scan_index;

			ret =  adxl372_read_threshold_value(indio_dev, addr, &raw_value);

			if (ret < 0)

				return ret;

			*val = raw_value * ADXL372_USCALE;

			*val2 = 1000000;

			return IIO_VAL_FRACTIONAL;

		default:

			return -EINVAL;

		}

	case IIO_EV_INFO_PERIOD:

		switch (dir) {

		case IIO_EV_DIR_RISING:

			*val = st->act_time_ms;

			*val2 = 1000;

			return IIO_VAL_FRACTIONAL;

		case IIO_EV_DIR_FALLING:

			*val = st->inact_time_ms;

			*val2 = 1000;

			return IIO_VAL_FRACTIONAL;

		default:

			return -EINVAL;

		}

	default:

		return -EINVAL;

	}

}



static int adxl372_write_event_value(struct iio_dev *indio_dev, const struct iio_chan_spec *chan,

				     enum iio_event_type type, enum iio_event_direction dir,

				     enum iio_event_info info, int val, int val2)

{

	struct adxl372_state *st = iio_priv(indio_dev);

	unsigned int val_ms;

	unsigned int addr;

	u16 raw_val;



	switch (info) {

	case IIO_EV_INFO_VALUE:

		raw_val = DIV_ROUND_UP(val * 1000000, ADXL372_USCALE);

		switch (dir) {

		case IIO_EV_DIR_RISING:

			addr = ADXL372_X_THRESH_ACT_H + 2 * chan->scan_index;

			return adxl372_write_threshold_value(indio_dev, addr, raw_val);

		case IIO_EV_DIR_FALLING:

			addr = ADXL372_X_THRESH_INACT_H + 2 * chan->scan_index;

			return adxl372_write_threshold_value(indio_dev, addr, raw_val);

		default:

			return -EINVAL;

		}

	case IIO_EV_INFO_PERIOD:

		val_ms = val * 1000 + DIV_ROUND_UP(val2, 1000);

		switch (dir) {

		case IIO_EV_DIR_RISING:

			return adxl372_set_activity_time_ms(st, val_ms);

		case IIO_EV_DIR_FALLING:

			return adxl372_set_inactivity_time_ms(st, val_ms);

		default:

			return -EINVAL;

		}

	default:

		return -EINVAL;

	}

}



static int adxl372_read_event_config(struct iio_dev *indio_dev, const struct iio_chan_spec *chan,

				     enum iio_event_type type, enum iio_event_direction dir)

{

	struct adxl372_state *st = iio_priv(indio_dev);



	switch (dir) {

	case IIO_EV_DIR_RISING:

		return FIELD_GET(ADXL372_INT1_MAP_ACT_MSK, st->int1_bitmask);

	case IIO_EV_DIR_FALLING:

		return FIELD_GET(ADXL372_INT1_MAP_INACT_MSK, st->int1_bitmask);

	default:

		return -EINVAL;

	}

}



static int adxl372_write_event_config(struct iio_dev *indio_dev, const struct iio_chan_spec *chan,

				      enum iio_event_type type, enum iio_event_direction dir,

				      int state)

{

	struct adxl372_state *st = iio_priv(indio_dev);



	switch (dir) {

	case IIO_EV_DIR_RISING:

		set_mask_bits(&st->int1_bitmask, ADXL372_INT1_MAP_ACT_MSK,

			      ADXL372_INT1_MAP_ACT_MODE(state));

		break;

	case IIO_EV_DIR_FALLING:

		set_mask_bits(&st->int1_bitmask, ADXL372_INT1_MAP_INACT_MSK,

			      ADXL372_INT1_MAP_INACT_MODE(state));

		break;

	default:

		return -EINVAL;

	}



	return adxl372_set_interrupts(st, st->int1_bitmask, 0);

}



static ssize_t adxl372_show_filter_freq_avail(struct device *dev,

					      struct device_attribute *attr,

					      char *buf)
@@ -795,7 +1032,8 @@ static int adxl372_buffer_postenable(struct iio_dev *indio_dev) 
	unsigned int mask;

	int i, ret;



	ret = adxl372_set_interrupts(st, ADXL372_INT1_MAP_FIFO_FULL_MSK, 0);

	st->int1_bitmask |= ADXL372_INT1_MAP_FIFO_FULL_MSK;

	ret = adxl372_set_interrupts(st, st->int1_bitmask, 0);

	if (ret < 0)

		return ret;
@@ -810,13 +1048,22 @@ static int adxl372_buffer_postenable(struct iio_dev *indio_dev) 
		return -EINVAL;



	st->fifo_format = adxl372_axis_lookup_table[i].fifo_format;

	st->fifo_axis_mask = adxl372_axis_lookup_table[i].bits;

	st->fifo_set_size = bitmap_weight(indio_dev->active_scan_mask,

					  indio_dev->masklength);



	/* Configure the FIFO to store sets of impact event peak. */

	if (st->peak_fifo_mode_en) {

		st->fifo_set_size = 3;

		st->fifo_format = ADXL372_XYZ_PEAK_FIFO;

	}



	/*

	 * The 512 FIFO samples can be allotted in several ways, such as:

	 * 170 sample sets of concurrent 3-axis data

	 * 256 sample sets of concurrent 2-axis data (user selectable)

	 * 512 sample sets of single-axis data

	 * 170 sets of impact event peak (x, y, z)

	 */

	if ((st->watermark * st->fifo_set_size) > ADXL372_FIFO_SIZE)

		st->watermark = (ADXL372_FIFO_SIZE  / st->fifo_set_size);
@@ -826,7 +1073,8 @@ static int adxl372_buffer_postenable(struct iio_dev *indio_dev) 
	ret = adxl372_configure_fifo(st);

	if (ret < 0) {

		st->fifo_mode = ADXL372_FIFO_BYPASSED;

		adxl372_set_interrupts(st, 0, 0);

		st->int1_bitmask &= ~ADXL372_INT1_MAP_FIFO_FULL_MSK;

		adxl372_set_interrupts(st, st->int1_bitmask, 0);

		return ret;

	}
@@ -837,7 +1085,8 @@ static int adxl372_buffer_predisable(struct iio_dev *indio_dev) 
{

	struct adxl372_state *st = iio_priv(indio_dev);



	adxl372_set_interrupts(st, 0, 0);

	st->int1_bitmask &= ~ADXL372_INT1_MAP_FIFO_FULL_MSK;

	adxl372_set_interrupts(st, st->int1_bitmask, 0);

	st->fifo_mode = ADXL372_FIFO_BYPASSED;

	adxl372_configure_fifo(st);
@@ -854,12 +1103,11 @@ static int adxl372_dready_trig_set_state(struct iio_trigger *trig, 
{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);

	struct adxl372_state *st = iio_priv(indio_dev);

	unsigned long int mask = 0;



	if (state)

		mask = ADXL372_INT1_MAP_FIFO_FULL_MSK;

		st->int1_bitmask |= ADXL372_INT1_MAP_FIFO_FULL_MSK;



	return adxl372_set_interrupts(st, mask, 0);

	return adxl372_set_interrupts(st, st->int1_bitmask, 0);

}



static int adxl372_validate_trigger(struct iio_dev *indio_dev,
@@ -867,7 +1115,7 @@ static int adxl372_validate_trigger(struct iio_dev *indio_dev, 
{

	struct adxl372_state *st = iio_priv(indio_dev);



	if (st->dready_trig != trig)

	if (st->dready_trig != trig && st->peak_datardy_trig != trig)

		return -EINVAL;



	return 0;
@@ -878,6 +1126,25 @@ static const struct iio_trigger_ops adxl372_trigger_ops = { 
	.set_trigger_state = adxl372_dready_trig_set_state,

};



static int adxl372_peak_dready_trig_set_state(struct iio_trigger *trig,

					      bool state)

{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);

	struct adxl372_state *st = iio_priv(indio_dev);



	if (state)

		st->int1_bitmask |= ADXL372_INT1_MAP_FIFO_FULL_MSK;



	st->peak_fifo_mode_en = state;



	return adxl372_set_interrupts(st, st->int1_bitmask, 0);

}



static const struct iio_trigger_ops adxl372_peak_data_trigger_ops = {

	.validate_device = &iio_trigger_validate_own_device,

	.set_trigger_state = adxl372_peak_dready_trig_set_state,

};



static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("400 800 1600 3200 6400");

static IIO_DEVICE_ATTR(in_accel_filter_low_pass_3db_frequency_available,

		       0444, adxl372_show_filter_freq_avail, NULL, 0);
@@ -897,6 +1164,10 @@ static const struct iio_info adxl372_info = { 
	.attrs = &adxl372_attrs_group,

	.read_raw = adxl372_read_raw,

	.write_raw = adxl372_write_raw,

	.read_event_config = adxl372_read_event_config,

	.write_event_config = adxl372_write_event_config,

	.read_event_value = adxl372_read_event_value,

	.write_event_value = adxl372_write_event_value,

	.debugfs_reg_access = &adxl372_reg_access,

	.hwfifo_set_watermark = adxl372_set_watermark,

};
@@ -925,6 +1196,8 @@ int adxl372_probe(struct device *dev, struct regmap *regmap, 
	st->regmap = regmap;

	st->irq = irq;



	mutex_init(&st->threshold_m);



	indio_dev->channels = adxl372_channels;

	indio_dev->num_channels = ARRAY_SIZE(adxl372_channels);

	indio_dev->available_scan_masks = adxl372_channel_masks;
@@ -955,13 +1228,27 @@ int adxl372_probe(struct device *dev, struct regmap *regmap, 
		if (st->dready_trig == NULL)

			return -ENOMEM;



		st->peak_datardy_trig = devm_iio_trigger_alloc(dev,

							       "%s-dev%d-peak",

							       indio_dev->name,

							       indio_dev->id);

		if (!st->peak_datardy_trig)

			return -ENOMEM;



		st->dready_trig->ops = &adxl372_trigger_ops;

		st->peak_datardy_trig->ops = &adxl372_peak_data_trigger_ops;

		st->dready_trig->dev.parent = dev;

		st->peak_datardy_trig->dev.parent = dev;

		iio_trigger_set_drvdata(st->dready_trig, indio_dev);

		iio_trigger_set_drvdata(st->peak_datardy_trig, indio_dev);

		ret = devm_iio_trigger_register(dev, st->dready_trig);

		if (ret < 0)

			return ret;



		ret = devm_iio_trigger_register(dev, st->peak_datardy_trig);

		if (ret < 0)

			return ret;



		indio_dev->trig = iio_trigger_get(st->dready_trig);



		ret = devm_request_threaded_irq(dev, st->irq,

CRA Git | Maintained and supported by SUSTech CRA and CCSE