From: Mathieu Poirier <mathieu.poirier@linaro.org> To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 17/20] ASoC: stm32: i2s: fix IRQ clearing Date: Fri, 15 Nov 2019 15:33:53 -0700 [thread overview] Message-ID: <20191115223356.27675-17-mathieu.poirier@linaro.org> (raw) In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> From: Olivier Moysan <olivier.moysan@st.com> commit 8ba3c5215d69c09f5c39783ff3b78347769822ad upstream Because of regmap cache, interrupts may not be cleared as expected. Declare IFCR register as write only and make writings to IFCR register unconditional. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable <stable@vger.kernel.org> # 4.19+ Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- sound/soc/stm/stm32_i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 004d83091505..aa2b1196171a 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -246,8 +246,8 @@ static irqreturn_t stm32_i2s_isr(int irq, void *devid) return IRQ_NONE; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, flags); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, flags); if (flags & I2S_SR_OVR) { dev_dbg(&pdev->dev, "Overrun\n"); @@ -276,7 +276,6 @@ static bool stm32_i2s_readable_reg(struct device *dev, unsigned int reg) case STM32_I2S_CFG2_REG: case STM32_I2S_IER_REG: case STM32_I2S_SR_REG: - case STM32_I2S_IFCR_REG: case STM32_I2S_TXDR_REG: case STM32_I2S_RXDR_REG: case STM32_I2S_CGFR_REG: @@ -547,8 +546,8 @@ static int stm32_i2s_startup(struct snd_pcm_substream *substream, i2s->refcount++; spin_unlock(&i2s->lock_fd); - return regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + return regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); } static int stm32_i2s_hw_params(struct snd_pcm_substream *substream, @@ -603,8 +602,8 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); if (playback_flg) { ier = I2S_IER_UDRIE; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org> To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 17/20] ASoC: stm32: i2s: fix IRQ clearing Date: Fri, 15 Nov 2019 15:33:53 -0700 [thread overview] Message-ID: <20191115223356.27675-17-mathieu.poirier@linaro.org> (raw) In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> From: Olivier Moysan <olivier.moysan@st.com> commit 8ba3c5215d69c09f5c39783ff3b78347769822ad upstream Because of regmap cache, interrupts may not be cleared as expected. Declare IFCR register as write only and make writings to IFCR register unconditional. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable <stable@vger.kernel.org> # 4.19+ Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- sound/soc/stm/stm32_i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 004d83091505..aa2b1196171a 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -246,8 +246,8 @@ static irqreturn_t stm32_i2s_isr(int irq, void *devid) return IRQ_NONE; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, flags); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, flags); if (flags & I2S_SR_OVR) { dev_dbg(&pdev->dev, "Overrun\n"); @@ -276,7 +276,6 @@ static bool stm32_i2s_readable_reg(struct device *dev, unsigned int reg) case STM32_I2S_CFG2_REG: case STM32_I2S_IER_REG: case STM32_I2S_SR_REG: - case STM32_I2S_IFCR_REG: case STM32_I2S_TXDR_REG: case STM32_I2S_RXDR_REG: case STM32_I2S_CGFR_REG: @@ -547,8 +546,8 @@ static int stm32_i2s_startup(struct snd_pcm_substream *substream, i2s->refcount++; spin_unlock(&i2s->lock_fd); - return regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + return regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); } static int stm32_i2s_hw_params(struct snd_pcm_substream *substream, @@ -603,8 +602,8 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); if (playback_flg) { ier = I2S_IER_UDRIE; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-15 22:34 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-15 22:33 [stable 4.19+][PATCH 01/20] i2c: stm32f7: fix first byte to send in slave mode Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 02/20] ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 03/20] mailbox: stm32_ipcc: add spinlock to fix channels concurrent access Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 04/20] crypto: stm31/hash - Fix hmac issue more than 256 bytes Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 05/20] media: stm32-dcmi: fix DMA corruption when stopping streaming Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 06/20] media: stm32-dcmi: fix check of pm_runtime_get_sync return value Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 07/20] hwrng: stm32 - fix unbalanced pm_runtime_enable Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 08/20] remoteproc: fix rproc_da_to_va in case of unallocated carveout Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 09/20] clk: stm32mp1: fix HSI divider flag Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 10/20] clk: stm32mp1: fix mcu divider table Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 11/20] clk: stm32mp1: add CLK_SET_RATE_NO_REPARENT to Kernel clocks Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 12/20] clk: stm32mp1: parent clocks update Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 13/20] mailbox: mailbox-test: fix null pointer if no mmio Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 14/20] pinctrl: stm32: fix memory leak issue Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 15/20] ASoC: stm32: i2s: fix dma configuration Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 16/20] ASoC: stm32: i2s: fix 16 bit format support Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier [this message] 2019-11-15 22:33 ` [stable 4.19+][PATCH 17/20] ASoC: stm32: i2s: fix IRQ clearing Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 18/20] ASoC: stm32: sai: add missing put_device() Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 19/20] media: ov5640: fix framerate update Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-15 22:33 ` [stable 4.19+][PATCH 20/20] dmaengine: stm32-dma: check whether length is aligned on FIFO threshold Mathieu Poirier 2019-11-15 22:33 ` Mathieu Poirier 2019-11-21 20:35 ` [stable 4.19+][PATCH 01/20] i2c: stm32f7: fix first byte to send in slave mode Greg KH 2019-11-21 20:35 ` Greg KH 2019-11-22 16:27 ` Mathieu Poirier 2019-11-22 16:27 ` Mathieu Poirier
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=20191115223356.27675-17-mathieu.poirier@linaro.org \ --to=mathieu.poirier@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=stable@vger.kernel.org \ /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.