diff mbox series

[1/1,SRU,F] UBUNTU: SAUCE: iio: dac: ad5593r: Dynamically set AD5593R channel modes

Message ID 20200915050819.172357-2-acelan.kao@canonical.com
State New
Headers show
Series Dynamically set AD5593R channel modes | expand

Commit Message

AceLan Kao Sept. 15, 2020, 5:08 a.m. UTC
From: William Sung <william.sung@advantech.com.tw>

BugLink: https://bugs.launchpad.net/bugs/1895612

To use ad5593r more flexibly, we use the module parameter to setting the
channel modes dynamically whenever the module probe up. Users can pass
the channel modes to the module parameter for allocating the
functionality of channels as desired.

For example:
* Use in the kernel command line:
Users can add the module parameter in the kernel command line such as

    "ad5593r.ch_mode=88001122"

"88001122" means the channel mode setting for each channel. The most
left side indicates the mode of channel 7, and the most right side
indicates the mode of channel 0.

* Use when manually probe the module:
Similar to the kernel command line usage, users can enter

    "modprobe ad5593r ch_mode=88001122"

to start the ad5593r module with the desired channel mode setting.

v2: Fix the patch description and remove redundant for loop

Signed-off-by: William Sung <william.sung@advantech.com.tw>
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++---
 drivers/iio/dac/ad5592r-base.h |  4 ++++
 drivers/iio/dac/ad5593r.c      | 44 ++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)

Comments

