On Thu, 22 Aug 2024 14:45:20 +0200
Esteban Blanc <eblanc@xxxxxxxxxxxx> wrote:
> AD4630-24 and AD4630-16 are 2 channels ADCs. Both channels are
> interleaved bit per bit on SDO line.
>
> Signed-off-by: Esteban Blanc <eblanc@xxxxxxxxxxxx>
Ah. I should have looked on in the patch set. This obviously answers
question about plans to support more parts.
It feels like you made various improvements to naming etc
in this patch and then forgot to push them back to the earlier
patches.
Jonathan
> ---
> drivers/iio/adc/ad4030.c | 197 +++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 173 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/iio/adc/ad4030.c b/drivers/iio/adc/ad4030.c
> index e1e1dbf0565c..dbba5287b630 100644
> --- a/drivers/iio/adc/ad4030.c
> +++ b/drivers/iio/adc/ad4030.c
> @@ -32,6 +32,8 @@
> #define AD4030_REG_PRODUCT_ID_H 0x05
> #define AD4030_REG_CHIP_GRADE 0x06
> #define AD4030_REG_CHIP_GRADE_AD4030_24_GRADE 0x10
> +#define AD4030_REG_CHIP_GRADE_AD4630_16_GRADE 0x03
> +#define AD4030_REG_CHIP_GRADE_AD4630_24_GRADE 0x00
> #define AD4030_REG_CHIP_GRADE_MASK_CHIP_GRADE GENMASK(7, 3)
> #define AD4030_REG_SCRATCH_PAD 0x0A
> #define AD4030_REG_SPI_REVISION 0x0B
> @@ -159,10 +161,14 @@ struct ad4030_state {
> struct {
> union {
> u8 raw[AD4030_MAXIMUM_RX_BUFFER_SIZE];
> - struct {
> - s32 val;
> - u32 common;
> - } __packed buffered[AD4030_MAX_HARDWARE_CHANNEL_NB];
> + union {
> + s32 diff[AD4030_MAX_HARDWARE_CHANNEL_NB];
> + struct {
> + s32 diff;
> + u32 common;
> + } __packed
Unless you are going to do something complex later, a union of unions is
just a union so can flatten this I think. Also no need for __packed
for array of single size as those are always packed.
> + buffered_common[AD4030_MAX_HARDWARE_CHANNEL_NB];
This style is confusing to read. If you did need the __packed then it would be
worth pushing to previous line, but you don't.
In general feels like some of these renames should have been in the earlier
patch.
> + };
> };
> } rx_data __aligned(IIO_DMA_MINALIGN);
> };
> @@ -171,7 +177,7 @@ struct ad4030_state {
> .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
> .type = IIO_VOLTAGE, \
> .indexed = 1, \
> - .channel = _idx * 2 + 2, \
> + .channel = _idx * 3 + 2, \
Odd change. Wrong patch?
> .scan_index = _idx * 2 + 1, \
> .extend_name = "Channel" #_idx " common byte part", \
> .scan_type = { \
> @@ -194,8 +200,8 @@ struct ad4030_state {
> BIT(IIO_CHAN_INFO_CALIBSCALE), \
> .type = IIO_VOLTAGE, \
> .indexed = 1, \
> - .channel = _idx * 2, \
> - .channel2 = _idx * 2 + 1, \
> + .channel = _idx * 3, \
> + .channel2 = _idx * 3 + 1, \
> .scan_index = _idx * 2, \
> .extend_name = "Channel" #_idx " differential part", \
> .differential = true, \
> @@ -412,7 +418,7 @@ static int ad4030_set_avg_frame_len(struct iio_dev *dev, unsigned int avg_len)
> static bool ad4030_is_common_byte_asked(struct ad4030_state *st,
> unsigned int mask)
> {
> - /* Common byte channel is after the "real" differential sample channel */
> + /* Common byte channels are after each differential channel */
Just use that comment in earlier patch to avoid noise.
Each can incorporate 1 even if it's a bit odd to read.
> return mask & AD4030_COMMON_BYTE_CHANNELS_FILTER;
> }
>
> +/*
> + * @brief Descramble 2 32bits numbers out of a 64bits. The bits are interleaved:
> + * 1 bit for first number, 1 bit for the second, and so on...
> + */
> +static void ad4030_extract_interleaved(u8 *src, u32 *ch0, u32 *ch1)
> +{
> + u8 h0, h1, l0, l1;
> + u32 out0, out1;
> + u8 *out0_raw = (u8 *)&out0;
> + u8 *out1_raw = (u8 *)&out1;
> +
> + for (int i = 0; i < 4; i++) {
> + h0 = src[i * 2];
> + l1 = src[i * 2 + 1];
> + h1 = h0 << 1;
> + l0 = l1 >> 1;
> +
> + h0 &= 0xAA;
> + l0 &= 0x55;
> + h1 &= 0xAA;
> + l1 &= 0x55;
> +
> + h0 = (h0 | h0 << 001) & 0xCC;
> + h1 = (h1 | h1 << 001) & 0xCC;
> + l0 = (l0 | l0 >> 001) & 0x33;
> + l1 = (l1 | l1 >> 001) & 0x33;
> + h0 = (h0 | h0 << 002) & 0xF0;
> + h1 = (h1 | h1 << 002) & 0xF0;
> + l0 = (l0 | l0 >> 002) & 0x0F;
> + l1 = (l1 | l1 >> 002) & 0x0F;
> +
> + out0_raw[i] = h0 | l0;
> + out1_raw[i] = h1 | l1;
> + }
> +
> + *ch0 = out0;
> + *ch1 = out1;
> +}
> +
> static int ad4030_conversion(struct ad4030_state *st,
> const struct iio_chan_spec *chan)
> {
> @@ -460,12 +517,21 @@ static int ad4030_conversion(struct ad4030_state *st,
> if (ret)
> return ret;
>
> - if (st->mode != AD4030_OUT_DATA_MD_24_DIFF_8_COM)
> + if (st->chip->num_channels == 2)
> + ad4030_extract_interleaved(st->rx_data.raw,
> + &st->rx_data.diff[0],
> + &st->rx_data.diff[1]);
> +
> + if (st->mode != AD4030_OUT_DATA_MD_16_DIFF_8_COM &&
> + st->mode != AD4030_OUT_DATA_MD_24_DIFF_8_COM)
> return 0;
>
> byte_index = BITS_TO_BYTES(chan->scan_type.realbits);
> - for (i = 0; i < st->chip->num_channels; i++)
> - st->rx_data.buffered[i].common = ((u8 *)&st->rx_data.buffered[i].val)[byte_index];
> + /* Doing it backward to avoid overlap when reordering */
> + for (i = st->chip->num_channels - 1; i > 0; i--) {
> + st->rx_data.buffered_common[i].diff = st->rx_data.diff[i];
> + st->rx_data.buffered_common[i].common = ((u8 *)&st->rx_data.diff[i])[byte_index];
> + }
I wonder if doing it in place is actually worthwhile. Maybe unpack into a second
array? That is still fairly small and may make code easier to read.
>
> return 0;
> }
...
>
> +static const unsigned long ad4630_channel_masks[] = {
> + /* Differential only */
> + BIT(0) | BIT(2),
> + /* Differential with common byte */
> + GENMASK(3, 0),
The packing of data isn't going to be good. How bad to shuffle
to put the two small channels next to each other?
Seems like it means you will want to combine your deinterleave
and channel specific handling above, which is a bit fiddly but
not much worse than current code.
It only matters if you have timestamps though as otherwise
the 8 byte alignment will force 6 bytes of packing in one
place vs the 3 this gives in two places.
I guess maybe not worth doing unless you plan to combine
this with an offload engine in which case the timestamps will
probably be disabled and the 12 byte scan length will be preferable
to 16 bytes.
> + 0,
> +};
> +
> static const struct iio_scan_type ad4030_24_scan_types[] = {
> - [AD4030_SCAN_TYPE_NORMAL] = {
> + [AD4030_OUT_DATA_MD_24_DIFF] = {
Name it this way in the first place.
> .sign = 's',
> .storagebits = 32,
> .realbits = 24,
> @@ -908,6 +1002,23 @@ static const struct iio_scan_type ad4030_24_scan_types[] = {
> },
> };
>
> +static const struct iio_scan_type ad4030_16_scan_types[] = {
> + [AD4030_SCAN_TYPE_NORMAL] = {
> + .sign = 's',
> + .storagebits = 32,
> + .realbits = 16,
> + .shift = 16,
> + .endianness = IIO_BE,
> + },
> + [AD4030_SCAN_TYPE_AVG] = {
> + .sign = 's',
> + .storagebits = 32,
> + .realbits = 30,
> + .shift = 2,
> + .endianness = IIO_BE,
> + }
> +};
> +
