From: Jonathan Cameron <jic23@kernel.org>
To: "Stefan Brüns" <stefan.bruens@rwth-aachen.de>
Cc: <linux-iio@vger.kernel.org>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Maciej Purski <m.purski@samsung.com>,
<linux-kernel@vger.kernel.org>, "Andrew F . Davis" <afd@ti.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Hartmut Knaack <knaack.h@gmx.de>
Subject: Re: [PATCH v2 7/7] iio: adc: ina2xx: Actually align the loop with the conversion ready flag
Date: Fri, 29 Dec 2017 17:52:23 +0000 [thread overview]
Message-ID: <20171229175223.1ba55f7e@archlinux> (raw)
In-Reply-To: <12b5a27e-ffdc-4a89-bd4f-4c48c3ec9717@rwthex-w2-a.rwth-ad.de>
On Thu, 21 Dec 2017 19:31:38 +0100
Stefan Brüns <stefan.bruens@rwth-aachen.de> wrote:
> Currently, the registers are read out once per conversion interval. If
> the reading is delayed as the conversion has not yet finished, this extra
> time is treated as being part of the readout, although it should delay
> the start of the poll interval. This results in the interval starting
> slightly earlier in each iteration, until all time between reads is
> spent polling the status registers instead of sleeping.
>
> To fix this, the delay has to account for the state of the conversion
> ready flag. Whenever the conversion is already finished, schedule the next
> read on the regular interval, otherwise schedule it one interval after the
> flag bit has been set.
>
> Split the work function in two functions, one for the status poll and one
> for reading the values, to be able to note down the time when the flag
> bit is raised.
>
> Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Great thanks.
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
>
> ---
>
> Changes in v2:
> - Describe old behaviour in commit message more clearly
>
> drivers/iio/adc/ina2xx-adc.c | 57 +++++++++++++++++++++++++++++---------------
> 1 file changed, 38 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
> index b7407ac91b59..80af0d2322a3 100644
> --- a/drivers/iio/adc/ina2xx-adc.c
> +++ b/drivers/iio/adc/ina2xx-adc.c
> @@ -697,13 +697,10 @@ static const struct iio_chan_spec ina219_channels[] = {
> IIO_CHAN_SOFT_TIMESTAMP(4),
> };
>
> -static int ina2xx_work_buffer(struct iio_dev *indio_dev)
> +static int ina2xx_conversion_ready(struct iio_dev *indio_dev)
> {
> struct ina2xx_chip_info *chip = iio_priv(indio_dev);
> - /* data buffer needs space for channel data and timestap */
> - unsigned short data[4 + sizeof(s64)/sizeof(short)];
> - int bit, ret, i = 0;
> - s64 time;
> + int ret;
> unsigned int alert;
>
> /*
> @@ -717,22 +714,29 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev)
> * For now, we do an extra read of the MASK_ENABLE register (INA226)
> * resp. the BUS_VOLTAGE register (INA219).
> */
> - if (!chip->allow_async_readout)
> - do {
> - if (chip->config->chip_id == ina226) {
> - ret = regmap_read(chip->regmap,
> - INA226_MASK_ENABLE, &alert);
> - alert &= INA226_CVRF;
> - } else {
> - ret = regmap_read(chip->regmap,
> - INA2XX_BUS_VOLTAGE, &alert);
> - alert &= INA219_CNVR;
> - }
> + if (chip->config->chip_id == ina226) {
> + ret = regmap_read(chip->regmap,
> + INA226_MASK_ENABLE, &alert);
> + alert &= INA226_CVRF;
> + } else {
> + ret = regmap_read(chip->regmap,
> + INA2XX_BUS_VOLTAGE, &alert);
> + alert &= INA219_CNVR;
> + }
>
> - if (ret < 0)
> - return ret;
> + if (ret < 0)
> + return ret;
>
> - } while (!alert);
> + return !!alert;
> +}
> +
> +static int ina2xx_work_buffer(struct iio_dev *indio_dev)
> +{
> + struct ina2xx_chip_info *chip = iio_priv(indio_dev);
> + /* data buffer needs space for channel data and timestap */
> + unsigned short data[4 + sizeof(s64)/sizeof(short)];
> + int bit, ret, i = 0;
> + s64 time;
>
> time = iio_get_time_ns(indio_dev);
>
> @@ -776,6 +780,21 @@ static int ina2xx_capture_thread(void *data)
> ktime_get_ts64(&next);
>
> do {
> + while (!chip->allow_async_readout) {
> + ret = ina2xx_conversion_ready(indio_dev);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * If the conversion was not yet finished,
> + * reset the reference timestamp.
> + */
> + if (ret == 0)
> + ktime_get_ts64(&next);
> + else
> + break;
> + }
> +
> ret = ina2xx_work_buffer(indio_dev);
> if (ret < 0)
> return ret;
prev parent reply other threads:[~2017-12-29 17:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171221183138.361-1-stefan.bruens@rwth-aachen.de>
2017-12-21 18:31 ` [PATCH v2 1/7] iio: adc: ina2xx: Remove bogus cast for data argument Stefan Brüns
2017-12-29 17:46 ` Jonathan Cameron
2017-12-21 18:31 ` [PATCH v2 2/7] iio: adc: ina2xx: Clarify size requirement for data buffer Stefan Brüns
2017-12-21 18:31 ` [PATCH v2 3/7] iio: adc: ina2xx: Remove unneeded dummy read to clear CNVR flag Stefan Brüns
2017-12-21 18:31 ` [PATCH v2 4/7] iio: adc: ina2xx: Do not udelay for several seconds Stefan Brüns
2017-12-21 18:31 ` [PATCH v2 5/7] iio: adc: ina2xx: Use a monotonic clock for delay calculation Stefan Brüns
2017-12-29 17:48 ` Jonathan Cameron
2017-12-31 19:55 ` [PATCH v3 " Stefan Brüns
2018-01-01 1:24 ` [PATCH v4 " Stefan Brüns
2018-01-01 9:30 ` Jonathan Cameron
2017-12-21 18:31 ` [PATCH v2 6/7] iio: adc: ina2xx: Align timestamp with conversion ready flag Stefan Brüns
2017-12-29 17:49 ` Jonathan Cameron
2017-12-21 18:31 ` [PATCH v2 7/7] iio: adc: ina2xx: Actually align the loop with the " Stefan Brüns
2017-12-29 17:52 ` Jonathan Cameron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171229175223.1ba55f7e@archlinux \
--to=jic23@kernel.org \
--cc=afd@ti.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.purski@samsung.com \
--cc=pmeerw@pmeerw.net \
--cc=stefan.bruens@rwth-aachen.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).