| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAF12kFs-=s5Rj42gSfVHYRQ30m2m_gdmAjBmB0cdb7VMS5evjw@mail.gmail.com>
Date: Tue, 29 Mar 2022 12:31:20 +0800
From: Cixi Geng <gengcixi@...il.com>
To: Baolin Wang <baolin.wang7@...il.com>
Cc: Jonathan Cameron <jic23@...nel.org>,
Lars-Peter Clausen <lars@...afoo.de>,
Rob Herring <robh+dt@...nel.org>,
Orson Zhai <orsonzhai@...il.com>,
Chunyan Zhang <zhang.lyra@...il.com>, lgirdwood@...il.com,
Mark Brown <broonie@...nel.org>,
朱玉明 (Yuming Zhu/11457)
<yuming.zhu1@...soc.com>, linux-iio@...r.kernel.org,
Devicetree List <devicetree@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH V2 3/7] iio: adc: sc27xx: structure adjuststment and optimization
Baolin Wang <baolin.wang7@...il.com> 于2022年3月23日周三 21:55写道：
>
> On Sat, Mar 12, 2022 at 12:47 AM Cixi Geng <gengcixi@...il.com> wrote:
> >
> > From: Cixi Geng <cixi.geng1@...soc.com>
> >
> > Introduce one variant device data structure to be compatible
> > with SC2731 PMIC since it has different scale and ratio calculation
> > and so on.
> >
> > Signed-off-by: Yuming Zhu <yuming.zhu1@...soc.com>
> > Signed-off-by: Cixi Geng <cixi.geng1@...soc.com>
> > ---
> > drivers/iio/adc/sc27xx_adc.c | 95 ++++++++++++++++++++++++++++++------
> > 1 file changed, 80 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c
> > index aee076c8e2b1..68629fbcfec5 100644
> > --- a/drivers/iio/adc/sc27xx_adc.c
> > +++ b/drivers/iio/adc/sc27xx_adc.c
> > @@ -12,9 +12,9 @@
> > #include <linux/slab.h>
> >
> > /* PMIC global registers definition */
> > -#define SC27XX_MODULE_EN 0xc08
> > +#define SC2731_MODULE_EN 0xc08
> > #define SC27XX_MODULE_ADC_EN BIT(5)
> > -#define SC27XX_ARM_CLK_EN 0xc10
> > +#define SC2731_ARM_CLK_EN 0xc10
> > #define SC27XX_CLK_ADC_EN BIT(5)
> > #define SC27XX_CLK_ADC_CLK_EN BIT(6)
> >
> > @@ -78,6 +78,23 @@ struct sc27xx_adc_data {
> > int channel_scale[SC27XX_ADC_CHANNEL_MAX];
> > u32 base;
> > int irq;
> > + const struct sc27xx_adc_variant_data *var_data;
> > +};
> > +
> > +/*
> > + * Since different PMICs of SC27xx series can have different
> > + * address and ratio, we should save ratio config and base
> > + * in the device data structure.
> > + */
> > +struct sc27xx_adc_variant_data {
> > + u32 module_en;
> > + u32 clk_en;
> > + u32 scale_shift;
> > + u32 scale_mask;
> > + const struct sc27xx_adc_linear_graph *bscale_cal;
> > + const struct sc27xx_adc_linear_graph *sscale_cal;
> > + void (*init_scale)(struct sc27xx_adc_data *data);
> > + int (*get_ratio)(int channel, int scale);
> > };
> >
> > struct sc27xx_adc_linear_graph {
> > @@ -103,6 +120,17 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
> > 100, 341,
> > };
> >
> > +/* Add these for sc2731 pmic, and the [big|small]_scale_graph_calib for common's */
> > +static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
> > + 4200, 850,
> > + 3600, 728,
> > +};
> > +
> > +static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
> > + 1000, 838,
> > + 100, 84,
> > +};
> > +
> > static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
> > 4200, 856,
> > 3600, 733,
> > @@ -130,11 +158,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
> > size_t len;
> >
> > if (big_scale) {
> > - calib_graph = &big_scale_graph_calib;
> > + calib_graph = data->var_data->bscale_cal;
> > graph = &big_scale_graph;
> > cell_name = "big_scale_calib";
> > } else {
> > - calib_graph = &small_scale_graph_calib;
> > + calib_graph = data->var_data->sscale_cal;
>
> Now which function will use big_scale_graph_calib and
> small_scale_graph_calib? Seems you add an unused warning?
yes, it is a unused, since these calibs used for sc2730 and sc2720
I will remove in this patch and add in patch4/7.
>
> > graph = &small_scale_graph;
> > cell_name = "small_scale_calib";
> > }
> > @@ -160,7 +188,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
> > return 0;
> > }
> >
> > -static int sc27xx_adc_get_ratio(int channel, int scale)
> > +static int sc2731_adc_get_ratio(int channel, int scale)
> > {
> > switch (channel) {
> > case 1:
> > @@ -185,6 +213,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
> > return SC27XX_VOLT_RATIO(1, 1);
> > }
> >
> > +/*
> > + * According to the datasheet set specific value on some channel.
> > + */
> > +static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
> > + if (i == 5)
> > + data->channel_scale[i] = 1;
>
> Can you add some comments to explain why channel 5 needs to set scale to 1?
In the current software design, SC2731 supports 2 scales, channel 5
uses big scale, others use smale
I will add the comment in next version.
>
> > + else
> > + data->channel_scale[i] = 0;
> > + }
> > +}
> > +
> > static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
> > int scale, int *val)
> > {
> > @@ -208,10 +251,11 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
> > goto disable_adc;
> >
> > /* Configure the channel id and scale */
> > - tmp = (scale << SC27XX_ADC_SCALE_SHIFT) & SC27XX_ADC_SCALE_MASK;
> > + tmp = (scale << data->var_data->scale_shift) & data->var_data->scale_mask;
> > tmp |= channel & SC27XX_ADC_CHN_ID_MASK;
> > ret = regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CH_CFG,
> > - SC27XX_ADC_CHN_ID_MASK | SC27XX_ADC_SCALE_MASK,
> > + SC27XX_ADC_CHN_ID_MASK |
> > + data->var_data->scale_mask,
> > tmp);
> > if (ret)
> > goto disable_adc;
> > @@ -262,8 +306,9 @@ static void sc27xx_adc_volt_ratio(struct sc27xx_adc_data *data,
> > int channel, int scale,
> > u32 *div_numerator, u32 *div_denominator)
> > {
> > - u32 ratio = sc27xx_adc_get_ratio(channel, scale);
> > + u32 ratio;
> >
> > + ratio = data->var_data->get_ratio(channel, scale);
> > *div_numerator = ratio >> SC27XX_RATIO_NUMERATOR_OFFSET;
> > *div_denominator = ratio & SC27XX_RATIO_DENOMINATOR_MASK;
> > }
> > @@ -432,13 +477,13 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
> > {
> > int ret;
> >
> > - ret = regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
> > + ret = regmap_update_bits(data->regmap, data->var_data->module_en,
> > SC27XX_MODULE_ADC_EN, SC27XX_MODULE_ADC_EN);
> > if (ret)
> > return ret;
> >
> > /* Enable ADC work clock and controller clock */
> > - ret = regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
> > + ret = regmap_update_bits(data->regmap, data->var_data->clk_en,
> > SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN,
> > SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN);
> > if (ret)
> > @@ -456,10 +501,10 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
> > return 0;
> >
> > disable_clk:
> > - regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
> > + regmap_update_bits(data->regmap, data->var_data->clk_en,
> > SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
> > disable_adc:
> > - regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
> > + regmap_update_bits(data->regmap, data->var_data->module_en,
> > SC27XX_MODULE_ADC_EN, 0);
> >
> > return ret;
> > @@ -470,21 +515,39 @@ static void sc27xx_adc_disable(void *_data)
> > struct sc27xx_adc_data *data = _data;
> >
> > /* Disable ADC work clock and controller clock */
> > - regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
> > + regmap_update_bits(data->regmap, data->var_data->clk_en,
> > SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
> >
> > - regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
> > + regmap_update_bits(data->regmap, data->var_data->module_en,
> > SC27XX_MODULE_ADC_EN, 0);
> > }
> >
> > +static const struct sc27xx_adc_variant_data sc2731_data = {
> > + .module_en = SC2731_MODULE_EN,
> > + .clk_en = SC2731_ARM_CLK_EN,
> > + .scale_shift = SC27XX_ADC_SCALE_SHIFT,
> > + .scale_mask = SC27XX_ADC_SCALE_MASK,
> > + .bscale_cal = &sc2731_big_scale_graph_calib,
> > + .sscale_cal = &sc2731_small_scale_graph_calib,
> > + .init_scale = sc2731_adc_scale_init,
> > + .get_ratio = sc2731_adc_get_ratio,
> > +};
> > +
> > static int sc27xx_adc_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct device_node *np = dev->of_node;
> > struct sc27xx_adc_data *sc27xx_data;
> > + const struct sc27xx_adc_variant_data *pdata;
> > struct iio_dev *indio_dev;
> > int ret;
> >
> > + pdata = of_device_get_match_data(dev);
> > + if (!pdata) {
> > + dev_err(dev, "No matching driver data found\n");
> > + return -EINVAL;
> > + }
> > +
> > indio_dev = devm_iio_device_alloc(dev, sizeof(*sc27xx_data));
> > if (!indio_dev)
> > return -ENOMEM;
> > @@ -520,6 +583,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
> > }
> >
> > sc27xx_data->dev = dev;
> > + sc27xx_data->var_data = pdata;
> > + sc27xx_data->var_data->init_scale(sc27xx_data);
> >
> > ret = sc27xx_adc_enable(sc27xx_data);
> > if (ret) {
> > @@ -546,7 +611,7 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
> > }
> >
> > static const struct of_device_id sc27xx_adc_of_match[] = {
> > - { .compatible = "sprd,sc2731-adc", },
> > + { .compatible = "sprd,sc2731-adc", .data = &sc2731_data},
> > { }
> > };
> > MODULE_DEVICE_TABLE(of, sc27xx_adc_of_match);
> > --
> > 2.25.1
> >
>
>
> --
> Baolin Wang
Powered by blists - more mailing lists