Kleber Souza Sept. 16, 2020, 9:07 a.m. UTC | #1
On 15.09.20 07:08, AceLan Kao wrote:
> From: William Sung <william.sung@advantech.com.tw>
> 
> BugLink: https://bugs.launchpad.net/bugs/1895612
> 
> To use ad5593r more flexibly, we use the module parameter to setting the
> channel modes dynamically whenever the module probe up. Users can pass
> the channel modes to the module parameter for allocating the
> functionality of channels as desired.
> 
> For example:
> * Use in the kernel command line:
> Users can add the module parameter in the kernel command line such as
> 
>     "ad5593r.ch_mode=88001122"
> 
> "88001122" means the channel mode setting for each channel. The most
> left side indicates the mode of channel 7, and the most right side
> indicates the mode of channel 0.
> 
> * Use when manually probe the module:
> Similar to the kernel command line usage, users can enter
> 
>     "modprobe ad5593r ch_mode=88001122"
> 
> to start the ad5593r module with the desired channel mode setting.
> 
> v2: Fix the patch description and remove redundant for loop
> 
> Signed-off-by: William Sung <william.sung@advantech.com.tw>
> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++---
>  drivers/iio/dac/ad5592r-base.h |  4 ++++
>  drivers/iio/dac/ad5593r.c      | 44 ++++++++++++++++++++++++++++++++++
>  3 files changed, 66 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
> index 424922cad1e3..25ff9f5df5dd 100644
> --- a/drivers/iio/dac/ad5592r-base.c
> +++ b/drivers/iio/dac/ad5592r-base.c
> @@ -22,6 +22,10 @@
>  
>  #include "ad5592r-base.h"
>  
> +/* Parameters for dynamic channel mode setting */
> +static u8 update_channel_mode;
> +static u8 new_channel_modes[AD559XR_CHANNEL_NR];
> +
>  static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset)
>  {
>  	struct ad5592r_state *st = gpiochip_get_data(chip);
> @@ -133,7 +137,7 @@ static int ad5592r_gpio_init(struct ad5592r_state *st)
>  
>  	st->gpiochip.label = dev_name(st->dev);
>  	st->gpiochip.base = -1;
> -	st->gpiochip.ngpio = 8;
> +	st->gpiochip.ngpio = AD559XR_CHANNEL_NR;
>  	st->gpiochip.parent = st->dev;
>  	st->gpiochip.can_sleep = true;
>  	st->gpiochip.direction_input = ad5592r_gpio_direction_input;
> @@ -535,6 +539,10 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
>  			st->channel_offstate[reg] = tmp;
>  	}
>  
> +	/* Update default channel modes set by external module */
> +	if (update_channel_mode == 1)
> +		memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes));
> +
>  	channels = devm_kcalloc(st->dev,
>  			1 + 2 * num_channels, sizeof(*channels),
>  			GFP_KERNEL);
> @@ -570,7 +578,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
>  	}
>  
>  	channels[curr_channel].type = IIO_TEMP;
> -	channels[curr_channel].channel = 8;
> +	channels[curr_channel].channel = AD559XR_CHANNEL_NR;
>  	channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
>  				   BIT(IIO_CHAN_INFO_SCALE) |
>  				   BIT(IIO_CHAN_INFO_OFFSET);
> @@ -592,6 +600,13 @@ static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV)
>  		div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]);
>  }
>  
> +void ad5592r_update_default_channel_modes(u8 *new_modes)
> +{
> +	update_channel_mode = 1;
> +	memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR);
> +}
> +EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes);
> +
>  int ad5592r_probe(struct device *dev, const char *name,
>  		const struct ad5592r_rw_ops *ops)
>  {
> @@ -606,7 +621,7 @@ int ad5592r_probe(struct device *dev, const char *name,
>  	st = iio_priv(iio_dev);
>  	st->dev = dev;
>  	st->ops = ops;
> -	st->num_channels = 8;
> +	st->num_channels = AD559XR_CHANNEL_NR;
>  	dev_set_drvdata(dev, iio_dev);
>  
>  	st->reg = devm_regulator_get_optional(dev, "vref");
> diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h
> index 4774e4cd9c11..6fc120dc341e 100644
> --- a/drivers/iio/dac/ad5592r-base.h
> +++ b/drivers/iio/dac/ad5592r-base.h
> @@ -39,6 +39,9 @@ enum ad5592r_registers {
>  #define AD5592R_REG_CTRL_ADC_RANGE	BIT(5)
>  #define AD5592R_REG_CTRL_DAC_RANGE	BIT(4)
>  
> +/* Define quantity of channels of AD5592R/AD5593R */
> +#define AD559XR_CHANNEL_NR		8
> +
>  struct ad5592r_rw_ops {
>  	int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value);
>  	int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value);
> @@ -68,6 +71,7 @@ struct ad5592r_state {
>  	__be16 spi_msg_nop;
>  };
>  
> +void ad5592r_update_default_channel_modes(u8 *new_modes);
>  int ad5592r_probe(struct device *dev, const char *name,
>  		const struct ad5592r_rw_ops *ops);
>  int ad5592r_remove(struct device *dev);
> diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
> index 44ea3b8117d0..7511949278ac 100644
> --- a/drivers/iio/dac/ad5593r.c
> +++ b/drivers/iio/dac/ad5593r.c
> @@ -21,6 +21,10 @@
>  #define AD5593R_MODE_GPIO_READBACK	(6 << 4)
>  #define AD5593R_MODE_REG_READBACK	(7 << 4)
>  
> +/* Parameters for dynamic channel mode setting */
> +static char *ch_mode = "";
> +module_param(ch_mode, charp, 0400);
> +
>  static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value)
>  {
>  	struct i2c_client *i2c = to_i2c_client(st->dev);
> @@ -92,9 +96,49 @@ static const struct ad5592r_rw_ops ad5593r_rw_ops = {
>  	.gpio_read = ad5593r_gpio_read,
>  };
>  
> +static void ad5593r_check_new_channel_mode(void)
> +{
> +	char *new_mode, tmp[2];
> +	u8 new_ch_modes[AD559XR_CHANNEL_NR];
> +	int idx;
> +
> +	if (strlen(ch_mode) != AD559XR_CHANNEL_NR)
> +		return;
> +
> +	new_mode = ch_mode;
> +
> +	/* Check if all channel modes are valid */
> +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> +		switch (new_mode[idx]) {
> +		case '0':
> +		case '1':
> +		case '2':
> +		case '3':
> +		case '8':
> +			continue;
> +		default:
> +			/* Invalid setting exist, ignore the settings */
> +			return;
> +		}
> +	}
> +
> +	/* Set the new modes to ad5592r-base driver to setup the new channel modes */
> +	memset(tmp, 0, 2);
> +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> +		tmp[0] = new_mode[idx];
> +		if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) {
> +			/* Converting error, ignore the settings */
> +			return;
> +		}
> +	}
> +
> +	ad5592r_update_default_channel_modes(new_ch_modes);
> +}
> +
>  static int ad5593r_i2c_probe(struct i2c_client *i2c,
>  		const struct i2c_device_id *id)
>  {
> +	ad5593r_check_new_channel_mode();
>  	return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops);
>  }
>  
>
Stefan Bader Sept. 17, 2020, 8:22 a.m. UTC | #2
On 15.09.20 07:08, AceLan Kao wrote:
> From: William Sung <william.sung@advantech.com.tw>
> 
> BugLink: https://bugs.launchpad.net/bugs/1895612
> 
> To use ad5593r more flexibly, we use the module parameter to setting the
> channel modes dynamically whenever the module probe up. Users can pass
> the channel modes to the module parameter for allocating the
> functionality of channels as desired.
> 
> For example:
> * Use in the kernel command line:
> Users can add the module parameter in the kernel command line such as
> 
>     "ad5593r.ch_mode=88001122"
> 
> "88001122" means the channel mode setting for each channel. The most
> left side indicates the mode of channel 7, and the most right side
> indicates the mode of channel 0.
> 
> * Use when manually probe the module:
> Similar to the kernel command line usage, users can enter
> 
>     "modprobe ad5593r ch_mode=88001122"
> 
> to start the ad5593r module with the desired channel mode setting.
> 
> v2: Fix the patch description and remove redundant for loop
> 
> Signed-off-by: William Sung <william.sung@advantech.com.tw>
> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
> ---

This will introduce a new interface which will not exist anywhere else than just
the one kernel/series this was submitted for. IMO this does not belong into a
generic distro kernel.

