iio: adc: stm32: Fix ADC IRQ handling on STM32F4
v2 cover iio: adc: stm32: Fix ADC IRQ handling on STM32F4
Changes to the STM32 ADC irq handling broke the STM32F4 platforms These two patches bring it back to a working state.
Changes:
* Removed spurious IRQs detection
* Updated comments and commit messages
Yannick Brosseau (2):
iio: adc: stm32: Fix ADCs iteration in irq handler
iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs
message
drivers/iio/adc/stm32-adc-core.c | 7 ++++++- drivers/iio/adc/stm32-adc.c | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-)
Signature · 7 lines
2.36.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/2 iio: adc: stm32: Fix ADCs iteration in irq handler
The irq handler was only checking the mask for the first ADCs in the case of the F4 and H7 generation, since it was iterating up to the num_irq value. This patch add the maximum number of ADC in the common register, which map to the number of entries of eoc_msk and ovr_msk in stm32_adc_common_regs. This allow the handler to check all ADCs in that module.
Tested on a STM32F429NIH6.
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/iio/adc/stm32-adc-core.c +6 -1
@@ -64,6 +64,7 @@ struct stm32_adc_priv;* @max_clk_rate_hz: maximum analog clock rate (Hz, from datasheet) * @has_syscfg: SYSCFG capability flags * @num_irqs: number of interrupt lines +* @num_adcs: maximum number of ADC instances in the common registers */ struct stm32_adc_priv_cfg {const struct stm32_adc_common_regs *regs;
@@ -71,6 +72,7 @@ struct stm32_adc_priv_cfg {u32 max_clk_rate_hz;unsigned int has_syscfg;unsigned int num_irqs; +unsigned int num_adcs; };/**
@@ -352,7 +354,7 @@ static void stm32_adc_irq_handler(struct irq_desc *desc)* before invoking the interrupt handler (e.g. call ISR only for * IRQ-enabled ADCs). */ -for (i =0 ; i < priv->cfg->num_irqs; i++) { +for (i =0 ; i < priv->cfg->num_adcs; i++) {if ((status & priv->cfg->regs->eoc_msk[i] &&stm32_adc_eoc_enabled (priv, i)) || (status & priv->cfg->regs->ovr_msk[i]))
@@ -792,6 +794,7 @@ static const struct stm32_adc_priv_cfg stm32f4_adc_priv_cfg = { .clk_sel = stm32f4_adc_clk_sel, .max_clk_rate_hz = 36000000, .num_irqs = 1, + .num_adcs = 3, };static const struct stm32_adc_priv_cfg stm32h7_adc_priv_cfg = {
@@ -800,6 +803,7 @@ static const struct stm32_adc_priv_cfg stm32h7_adc_priv_cfg = { .max_clk_rate_hz = 36000000, .has_syscfg = HAS_VBOOSTER, .num_irqs = 1, + .num_adcs = 2, };static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = {
@@ -808,6 +812,7 @@ static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = { .max_clk_rate_hz = 40000000, .has_syscfg = HAS_VBOOSTER | HAS_ANASWVDD, .num_irqs = 2, + .num_adcs = 2, };static const struct of_device_id stm32_adc_of_match[] = {
Signature · 7 lines
2.36.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/2] iio: adc: stm32: Fix ADCs iteration in irq handler
Quoted 10 lines · Yannick Brosseau
The irq handler was only checking the mask for the first ADCs in the case of the F4 and H7 generation, since it was iterating up to the
num_irqvalue. This patch add the maximum number of ADC in the common register, which map to the number of entries ofeoc_mskandovr_mskinstm32_adc_common_regs. This allow the handler to check all ADCs in that module.Tested on a STM32F429NIH6.
Fixes 695e2f5c289b ("iio: adc: stm32-adc: fix a regression when using dma and irq")Signed-off-by Yannick Brosseau <[email protected]>
Hi Yannick,
Feel free to add my:
Thanks,
Fabrice
Quoted 57 lines
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/iio/adc/stm32-adc-core.c +6
-1@@ -64,6 +64,7 @@ struct stm32_adc_priv;* @max_clk_rate_hz: maximum analog clock rate (Hz, from datasheet) * @has_syscfg: SYSCFG capability flags * @num_irqs: number of interrupt lines +* @num_adcs: maximum number of ADC instances in the common registers */ struct stm32_adc_priv_cfg {const struct stm32_adc_common_regs *regs;@@ -71,6 +72,7 @@ struct stm32_adc_priv_cfg {u32 max_clk_rate_hz;unsigned int has_syscfg;unsigned int num_irqs; +unsigned int num_adcs; };/** @@ -352,7 +354,7 @@ static void stm32_adc_irq_handler(struct irq_desc *desc)* before invoking the interrupt handler (e.g. call ISR only for * IRQ-enabled ADCs). */ -for (i =0 ; i < priv->cfg->num_irqs; i++) { +for (i =0 ; i < priv->cfg->num_adcs; i++) {if ((status & priv->cfg->regs->eoc_msk[i] &&stm32_adc_eoc_enabled (priv, i)) || (status & priv->cfg->regs->ovr_msk[i]))@@ -792,6 +794,7 @@ static const struct stm32_adc_priv_cfg stm32f4_adc_priv_cfg = { .clk_sel = stm32f4_adc_clk_sel, .max_clk_rate_hz = 36000000, .num_irqs = 1, + .num_adcs = 3, };static const struct stm32_adc_priv_cfg stm32h7_adc_priv_cfg = {@@ -800,6 +803,7 @@ static const struct stm32_adc_priv_cfg stm32h7_adc_priv_cfg = { .max_clk_rate_hz = 36000000, .has_syscfg = HAS_VBOOSTER, .num_irqs = 1, + .num_adcs = 2, };static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = {@@ -808,6 +812,7 @@ static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = { .max_clk_rate_hz = 40000000, .has_syscfg = HAS_VBOOSTER | HAS_ANASWVDD, .num_irqs = 2, + .num_adcs = 2, };static const struct of_device_id stm32_adc_of_match[] = {
PATCH v2 2/2 iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message
In reply to Yannick BrosseauThe check for spurious IRQs introduced in 695e2f5c289bb assumed that the bits in the control and status registers are aligned. This is true for the H7 and MP1 version, but not the F4. The interrupt was then never handled on the F4.
Instead of increasing the complexity of the comparison and check each bit specifically, we remove this check completely and rely on the generic handler for spurious IRQs.
--- drivers/iio/adc/stm32-adc.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/iio/adc/stm32-adc.c +0 -10
@@ -1407,7 +1407,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data)struct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg);/* Check ovr status right now, as ovr mask should be already disabled */ if (status & regs->isr_ovr.mask) {
@@ -1422,11 +1421,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data)return IRQ_HANDLED ; } -if (!(status & mask)) -dev_err_ratelimited (&indio_dev->dev, -"Unexpected IRQ: IER=0x%08x, ISR=0x%08x\n" , - mask, status); -return IRQ_NONE ; }
@@ -1436,10 +1430,6 @@ static irqreturn_t stm32_adc_isr(int irq, void *data)struct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg); - -if (!(status & mask)) -return IRQ_WAKE_THREAD ;if (status & regs->isr_ovr.mask) {/*
Signature · 7 lines
2.36.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 2/2] iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message
Quoted 9 lines · Yannick Brosseau
The check for spurious IRQs introduced in
695e2f5c289bbassumed that the bits in the control and status registers are aligned. This is true for the H7 and MP1 version, but not the F4. The interrupt was then never handled on the F4.Instead of increasing the complexity of the comparison and check each bit specifically, we remove this check completely and rely on the generic handler for spurious IRQs.
Fixes 695e2f5c289b ("iio: adc: stm32-adc: fix a regression when using dma and irq")Signed-off-by Yannick Brosseau <[email protected]>
Hi Yannick,
Feel free to add my:
Thanks,
Fabrice
Quoted 29 lines
--- drivers/iio/adc/stm32-adc.c | 10 ---------- 1 file changed, 10 deletions(-)drivers/iio/adc/stm32-adc.c +0
-6@@ -1407,7 +1407,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data)struct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg);/* Check ovr status right now, as ovr mask should be already disabled */ if (status & regs->isr_ovr.mask) {@@ -1422,11 +1421,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data)return IRQ_HANDLED ; } -if (!(status & mask)) -dev_err_ratelimited (&indio_dev->dev, -"Unexpected IRQ: IER=0x%08x, ISR=0x%08x\n" , - mask, status); -return IRQ_NONE ; }
drivers/iio/adc/stm32-adc.c static irqreturn_t stm32_adc_isr(int irq, void *data) · line 1435
Quoted 10 lines
drivers/iio/adc/stm32-adc.c +0
-4@@ -1436,10 +1430,6 @@ static irqreturn_t stm32_adc_isr(int irq, void *data)struct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg); - -if (!(status & mask)) -return IRQ_WAKE_THREAD ;if (status & regs->isr_ovr.mask) {/*
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 2 lines · On Mon, 16 May 2022 16:39:37 -0400 Yannick Brosseau…
Changes to the STM32 ADC irq handling broke the STM32F4 platforms These two patches bring it back to a working state.
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
Quoted 14 lines
Changes:
* Removed spurious IRQs detection
* Updated comments and commit messagesYannick Brosseau (2):
iio: adc: stm32: Fix ADCs iteration in irq handler
iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs
messagedrivers/iio/adc/stm32-adc-core.c | 7 ++++++- drivers/iio/adc/stm32-adc.c | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-)