Skip to contentSkip to conversation

iio: adc: meson_saradc: Fix memory allocation order

PATCH Applied Remi Pommarel 5 participants 5 messages Sep 1, 2019 – Sep 8, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: adc: meson_saradc: Fix memory allocation order

meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.

This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.

---
 drivers/iio/adc/meson_saradc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/iio/adc/meson_saradc.c +5 -5
index 7b28d045d271..7b27306330a3 100644
@@ -1219,6 +1219,11 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
+	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
+					     priv->param->regmap_config);
+	if (IS_ERR(priv->regmap))
+		return PTR_ERR(priv->regmap);
+
 	irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
 	if (!irq)
 		return -EINVAL;
@@ -1228,11 +1233,6 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-					     priv->param->regmap_config);
-	if (IS_ERR(priv->regmap))
-		return PTR_ERR(priv->regmap);
-
 	priv->clkin = devm_clk_get(&pdev->dev, "clkin");
 	if (IS_ERR(priv->clkin)) {
 		dev_err(&pdev->dev, "failed to get clkin\n");
Signature · 1 line
2.20.1
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Remi Pommarel

meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.

This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.

Fixes 3af109131b7eb8 ("iio: adc: meson-saradc: switch from polling to

interrupt mode")

Quoted 2 lines

thank you for fixing this!

Martin

Tested-by
#2 lore raw
Quoted 12 lines · Martin Blumenstingl
Quoted 9 lines · Remi Pommarel

meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.

This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.

Quoted 7 lines
Fixes 3af109131b7eb8 ("iio: adc: meson-saradc: switch from polling to

interrupt mode")

Quoted 2 lines

thank you for fixing this!

The patch fixed the kernel panic I had, i can now successfully boot my meson-gxl-s905x-libretech-cc boad using patched linux 5.2.11

Elie

Quoted 3 lines

Martin

maintainer Applied
#3 lore raw
Quoted 18 lines · On Mon, 2 Sep 2019 21:40:49 +0100 Elie Roudninski <[email protected]> wrote:
Quoted 16 lines · Martin Blumenstingl
Quoted 9 lines · Remi Pommarel

meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.

This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.

Fixes 3af109131b7eb8 ("iio: adc: meson-saradc: switch from polling to

interrupt mode")

Quoted 2 lines
Quoted 7 lines
Quoted 3 lines

thank you for fixing this!

The patch fixed the kernel panic I had, i can now successfully boot my meson-gxl-s905x-libretech-cc boad using patched linux 5.2.11

Rather than rush through a quick pull request I'm going to hold this one until after the merge window.

Applied to the fixes-togreg branch of iio.git (which is now based on staging-next).

Thanks,

Jonathan

Quoted 5 lines

Elie

Quoted 3 lines

Martin

maintainer Reviewed-by on v1 1/1
#4 lore raw
In reply to Remi Pommarel
Quoted 10 lines · Remi Pommarel

meson_saradc's irq handler uses priv->regmap so make sure that it is allocated before the irq get enabled.

This also fixes crash when CONFIG_DEBUG_SHIRQ is enabled, as device managed resources are freed in the inverted order they had been allocated, priv->regmap was freed before the spurious fake irq that CONFIG_DEBUG_SHIRQ adds called the handler.