I tend to say no to this unless there is some really good reason for it.
Otherwise this needs some approach that works for us and upstream...

-Stefan


>  drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++---
>  drivers/iio/dac/ad5592r-base.h |  4 ++++
>  drivers/iio/dac/ad5593r.c      | 44 ++++++++++++++++++++++++++++++++++
>  3 files changed, 66 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
> index 424922cad1e3..25ff9f5df5dd 100644
> --- a/drivers/iio/dac/ad5592r-base.c
> +++ b/drivers/iio/dac/ad5592r-base.c
> @@ -22,6 +22,10 @@
>  
>  #include "ad5592r-base.h"
>  
> +/* Parameters for dynamic channel mode setting */
> +static u8 update_channel_mode;
> +static u8 new_channel_modes[AD559XR_CHANNEL_NR];
> +
>  static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset)
>  {
>  	struct ad5592r_state *st = gpiochip_get_data(chip);
> @@ -133,7 +137,7 @@ static int ad5592r_gpio_init(struct ad5592r_state *st)
>  
>  	st->gpiochip.label = dev_name(st->dev);
>  	st->gpiochip.base = -1;
> -	st->gpiochip.ngpio = 8;
> +	st->gpiochip.ngpio = AD559XR_CHANNEL_NR;
>  	st->gpiochip.parent = st->dev;
>  	st->gpiochip.can_sleep = true;
>  	st->gpiochip.direction_input = ad5592r_gpio_direction_input;
> @@ -535,6 +539,10 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
>  			st->channel_offstate[reg] = tmp;
>  	}
>  
> +	/* Update default channel modes set by external module */
> +	if (update_channel_mode == 1)
> +		memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes));
> +
>  	channels = devm_kcalloc(st->dev,
>  			1 + 2 * num_channels, sizeof(*channels),
>  			GFP_KERNEL);
> @@ -570,7 +578,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
>  	}
>  
>  	channels[curr_channel].type = IIO_TEMP;
> -	channels[curr_channel].channel = 8;
> +	channels[curr_channel].channel = AD559XR_CHANNEL_NR;
>  	channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
>  				   BIT(IIO_CHAN_INFO_SCALE) |
>  				   BIT(IIO_CHAN_INFO_OFFSET);
> @@ -592,6 +600,13 @@ static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV)
>  		div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]);
>  }
>  
> +void ad5592r_update_default_channel_modes(u8 *new_modes)
> +{
> +	update_channel_mode = 1;
> +	memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR);
> +}
> +EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes);
> +
>  int ad5592r_probe(struct device *dev, const char *name,
>  		const struct ad5592r_rw_ops *ops)
>  {
> @@ -606,7 +621,7 @@ int ad5592r_probe(struct device *dev, const char *name,
>  	st = iio_priv(iio_dev);
>  	st->dev = dev;
>  	st->ops = ops;
> -	st->num_channels = 8;
> +	st->num_channels = AD559XR_CHANNEL_NR;
>  	dev_set_drvdata(dev, iio_dev);
>  
>  	st->reg = devm_regulator_get_optional(dev, "vref");
> diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h
> index 4774e4cd9c11..6fc120dc341e 100644
> --- a/drivers/iio/dac/ad5592r-base.h
> +++ b/drivers/iio/dac/ad5592r-base.h
> @@ -39,6 +39,9 @@ enum ad5592r_registers {
>  #define AD5592R_REG_CTRL_ADC_RANGE	BIT(5)
>  #define AD5592R_REG_CTRL_DAC_RANGE	BIT(4)
>  
> +/* Define quantity of channels of AD5592R/AD5593R */
> +#define AD559XR_CHANNEL_NR		8
> +
>  struct ad5592r_rw_ops {
>  	int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value);
>  	int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value);
> @@ -68,6 +71,7 @@ struct ad5592r_state {
>  	__be16 spi_msg_nop;
>  };
>  
> +void ad5592r_update_default_channel_modes(u8 *new_modes);
>  int ad5592r_probe(struct device *dev, const char *name,
>  		const struct ad5592r_rw_ops *ops);
>  int ad5592r_remove(struct device *dev);
> diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
> index 44ea3b8117d0..7511949278ac 100644
> --- a/drivers/iio/dac/ad5593r.c
> +++ b/drivers/iio/dac/ad5593r.c
> @@ -21,6 +21,10 @@
>  #define AD5593R_MODE_GPIO_READBACK	(6 << 4)
>  #define AD5593R_MODE_REG_READBACK	(7 << 4)
>  
> +/* Parameters for dynamic channel mode setting */
> +static char *ch_mode = "";
> +module_param(ch_mode, charp, 0400);
> +
>  static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value)
>  {
>  	struct i2c_client *i2c = to_i2c_client(st->dev);
> @@ -92,9 +96,49 @@ static const struct ad5592r_rw_ops ad5593r_rw_ops = {
>  	.gpio_read = ad5593r_gpio_read,
>  };
>  
> +static void ad5593r_check_new_channel_mode(void)
> +{
> +	char *new_mode, tmp[2];
> +	u8 new_ch_modes[AD559XR_CHANNEL_NR];
> +	int idx;
> +
> +	if (strlen(ch_mode) != AD559XR_CHANNEL_NR)
> +		return;
> +
> +	new_mode = ch_mode;
> +
> +	/* Check if all channel modes are valid */
> +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> +		switch (new_mode[idx]) {
> +		case '0':
> +		case '1':
> +		case '2':
> +		case '3':
> +		case '8':
> +			continue;
> +		default:
> +			/* Invalid setting exist, ignore the settings */
> +			return;
> +		}
> +	}
> +
> +	/* Set the new modes to ad5592r-base driver to setup the new channel modes */
> +	memset(tmp, 0, 2);
> +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> +		tmp[0] = new_mode[idx];
> +		if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) {
> +			/* Converting error, ignore the settings */
> +			return;
> +		}
> +	}
> +
> +	ad5592r_update_default_channel_modes(new_ch_modes);
> +}
> +
>  static int ad5593r_i2c_probe(struct i2c_client *i2c,
>  		const struct i2c_device_id *id)
>  {
> +	ad5593r_check_new_channel_mode();
>  	return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops);
>  }
>  
>
AceLan Kao Sept. 18, 2020, 2:49 a.m. UTC | #3
Hi Stefan,

