| Message ID | 20200424051818.6408-4-alexandru.ardelean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: scan_mask rework to track enabled channels on per-channel basis | expand |
On Fri, 24 Apr 2020 08:18:17 +0300 Alexandru Ardelean <alexandru.ardelean@analog.com> wrote: > From: Lars-Peter Clausen <lars@metafoo.de> > > Currently each IIO channel has it's own storage element in the data stream > each with its own unique scan index. This works for a lot of use-cases, > but in some is not good enough to represent the hardware accurately. On > those devices multiple separate pieces of information are stored within the > same storage element and the storage element can't be further broken down > into multiple storage elements (e.g. because the data is not aligned). > > This can for example be status bits stored in unused data bits. E.g. a > 14-bit ADC that stores its data in a 16-bit word and uses the two > additional bits to convey status information like for example whether a > overrange condition has happened. Currently this kind of extra status > information is usually ignored and can only be used by applications that > have special knowledge about the connected device and its data layout. Hmm. The problem with this (and the reason I have resisted this in the past) is that this fundamentally breaks the existing ABI. Whilst we have never explicitly stated that this can't be done (I think) a lot of code may assume it. Are we sure this doesn't break existing userspace in weird and wonderful ways? I'm sure someone does stuff 'in place' on the incoming data streams for example which this would break. Also does the demux work with these if we have multiple consumers? Seems unlikely that it will do it efficiently if at all. J > > In addition to that some might also have data channels with less than 8 > bits that get packed into the same storage element. > > Allow two or more channels to use the same scan index, if they their > storage element does have the same size. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> > --- > drivers/iio/industrialio-core.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index f4daf19f2a3b..cdf59a51c917 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -1651,6 +1651,16 @@ static const struct file_operations iio_buffer_fileops = { > .compat_ioctl = compat_ptr_ioctl, > }; > > +static bool iio_chan_same_size(const struct iio_chan_spec *a, > + const struct iio_chan_spec *b) > +{ > + if (a->scan_type.storagebits != b->scan_type.storagebits) > + return false; > + if (a->scan_type.repeat != b->scan_type.repeat) > + return false; > + return true; > +} > + > static int iio_check_unique_scan_index(struct iio_dev *indio_dev) > { > int i, j; > @@ -1662,13 +1672,16 @@ static int iio_check_unique_scan_index(struct iio_dev *indio_dev) > for (i = 0; i < indio_dev->num_channels - 1; i++) { > if (channels[i].scan_index < 0) > continue; > - for (j = i + 1; j < indio_dev->num_channels; j++) > - if (channels[i].scan_index == channels[j].scan_index) { > - dev_err(&indio_dev->dev, > - "Duplicate scan index %d\n", > - channels[i].scan_index); > - return -EINVAL; > - } > + for (j = i + 1; j < indio_dev->num_channels; j++) { > + if (channels[i].scan_index != channels[j].scan_index) > + continue; > + if (iio_chan_same_size(&channels[i], &channels[j])) > + continue; > + dev_err(&indio_dev->dev, > + "Duplicate scan index %d\n", > + channels[i].scan_index); > + return -EINVAL; > + } > } > > return 0;
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index f4daf19f2a3b..cdf59a51c917 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1651,6 +1651,16 @@ static const struct file_operations iio_buffer_fileops = { .compat_ioctl = compat_ptr_ioctl, }; +static bool iio_chan_same_size(const struct iio_chan_spec *a, + const struct iio_chan_spec *b) +{ + if (a->scan_type.storagebits != b->scan_type.storagebits) + return false; + if (a->scan_type.repeat != b->scan_type.repeat) + return false; + return true; +} + static int iio_check_unique_scan_index(struct iio_dev *indio_dev) { int i, j; @@ -1662,13 +1672,16 @@ static int iio_check_unique_scan_index(struct iio_dev *indio_dev) for (i = 0; i < indio_dev->num_channels - 1; i++) { if (channels[i].scan_index < 0) continue; - for (j = i + 1; j < indio_dev->num_channels; j++) - if (channels[i].scan_index == channels[j].scan_index) { - dev_err(&indio_dev->dev, - "Duplicate scan index %d\n", - channels[i].scan_index); - return -EINVAL; - } + for (j = i + 1; j < indio_dev->num_channels; j++) { + if (channels[i].scan_index != channels[j].scan_index) + continue; + if (iio_chan_same_size(&channels[i], &channels[j])) + continue; + dev_err(&indio_dev->dev, + "Duplicate scan index %d\n", + channels[i].scan_index); + return -EINVAL; + } } return 0;