Unverified Commit b4a56753 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: stm32: manage rebind issue" from Olivier Moysan <olivier.moysan@st.com>: 

This patchset corrects a rebind issue on STM32 SPDIFRX and I2S drivers.

The same correction has already been applied for SAI driver:
0d6defc7 ("ASoC: stm32: sai: manage rebind issue")

The commit e894efef ("ASoC: core: add support to card rebind")
allows to rebind the sound card after a rebind of one of its component.
With this commit, the sound card is actually rebound,
but may be no more functional.

The following problems have been seen on STM32 drivers.

1) DMA channel is not requested:

With the sound card rebind the simplified call sequence is:
    probe
        snd_soc_register_component
                snd_soc_try_rebind_card
                        snd_soc_instantiate_card
        devm_snd_dmaengine_pcm_register

The problem occurs because the pcm must be registered,
before snd_soc_instantiate_card() is called.

Modify the driver, to change the call sequence as follows:
    probe
        devm_snd_dmaengine_pcm_register
        snd_soc_register_component
                snd_soc_try_rebind_card

2) DMA channel is not released:

dma_release_channel() is not called when
devm_dmaengine_pcm_release() is executed.
This occurs because SND_DMAENGINE_PCM_DRV_NAME component,
has already been released through devm_component_release().

devm_dmaengine_pcm_release() should be called before
devm_component_release() to avoid this problem.

Call snd_dmaengine_pcm_unregister() and snd_soc_unregister_component()
explicitly from the driver, to have the right sequence.

Olivier Moysan (3):
  ASoC: stm32: spdifrx: fix regmap status check
  ASoC: stm32: spdifrx: manage rebind issue
  ASoC: stm32: i2s: manage rebind issue

 sound/soc/stm/stm32_i2s.c     | 40 ++++++++++++++++------
 sound/soc/stm/stm32_spdifrx.c | 64 +++++++++++++++++++----------------
 2 files changed, 63 insertions(+), 41 deletions(-)

--
2.17.1
parents 8d34d091 caff4ce8

sound/soc/stm/stm32_i2s.c

+29 −11
Original line number Diff line number Diff line
@@ -888,6 +888,14 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, 
	return 0;

}



static int stm32_i2s_remove(struct platform_device *pdev)

{

	snd_dmaengine_pcm_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}



static int stm32_i2s_probe(struct platform_device *pdev)

{

	struct stm32_i2s_data *i2s;
@@ -921,47 +929,56 @@ static int stm32_i2s_probe(struct platform_device *pdev) 
		return PTR_ERR(i2s->regmap);

	}



	ret = devm_snd_soc_register_component(&pdev->dev, &stm32_i2s_component,

					      i2s->dai_drv, 1);

	if (ret)

		return ret;



	ret = devm_snd_dmaengine_pcm_register(&pdev->dev,

					      &stm32_i2s_pcm_config, 0);

	ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "PCM DMA register error %d\n", ret);

		return ret;

	}



	ret = snd_soc_register_component(&pdev->dev, &stm32_i2s_component,

					 i2s->dai_drv, 1);

	if (ret) {

		snd_dmaengine_pcm_unregister(&pdev->dev);

		return ret;

	}



	/* Set SPI/I2S in i2s mode */

	ret = regmap_update_bits(i2s->regmap, STM32_I2S_CGFR_REG,

				 I2S_CGFR_I2SMOD, I2S_CGFR_I2SMOD);

	if (ret)

		return ret;

		goto error;



	ret = regmap_read(i2s->regmap, STM32_I2S_IPIDR_REG, &val);

	if (ret)

		return ret;

		goto error;



	if (val == I2S_IPIDR_NUMBER) {

		ret = regmap_read(i2s->regmap, STM32_I2S_HWCFGR_REG, &val);

		if (ret)

			return ret;

			goto error;



		if (!FIELD_GET(I2S_HWCFGR_I2S_SUPPORT_MASK, val)) {

			dev_err(&pdev->dev,

				"Device does not support i2s mode\n");

			return -EPERM;

			ret = -EPERM;

			goto error;

		}



		ret = regmap_read(i2s->regmap, STM32_I2S_VERR_REG, &val);

		if (ret)

			goto error;



		dev_dbg(&pdev->dev, "I2S version: %lu.%lu registered\n",

			FIELD_GET(I2S_VERR_MAJ_MASK, val),

			FIELD_GET(I2S_VERR_MIN_MASK, val));

	}



	return ret;



error:

	stm32_i2s_remove(pdev);



	return ret;

}
@@ -998,6 +1015,7 @@ static struct platform_driver stm32_i2s_driver = { 
		.pm = &stm32_i2s_pm_ops,

	},

	.probe = stm32_i2s_probe,

	.remove = stm32_i2s_remove,

};



module_platform_driver(stm32_i2s_driver);

sound/soc/stm/stm32_spdifrx.c

+32 −30
Original line number Diff line number Diff line
@@ -944,6 +944,22 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev, 
	return 0;

}



static int stm32_spdifrx_remove(struct platform_device *pdev)

{

	struct stm32_spdifrx_data *spdifrx = platform_get_drvdata(pdev);



	if (spdifrx->ctrl_chan)

		dma_release_channel(spdifrx->ctrl_chan);



	if (spdifrx->dmab)

		snd_dma_free_pages(spdifrx->dmab);



	snd_dmaengine_pcm_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}



static int stm32_spdifrx_probe(struct platform_device *pdev)

{

	struct stm32_spdifrx_data *spdifrx;
@@ -995,25 +1011,27 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) 
	udelay(2);

	reset_control_deassert(rst);



	ret = devm_snd_soc_register_component(&pdev->dev,

	pcm_config = &stm32_spdifrx_pcm_config;

	ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "PCM DMA register error %d\n", ret);

		return ret;

	}



	ret = snd_soc_register_component(&pdev->dev,

					 &stm32_spdifrx_component,

					 stm32_spdifrx_dai,

					 ARRAY_SIZE(stm32_spdifrx_dai));

	if (ret)

	if (ret) {

		snd_dmaengine_pcm_unregister(&pdev->dev);

		return ret;

	}



	ret = stm32_spdifrx_dma_ctrl_register(&pdev->dev, spdifrx);

	if (ret)

		goto error;



	pcm_config = &stm32_spdifrx_pcm_config;

	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "PCM DMA register error %d\n", ret);

		goto error;

	}



	ret = regmap_read(spdifrx->regmap, STM32_SPDIFRX_IDR, &idr);

	if (ret)

		goto error;
@@ -1029,27 +1047,11 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) 
	return ret;



error:

	if (!IS_ERR(spdifrx->ctrl_chan))

		dma_release_channel(spdifrx->ctrl_chan);

	if (spdifrx->dmab)

		snd_dma_free_pages(spdifrx->dmab);

	stm32_spdifrx_remove(pdev);



	return ret;

}



static int stm32_spdifrx_remove(struct platform_device *pdev)

{

	struct stm32_spdifrx_data *spdifrx = platform_get_drvdata(pdev);



	if (spdifrx->ctrl_chan)

		dma_release_channel(spdifrx->ctrl_chan);



	if (spdifrx->dmab)

		snd_dma_free_pages(spdifrx->dmab);



	return 0;

}



MODULE_DEVICE_TABLE(of, stm32_spdifrx_ids);



#ifdef CONFIG_PM_SLEEP

CRA Git | Maintained and supported by SUSTech CRA and CCSE