1. For our current project and contract, we only need this in focal kernel.
The introduced feature should be used by the project only. And for the
following requirements after focal,
the pin definitions should be defined in DSDT table.
We need to config the pin modes during development cycle, and the pin
modes are not confirmed yet currently.

2. We have a lengthy discussion with upstream[1], and the maintainer think
we should use ACPI override method to modify the values.
But this method requires to create a new initramfs, and this is no
allowed in our ubuntu core system.

1. https://patchwork.kernel.org/patch/11732183/

Stefan Bader <stefan.bader@canonical.com> 於 2020年9月17日 週四 下午4:22寫道:
>
> On 15.09.20 07:08, AceLan Kao wrote:
> > From: William Sung <william.sung@advantech.com.tw>
> >
> > BugLink: https://bugs.launchpad.net/bugs/1895612
> >
> > To use ad5593r more flexibly, we use the module parameter to setting the
> > channel modes dynamically whenever the module probe up. Users can pass
> > the channel modes to the module parameter for allocating the
> > functionality of channels as desired.
> >
> > For example:
> > * Use in the kernel command line:
> > Users can add the module parameter in the kernel command line such as
> >
> >     "ad5593r.ch_mode=88001122"
> >
> > "88001122" means the channel mode setting for each channel. The most
> > left side indicates the mode of channel 7, and the most right side
> > indicates the mode of channel 0.
> >
> > * Use when manually probe the module:
> > Similar to the kernel command line usage, users can enter
> >
> >     "modprobe ad5593r ch_mode=88001122"
> >
> > to start the ad5593r module with the desired channel mode setting.
> >
> > v2: Fix the patch description and remove redundant for loop
> >
> > Signed-off-by: William Sung <william.sung@advantech.com.tw>
> > Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
> > ---
>
> This will introduce a new interface which will not exist anywhere else than just
> the one kernel/series this was submitted for. IMO this does not belong into a
> generic distro kernel.
>
> I tend to say no to this unless there is some really good reason for it.
> Otherwise this needs some approach that works for us and upstream...
>
> -Stefan
>
>
> >  drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++---
> >  drivers/iio/dac/ad5592r-base.h |  4 ++++
> >  drivers/iio/dac/ad5593r.c      | 44 ++++++++++++++++++++++++++++++++++
> >  3 files changed, 66 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
> > index 424922cad1e3..25ff9f5df5dd 100644
> > --- a/drivers/iio/dac/ad5592r-base.c
> > +++ b/drivers/iio/dac/ad5592r-base.c
> > @@ -22,6 +22,10 @@
> >
> >  #include "ad5592r-base.h"
> >
> > +/* Parameters for dynamic channel mode setting */
> > +static u8 update_channel_mode;
> > +static u8 new_channel_modes[AD559XR_CHANNEL_NR];
> > +
> >  static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset)
> >  {
> >       struct ad5592r_state *st = gpiochip_get_data(chip);
> > @@ -133,7 +137,7 @@ static int ad5592r_gpio_init(struct ad5592r_state *st)
> >
> >       st->gpiochip.label = dev_name(st->dev);
> >       st->gpiochip.base = -1;
> > -     st->gpiochip.ngpio = 8;
> > +     st->gpiochip.ngpio = AD559XR_CHANNEL_NR;
> >       st->gpiochip.parent = st->dev;
> >       st->gpiochip.can_sleep = true;
> >       st->gpiochip.direction_input = ad5592r_gpio_direction_input;
> > @@ -535,6 +539,10 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
> >                       st->channel_offstate[reg] = tmp;
> >       }
> >
> > +     /* Update default channel modes set by external module */
> > +     if (update_channel_mode == 1)
> > +             memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes));
> > +
> >       channels = devm_kcalloc(st->dev,
> >                       1 + 2 * num_channels, sizeof(*channels),
> >                       GFP_KERNEL);
> > @@ -570,7 +578,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
> >       }
> >
> >       channels[curr_channel].type = IIO_TEMP;
> > -     channels[curr_channel].channel = 8;
> > +     channels[curr_channel].channel = AD559XR_CHANNEL_NR;
> >       channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> >                                  BIT(IIO_CHAN_INFO_SCALE) |
> >                                  BIT(IIO_CHAN_INFO_OFFSET);
> > @@ -592,6 +600,13 @@ static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV)
> >               div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]);
> >  }
> >
> > +void ad5592r_update_default_channel_modes(u8 *new_modes)
> > +{
> > +     update_channel_mode = 1;
> > +     memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR);
> > +}
> > +EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes);
> > +
> >  int ad5592r_probe(struct device *dev, const char *name,
> >               const struct ad5592r_rw_ops *ops)
> >  {
> > @@ -606,7 +621,7 @@ int ad5592r_probe(struct device *dev, const char *name,
> >       st = iio_priv(iio_dev);
> >       st->dev = dev;
> >       st->ops = ops;
> > -     st->num_channels = 8;
> > +     st->num_channels = AD559XR_CHANNEL_NR;
> >       dev_set_drvdata(dev, iio_dev);
> >
> >       st->reg = devm_regulator_get_optional(dev, "vref");
> > diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h
> > index 4774e4cd9c11..6fc120dc341e 100644
> > --- a/drivers/iio/dac/ad5592r-base.h
> > +++ b/drivers/iio/dac/ad5592r-base.h
> > @@ -39,6 +39,9 @@ enum ad5592r_registers {
> >  #define AD5592R_REG_CTRL_ADC_RANGE   BIT(5)
> >  #define AD5592R_REG_CTRL_DAC_RANGE   BIT(4)
> >
> > +/* Define quantity of channels of AD5592R/AD5593R */
> > +#define AD559XR_CHANNEL_NR           8
> > +
> >  struct ad5592r_rw_ops {
> >       int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value);
> >       int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value);
> > @@ -68,6 +71,7 @@ struct ad5592r_state {
> >       __be16 spi_msg_nop;
> >  };
> >
> > +void ad5592r_update_default_channel_modes(u8 *new_modes);
> >  int ad5592r_probe(struct device *dev, const char *name,
> >               const struct ad5592r_rw_ops *ops);
> >  int ad5592r_remove(struct device *dev);
> > diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
> > index 44ea3b8117d0..7511949278ac 100644
> > --- a/drivers/iio/dac/ad5593r.c
> > +++ b/drivers/iio/dac/ad5593r.c
> > @@ -21,6 +21,10 @@
> >  #define AD5593R_MODE_GPIO_READBACK   (6 << 4)
> >  #define AD5593R_MODE_REG_READBACK    (7 << 4)
> >
> > +/* Parameters for dynamic channel mode setting */
> > +static char *ch_mode = "";
> > +module_param(ch_mode, charp, 0400);
> > +
> >  static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value)
> >  {
> >       struct i2c_client *i2c = to_i2c_client(st->dev);
> > @@ -92,9 +96,49 @@ static const struct ad5592r_rw_ops ad5593r_rw_ops = {
> >       .gpio_read = ad5593r_gpio_read,
> >  };
> >
> > +static void ad5593r_check_new_channel_mode(void)
> > +{
> > +     char *new_mode, tmp[2];
> > +     u8 new_ch_modes[AD559XR_CHANNEL_NR];
> > +     int idx;
> > +
> > +     if (strlen(ch_mode) != AD559XR_CHANNEL_NR)
> > +             return;
> > +
> > +     new_mode = ch_mode;
> > +
> > +     /* Check if all channel modes are valid */
> > +     for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> > +             switch (new_mode[idx]) {
> > +             case '0':
> > +             case '1':
> > +             case '2':
> > +             case '3':
> > +             case '8':
> > +                     continue;
> > +             default:
> > +                     /* Invalid setting exist, ignore the settings */
> > +                     return;
> > +             }
> > +     }
> > +
> > +     /* Set the new modes to ad5592r-base driver to setup the new channel modes */
> > +     memset(tmp, 0, 2);
> > +     for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> > +             tmp[0] = new_mode[idx];
> > +             if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) {
> > +                     /* Converting error, ignore the settings */
> > +                     return;
> > +             }
> > +     }
> > +
> > +     ad5592r_update_default_channel_modes(new_ch_modes);
> > +}
> > +
> >  static int ad5593r_i2c_probe(struct i2c_client *i2c,
> >               const struct i2c_device_id *id)
> >  {
> > +     ad5593r_check_new_channel_mode();
> >       return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops);
> >  }
> >
> >
>
>
>
>
Brad Figg Sept. 22, 2020, 2:11 a.m. UTC | #4
On Thu, Sep 17, 2020 at 10:22:31AM +0200, Stefan Bader wrote:
> On 15.09.20 07:08, AceLan Kao wrote:
> > From: William Sung <william.sung@advantech.com.tw>
> > 
> > BugLink: https://bugs.launchpad.net/bugs/1895612
> > 
> > To use ad5593r more flexibly, we use the module parameter to setting the
> > channel modes dynamically whenever the module probe up. Users can pass
> > the channel modes to the module parameter for allocating the
> > functionality of channels as desired.
> > 
> > For example:
> > * Use in the kernel command line:
> > Users can add the module parameter in the kernel command line such as
> > 
> >     "ad5593r.ch_mode=88001122"
> > 
> > "88001122" means the channel mode setting for each channel. The most
> > left side indicates the mode of channel 7, and the most right side
> > indicates the mode of channel 0.
> > 
> > * Use when manually probe the module:
> > Similar to the kernel command line usage, users can enter
> > 
> >     "modprobe ad5593r ch_mode=88001122"
> > 
> > to start the ad5593r module with the desired channel mode setting.
> > 
> > v2: Fix the patch description and remove redundant for loop
> > 
> > Signed-off-by: William Sung <william.sung@advantech.com.tw>
> > Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
> > ---
> 
> This will introduce a new interface which will not exist anywhere else than just
> the one kernel/series this was submitted for. IMO this does not belong into a
> generic distro kernel.
> 
> I tend to say no to this unless there is some really good reason for it.
> Otherwise this needs some approach that works for us and upstream...
> 
> -Stefan

