From: Jonathan Cameron <jic23@kernel.org> To: Fabrice Gasnier <fabrice.gasnier@st.com> Cc: <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com>, <linux-iio@vger.kernel.org>, <lars@metafoo.de>, <knaack.h@gmx.de>, <pmeerw@pmeerw.net> Subject: Re: [PATCH] iio: adc: stm32: fix scan of multiple channels with DMA Date: Sat, 6 Jan 2018 12:50:25 +0000 [thread overview] Message-ID: <20180106125025.76ac5235@archlinux> (raw) In-Reply-To: <1515162894-11637-1-git-send-email-fabrice.gasnier@st.com> On Fri, 5 Jan 2018 15:34:54 +0100 Fabrice Gasnier <fabrice.gasnier@st.com> wrote: > By default, watermark is set to '1'. Watermark is used to fine tune > cyclic dma buffer period. In case watermark is left untouched (e.g. 1) > and several channels are being scanned, buffer period is wrongly set > (e.g. to 1 sample). As a consequence, data is never pushed to upper layer. > Fix buffer period size, by taking scan channels number into account. > > Fixes: 2763ea0585c9 ("iio: adc: stm32: add optional dma support") > > Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com> Given where we are in the cycle I've applied this to the togreg branch for the next merge window and marked it for stable. This is probably the quickest way to get it in at this stage. Thanks, Jonathan > --- > drivers/iio/adc/stm32-adc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c > index c9d96f9..cecf1e5 100644 > --- a/drivers/iio/adc/stm32-adc.c > +++ b/drivers/iio/adc/stm32-adc.c > @@ -1315,6 +1315,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val) > { > struct stm32_adc *adc = iio_priv(indio_dev); > unsigned int watermark = STM32_DMA_BUFFER_SIZE / 2; > + unsigned int rx_buf_sz = STM32_DMA_BUFFER_SIZE; > > /* > * dma cyclic transfers are used, buffer is split into two periods. > @@ -1323,7 +1324,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val) > * - one buffer (period) driver can push with iio_trigger_poll(). > */ > watermark = min(watermark, val * (unsigned)(sizeof(u16))); > - adc->rx_buf_sz = watermark * 2; > + adc->rx_buf_sz = min(rx_buf_sz, watermark * 2 * adc->num_conv); > > return 0; > }
WARNING: multiple messages have this Message-ID (diff)
From: jic23@kernel.org (Jonathan Cameron) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] iio: adc: stm32: fix scan of multiple channels with DMA Date: Sat, 6 Jan 2018 12:50:25 +0000 [thread overview] Message-ID: <20180106125025.76ac5235@archlinux> (raw) In-Reply-To: <1515162894-11637-1-git-send-email-fabrice.gasnier@st.com> On Fri, 5 Jan 2018 15:34:54 +0100 Fabrice Gasnier <fabrice.gasnier@st.com> wrote: > By default, watermark is set to '1'. Watermark is used to fine tune > cyclic dma buffer period. In case watermark is left untouched (e.g. 1) > and several channels are being scanned, buffer period is wrongly set > (e.g. to 1 sample). As a consequence, data is never pushed to upper layer. > Fix buffer period size, by taking scan channels number into account. > > Fixes: 2763ea0585c9 ("iio: adc: stm32: add optional dma support") > > Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com> Given where we are in the cycle I've applied this to the togreg branch for the next merge window and marked it for stable. This is probably the quickest way to get it in at this stage. Thanks, Jonathan > --- > drivers/iio/adc/stm32-adc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c > index c9d96f9..cecf1e5 100644 > --- a/drivers/iio/adc/stm32-adc.c > +++ b/drivers/iio/adc/stm32-adc.c > @@ -1315,6 +1315,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val) > { > struct stm32_adc *adc = iio_priv(indio_dev); > unsigned int watermark = STM32_DMA_BUFFER_SIZE / 2; > + unsigned int rx_buf_sz = STM32_DMA_BUFFER_SIZE; > > /* > * dma cyclic transfers are used, buffer is split into two periods. > @@ -1323,7 +1324,7 @@ static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val) > * - one buffer (period) driver can push with iio_trigger_poll(). > */ > watermark = min(watermark, val * (unsigned)(sizeof(u16))); > - adc->rx_buf_sz = watermark * 2; > + adc->rx_buf_sz = min(rx_buf_sz, watermark * 2 * adc->num_conv); > > return 0; > }
next prev parent reply other threads:[~2018-01-06 12:50 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-05 14:34 [PATCH] iio: adc: stm32: fix scan of multiple channels with DMA Fabrice Gasnier 2018-01-05 14:34 ` Fabrice Gasnier 2018-01-06 12:50 ` Jonathan Cameron [this message] 2018-01-06 12:50 ` Jonathan Cameron
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=20180106125025.76ac5235@archlinux \ --to=jic23@kernel.org \ --cc=alexandre.torgue@st.com \ --cc=fabrice.gasnier@st.com \ --cc=knaack.h@gmx.de \ --cc=lars@metafoo.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mcoquelin.stm32@gmail.com \ --cc=pmeerw@pmeerw.net \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.