Stefan,

1. Is there an issue with the quality of the patch?

2. Are you concerned that this has an unacceptable risk for regression?

3. Are you suggesting that a new, optimized, customer specific kernel be created
   for this driver?

Can you elaborate on why, in your opinion, this does not belong in a generic
distro kernel?

Brad

> 
> 
> >  drivers/iio/dac/ad5592r-base.c | 21 +++++++++++++---
> >  drivers/iio/dac/ad5592r-base.h |  4 ++++
> >  drivers/iio/dac/ad5593r.c      | 44 ++++++++++++++++++++++++++++++++++
> >  3 files changed, 66 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
> > index 424922cad1e3..25ff9f5df5dd 100644
> > --- a/drivers/iio/dac/ad5592r-base.c
> > +++ b/drivers/iio/dac/ad5592r-base.c
> > @@ -22,6 +22,10 @@
> >  
> >  #include "ad5592r-base.h"
> >  
> > +/* Parameters for dynamic channel mode setting */
> > +static u8 update_channel_mode;
> > +static u8 new_channel_modes[AD559XR_CHANNEL_NR];
> > +
> >  static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset)
> >  {
> >  	struct ad5592r_state *st = gpiochip_get_data(chip);
> > @@ -133,7 +137,7 @@ static int ad5592r_gpio_init(struct ad5592r_state *st)
> >  
> >  	st->gpiochip.label = dev_name(st->dev);
> >  	st->gpiochip.base = -1;
> > -	st->gpiochip.ngpio = 8;
> > +	st->gpiochip.ngpio = AD559XR_CHANNEL_NR;
> >  	st->gpiochip.parent = st->dev;
> >  	st->gpiochip.can_sleep = true;
> >  	st->gpiochip.direction_input = ad5592r_gpio_direction_input;
> > @@ -535,6 +539,10 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
> >  			st->channel_offstate[reg] = tmp;
> >  	}
> >  
> > +	/* Update default channel modes set by external module */
> > +	if (update_channel_mode == 1)
> > +		memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes));
> > +
> >  	channels = devm_kcalloc(st->dev,
> >  			1 + 2 * num_channels, sizeof(*channels),
> >  			GFP_KERNEL);
> > @@ -570,7 +578,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
> >  	}
> >  
> >  	channels[curr_channel].type = IIO_TEMP;
> > -	channels[curr_channel].channel = 8;
> > +	channels[curr_channel].channel = AD559XR_CHANNEL_NR;
> >  	channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> >  				   BIT(IIO_CHAN_INFO_SCALE) |
> >  				   BIT(IIO_CHAN_INFO_OFFSET);
> > @@ -592,6 +600,13 @@ static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV)
> >  		div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]);
> >  }
> >  
> > +void ad5592r_update_default_channel_modes(u8 *new_modes)
> > +{
> > +	update_channel_mode = 1;
> > +	memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR);
> > +}
> > +EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes);
> > +
> >  int ad5592r_probe(struct device *dev, const char *name,
> >  		const struct ad5592r_rw_ops *ops)
> >  {
> > @@ -606,7 +621,7 @@ int ad5592r_probe(struct device *dev, const char *name,
> >  	st = iio_priv(iio_dev);
> >  	st->dev = dev;
> >  	st->ops = ops;
> > -	st->num_channels = 8;
> > +	st->num_channels = AD559XR_CHANNEL_NR;
> >  	dev_set_drvdata(dev, iio_dev);
> >  
> >  	st->reg = devm_regulator_get_optional(dev, "vref");
> > diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h
> > index 4774e4cd9c11..6fc120dc341e 100644
> > --- a/drivers/iio/dac/ad5592r-base.h
> > +++ b/drivers/iio/dac/ad5592r-base.h
> > @@ -39,6 +39,9 @@ enum ad5592r_registers {
> >  #define AD5592R_REG_CTRL_ADC_RANGE	BIT(5)
> >  #define AD5592R_REG_CTRL_DAC_RANGE	BIT(4)
> >  
> > +/* Define quantity of channels of AD5592R/AD5593R */
> > +#define AD559XR_CHANNEL_NR		8
> > +
> >  struct ad5592r_rw_ops {
> >  	int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value);
> >  	int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value);
> > @@ -68,6 +71,7 @@ struct ad5592r_state {
> >  	__be16 spi_msg_nop;
> >  };
> >  
> > +void ad5592r_update_default_channel_modes(u8 *new_modes);
> >  int ad5592r_probe(struct device *dev, const char *name,
> >  		const struct ad5592r_rw_ops *ops);
> >  int ad5592r_remove(struct device *dev);
> > diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
> > index 44ea3b8117d0..7511949278ac 100644
> > --- a/drivers/iio/dac/ad5593r.c
> > +++ b/drivers/iio/dac/ad5593r.c
> > @@ -21,6 +21,10 @@
> >  #define AD5593R_MODE_GPIO_READBACK	(6 << 4)
> >  #define AD5593R_MODE_REG_READBACK	(7 << 4)
> >  
> > +/* Parameters for dynamic channel mode setting */
> > +static char *ch_mode = "";
> > +module_param(ch_mode, charp, 0400);
> > +
> >  static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value)
> >  {
> >  	struct i2c_client *i2c = to_i2c_client(st->dev);
> > @@ -92,9 +96,49 @@ static const struct ad5592r_rw_ops ad5593r_rw_ops = {
> >  	.gpio_read = ad5593r_gpio_read,
> >  };
> >  
> > +static void ad5593r_check_new_channel_mode(void)
> > +{
> > +	char *new_mode, tmp[2];
> > +	u8 new_ch_modes[AD559XR_CHANNEL_NR];
> > +	int idx;
> > +
> > +	if (strlen(ch_mode) != AD559XR_CHANNEL_NR)
> > +		return;
> > +
> > +	new_mode = ch_mode;
> > +
> > +	/* Check if all channel modes are valid */
> > +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> > +		switch (new_mode[idx]) {
> > +		case '0':
> > +		case '1':
> > +		case '2':
> > +		case '3':
> > +		case '8':
> > +			continue;
> > +		default:
> > +			/* Invalid setting exist, ignore the settings */
> > +			return;
> > +		}
> > +	}
> > +
> > +	/* Set the new modes to ad5592r-base driver to setup the new channel modes */
> > +	memset(tmp, 0, 2);
> > +	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
> > +		tmp[0] = new_mode[idx];
> > +		if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) {
> > +			/* Converting error, ignore the settings */
> > +			return;
> > +		}
> > +	}
> > +
> > +	ad5592r_update_default_channel_modes(new_ch_modes);
> > +}
> > +
> >  static int ad5593r_i2c_probe(struct i2c_client *i2c,
> >  		const struct i2c_device_id *id)
> >  {
> > +	ad5593r_check_new_channel_mode();
> >  	return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops);
> >  }
> >  
> > 
> 
> 
> 
> 




> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 424922cad1e3..25ff9f5df5dd 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -22,6 +22,10 @@ 
 
 #include "ad5592r-base.h"
 
+/* Parameters for dynamic channel mode setting */
+static u8 update_channel_mode;
+static u8 new_channel_modes[AD559XR_CHANNEL_NR];
+
 static int ad5592r_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
 	struct ad5592r_state *st = gpiochip_get_data(chip);
@@ -133,7 +137,7 @@  static int ad5592r_gpio_init(struct ad5592r_state *st)
 
 	st->gpiochip.label = dev_name(st->dev);
 	st->gpiochip.base = -1;
-	st->gpiochip.ngpio = 8;
+	st->gpiochip.ngpio = AD559XR_CHANNEL_NR;
 	st->gpiochip.parent = st->dev;
 	st->gpiochip.can_sleep = true;
 	st->gpiochip.direction_input = ad5592r_gpio_direction_input;
@@ -535,6 +539,10 @@  static int ad5592r_alloc_channels(struct ad5592r_state *st)
 			st->channel_offstate[reg] = tmp;
 	}
 
+	/* Update default channel modes set by external module */
+	if (update_channel_mode == 1)
+		memcpy(st->channel_modes, new_channel_modes, ARRAY_SIZE(st->channel_modes));
+
 	channels = devm_kcalloc(st->dev,
 			1 + 2 * num_channels, sizeof(*channels),
 			GFP_KERNEL);
@@ -570,7 +578,7 @@  static int ad5592r_alloc_channels(struct ad5592r_state *st)
 	}
 
 	channels[curr_channel].type = IIO_TEMP;
-	channels[curr_channel].channel = 8;
+	channels[curr_channel].channel = AD559XR_CHANNEL_NR;
 	channels[curr_channel].info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
 				   BIT(IIO_CHAN_INFO_SCALE) |
 				   BIT(IIO_CHAN_INFO_OFFSET);
@@ -592,6 +600,13 @@  static void ad5592r_init_scales(struct ad5592r_state *st, int vref_mV)
 		div_s64_rem(tmp * 2, 1000000000LL, &st->scale_avail[1][1]);
 }
 
+void ad5592r_update_default_channel_modes(u8 *new_modes)
+{
+	update_channel_mode = 1;
+	memcpy(new_channel_modes, new_modes, AD559XR_CHANNEL_NR);
+}
+EXPORT_SYMBOL_GPL(ad5592r_update_default_channel_modes);
+
 int ad5592r_probe(struct device *dev, const char *name,
 		const struct ad5592r_rw_ops *ops)
 {
@@ -606,7 +621,7 @@  int ad5592r_probe(struct device *dev, const char *name,
 	st = iio_priv(iio_dev);
 	st->dev = dev;
 	st->ops = ops;
-	st->num_channels = 8;
+	st->num_channels = AD559XR_CHANNEL_NR;
 	dev_set_drvdata(dev, iio_dev);
 
 	st->reg = devm_regulator_get_optional(dev, "vref");
diff --git a/drivers/iio/dac/ad5592r-base.h b/drivers/iio/dac/ad5592r-base.h
index 4774e4cd9c11..6fc120dc341e 100644
--- a/drivers/iio/dac/ad5592r-base.h
+++ b/drivers/iio/dac/ad5592r-base.h
@@ -39,6 +39,9 @@  enum ad5592r_registers {
 #define AD5592R_REG_CTRL_ADC_RANGE	BIT(5)
 #define AD5592R_REG_CTRL_DAC_RANGE	BIT(4)
 
+/* Define quantity of channels of AD5592R/AD5593R */
+#define AD559XR_CHANNEL_NR		8
+
 struct ad5592r_rw_ops {
 	int (*write_dac)(struct ad5592r_state *st, unsigned chan, u16 value);
 	int (*read_adc)(struct ad5592r_state *st, unsigned chan, u16 *value);
@@ -68,6 +71,7 @@  struct ad5592r_state {
 	__be16 spi_msg_nop;
 };
 
+void ad5592r_update_default_channel_modes(u8 *new_modes);
 int ad5592r_probe(struct device *dev, const char *name,
 		const struct ad5592r_rw_ops *ops);
 int ad5592r_remove(struct device *dev);
diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
index 44ea3b8117d0..7511949278ac 100644
--- a/drivers/iio/dac/ad5593r.c
+++ b/drivers/iio/dac/ad5593r.c
@@ -21,6 +21,10 @@ 
 #define AD5593R_MODE_GPIO_READBACK	(6 << 4)
 #define AD5593R_MODE_REG_READBACK	(7 << 4)
 
+/* Parameters for dynamic channel mode setting */
+static char *ch_mode = "";
+module_param(ch_mode, charp, 0400);
+
 static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value)
 {
 	struct i2c_client *i2c = to_i2c_client(st->dev);
@@ -92,9 +96,49 @@  static const struct ad5592r_rw_ops ad5593r_rw_ops = {
 	.gpio_read = ad5593r_gpio_read,
 };
 
+static void ad5593r_check_new_channel_mode(void)
+{
+	char *new_mode, tmp[2];
+	u8 new_ch_modes[AD559XR_CHANNEL_NR];
+	int idx;
+
+	if (strlen(ch_mode) != AD559XR_CHANNEL_NR)
+		return;
+
+	new_mode = ch_mode;
+
+	/* Check if all channel modes are valid */
+	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
+		switch (new_mode[idx]) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '8':
+			continue;
+		default:
+			/* Invalid setting exist, ignore the settings */
+			return;
+		}
+	}
+
+	/* Set the new modes to ad5592r-base driver to setup the new channel modes */
+	memset(tmp, 0, 2);
+	for (idx = 0; idx < AD559XR_CHANNEL_NR; idx++) {
+		tmp[0] = new_mode[idx];
+		if (kstrtou8(tmp, 10, &new_ch_modes[AD559XR_CHANNEL_NR - idx - 1])) {
+			/* Converting error, ignore the settings */
+			return;
+		}
+	}
+
+	ad5592r_update_default_channel_modes(new_ch_modes);
+}
+
 static int ad5593r_i2c_probe(struct i2c_client *i2c,
 		const struct i2c_device_id *id)
 {
+	ad5593r_check_new_channel_mode();
 	return ad5592r_probe(&i2c->dev, id->name, &ad5593r_rw_ops);
 }