2021-07-19 18:30:20

by Vijendar Mukunda

Subject: [PATCH V3 11/12] ASoC: amd: add vangogh i2s dma driver pm ops

Add Vangogh i2s dma driver pm ops

Signed-off-by: Vijendar Mukunda <[email protected]>
---
sound/soc/amd/vangogh/acp5x-pcm-dma.c | 90 +++++++++++++++++++++++++++
1 file changed, 90 insertions(+)

diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
index a2bd53dc86b9..260b6ae0fb2f 100644
--- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c
+++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/pm_runtime.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -417,13 +418,102 @@ static int acp5x_audio_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "ACP5x I2S IRQ request failed\n");
return -ENODEV;
}
+ pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
+ pm_runtime_use_autosuspend(&pdev->dev);
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_allow(&pdev->dev);
return 0;
}

+static int acp5x_audio_remove(struct platform_device *pdev)
+{
+ pm_runtime_disable(&pdev->dev);
+ return 0;
+}
+
+static int acp5x_pcm_resume(struct device *dev)
+{
+ struct i2s_dev_data *adata;
+ u32 val, reg_val, frmt_val;
+
+ reg_val = 0;
+ frmt_val = 0;
+ adata = dev_get_drvdata(dev);
+
+ if (adata->play_stream && adata->play_stream->runtime) {
+ struct i2s_stream_instance *rtd =
+ adata->play_stream->runtime->private_data;
+ config_acp5x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK);
+ switch (rtd->i2s_instance) {
+ case I2S_HS_INSTANCE:
+ reg_val = ACP_HSTDM_ITER;
+ frmt_val = ACP_HSTDM_TXFRMT;
+ break;
+ case I2S_SP_INSTANCE:
+ default:
+ reg_val = ACP_I2STDM_ITER;
+ frmt_val = ACP_I2STDM_TXFRMT;
+ }
+ acp_writel((rtd->xfer_resolution << 3),
+ rtd->acp5x_base + reg_val);
+ }
+
+ if (adata->capture_stream && adata->capture_stream->runtime) {
+ struct i2s_stream_instance *rtd =
+ adata->capture_stream->runtime->private_data;
+ config_acp5x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE);
+ switch (rtd->i2s_instance) {
+ case I2S_HS_INSTANCE:
+ reg_val = ACP_HSTDM_IRER;
+ frmt_val = ACP_HSTDM_RXFRMT;
+ break;
+ case I2S_SP_INSTANCE:
+ default:
+ reg_val = ACP_I2STDM_IRER;
+ frmt_val = ACP_I2STDM_RXFRMT;
+ }
+ acp_writel((rtd->xfer_resolution << 3),
+ rtd->acp5x_base + reg_val);
+ }
+ if (adata->tdm_mode == TDM_ENABLE) {
+ acp_writel(adata->tdm_fmt, adata->acp5x_base + frmt_val);
+ val = acp_readl(adata->acp5x_base + reg_val);
+ acp_writel(val | 0x2, adata->acp5x_base + reg_val);
+ }
+ acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
+ return 0;
+}
+
+static int acp5x_pcm_suspend(struct device *dev)
+{
+ struct i2s_dev_data *adata;
+
+ adata = dev_get_drvdata(dev);
+ acp_writel(0, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
+ return 0;
+}
+
+static int acp5x_pcm_runtime_resume(struct device *dev)
+{
+ struct i2s_dev_data *adata;
+
+ adata = dev_get_drvdata(dev);
+ acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
+ return 0;
+}
+
+static const struct dev_pm_ops acp5x_pm_ops = {
+ SET_RUNTIME_PM_OPS(acp5x_pcm_suspend,
+ acp5x_pcm_runtime_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(acp5x_pcm_suspend, acp5x_pcm_resume)
+};
+
static struct platform_driver acp5x_dma_driver = {
.probe = acp5x_audio_probe,
+ .remove = acp5x_audio_remove,
.driver = {
.name = "acp5x_i2s_dma",
+ .pm = &acp5x_pm_ops,
},
};

--
2.17.1

2021-07-19 20:11:43

by Vijendar Mukunda

Subject: Re: [PATCH V3 11/12] ASoC: amd: add vangogh i2s dma driver pm ops

On 7/19/21 11:43 PM, Pierre-Louis Bossart wrote:
>
>
> On 7/19/21 11:51 AM, Vijendar Mukunda wrote:
>> Add Vangogh i2s dma driver pm ops
>>
>> Signed-off-by: Vijendar Mukunda <[email protected]>
>> ---
>> sound/soc/amd/vangogh/acp5x-pcm-dma.c | 90 +++++++++++++++++++++++++++
>> 1 file changed, 90 insertions(+)
>>
>> diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
>> index a2bd53dc86b9..260b6ae0fb2f 100644
>> --- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c
>> +++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
>> @@ -8,6 +8,7 @@
>> #include <linux/module.h>
>> #include <linux/err.h>
>> #include <linux/io.h>
>> +#include <linux/pm_runtime.h>
>> #include <sound/pcm.h>
>> #include <sound/pcm_params.h>
>> #include <sound/soc.h>
>> @@ -417,13 +418,102 @@ static int acp5x_audio_probe(struct platform_device *pdev)
>> dev_err(&pdev->dev, "ACP5x I2S IRQ request failed\n");
>> return -ENODEV;
>> }
>> + pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
>> + pm_runtime_use_autosuspend(&pdev->dev);
>> + pm_runtime_enable(&pdev->dev);
>> + pm_runtime_allow(&pdev->dev);
>> return 0;
>> }
>>
>> +static int acp5x_audio_remove(struct platform_device *pdev)
>> +{
>> + pm_runtime_disable(&pdev->dev);
>> + return 0;
>> +}
>> +
>> +static int acp5x_pcm_resume(struct device *dev)
>> +{
>> + struct i2s_dev_data *adata;
>> + u32 val, reg_val, frmt_val;
>> +
>> + reg_val = 0;
>> + frmt_val = 0;
>> + adata = dev_get_drvdata(dev);
>> +
>> + if (adata->play_stream && adata->play_stream->runtime) {
>> + struct i2s_stream_instance *rtd =
>> + adata->play_stream->runtime->private_data;
>> + config_acp5x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK);
>> + switch (rtd->i2s_instance) {
>> + case I2S_HS_INSTANCE:
>> + reg_val = ACP_HSTDM_ITER;
>> + frmt_val = ACP_HSTDM_TXFRMT;
>> + break;
>> + case I2S_SP_INSTANCE:
>> + default:
>> + reg_val = ACP_I2STDM_ITER;
>> + frmt_val = ACP_I2STDM_TXFRMT;
>> + }
>> + acp_writel((rtd->xfer_resolution << 3),
>> + rtd->acp5x_base + reg_val);
>> + }
>> +
>> + if (adata->capture_stream && adata->capture_stream->runtime) {
>> + struct i2s_stream_instance *rtd =
>> + adata->capture_stream->runtime->private_data;
>> + config_acp5x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE);
>> + switch (rtd->i2s_instance) {
>> + case I2S_HS_INSTANCE:
>> + reg_val = ACP_HSTDM_IRER;
>> + frmt_val = ACP_HSTDM_RXFRMT;
>> + break;
>> + case I2S_SP_INSTANCE:
>> + default:
>> + reg_val = ACP_I2STDM_IRER;
>> + frmt_val = ACP_I2STDM_RXFRMT;
>> + }
>> + acp_writel((rtd->xfer_resolution << 3),
>> + rtd->acp5x_base + reg_val);
>> + }
>> + if (adata->tdm_mode == TDM_ENABLE) {
>> + acp_writel(adata->tdm_fmt, adata->acp5x_base + frmt_val);
>> + val = acp_readl(adata->acp5x_base + reg_val);
>> + acp_writel(val | 0x2, adata->acp5x_base + reg_val);
>> + }
>> + acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
>> + return 0;
>> +}
>> +
>> +static int acp5x_pcm_suspend(struct device *dev)
>> +{
>> + struct i2s_dev_data *adata;
>> +
>> + adata = dev_get_drvdata(dev);
>> + acp_writel(0, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
>> + return 0;
>> +}
>> +
>> +static int acp5x_pcm_runtime_resume(struct device *dev)
>> +{
>> + struct i2s_dev_data *adata;
>> +
>> + adata = dev_get_drvdata(dev);
>> + acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
>> + return 0;
>> +}
>
>
> add __maybe_unused for all the suspend/resume functions, in case power management is not enabled
Will fix it and post the new version.
>
>> +static const struct dev_pm_ops acp5x_pm_ops = {
>> + SET_RUNTIME_PM_OPS(acp5x_pcm_suspend,
>> + acp5x_pcm_runtime_resume, NULL)
>> + SET_SYSTEM_SLEEP_PM_OPS(acp5x_pcm_suspend, acp5x_pcm_resume)
>> +};
>> +
>> static struct platform_driver acp5x_dma_driver = {
>> .probe = acp5x_audio_probe,
>> + .remove = acp5x_audio_remove,
>> .driver = {
>> .name = "acp5x_i2s_dma",
>> + .pm = &acp5x_pm_ops,
>> },
>> };
>>
>>

2021-07-20 02:53:25

by Pierre-Louis Bossart

Subject: Re: [PATCH V3 11/12] ASoC: amd: add vangogh i2s dma driver pm ops

On 7/19/21 11:51 AM, Vijendar Mukunda wrote:
> Add Vangogh i2s dma driver pm ops
>
> Signed-off-by: Vijendar Mukunda <[email protected]>
> ---
> sound/soc/amd/vangogh/acp5x-pcm-dma.c | 90 +++++++++++++++++++++++++++
> 1 file changed, 90 insertions(+)
>
> diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
> index a2bd53dc86b9..260b6ae0fb2f 100644
> --- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c
> +++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
> @@ -8,6 +8,7 @@
> #include <linux/module.h>
> #include <linux/err.h>
> #include <linux/io.h>
> +#include <linux/pm_runtime.h>
> #include <sound/pcm.h>
> #include <sound/pcm_params.h>
> #include <sound/soc.h>
> @@ -417,13 +418,102 @@ static int acp5x_audio_probe(struct platform_device *pdev)
> dev_err(&pdev->dev, "ACP5x I2S IRQ request failed\n");
> return -ENODEV;
> }
> + pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
> + pm_runtime_use_autosuspend(&pdev->dev);
> + pm_runtime_enable(&pdev->dev);
> + pm_runtime_allow(&pdev->dev);
> return 0;
> }
>
> +static int acp5x_audio_remove(struct platform_device *pdev)
> +{
> + pm_runtime_disable(&pdev->dev);
> + return 0;
> +}
> +
> +static int acp5x_pcm_resume(struct device *dev)
> +{
> + struct i2s_dev_data *adata;
> + u32 val, reg_val, frmt_val;
> +
> + reg_val = 0;
> + frmt_val = 0;
> + adata = dev_get_drvdata(dev);
> +
> + if (adata->play_stream && adata->play_stream->runtime) {
> + struct i2s_stream_instance *rtd =
> + adata->play_stream->runtime->private_data;
> + config_acp5x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK);
> + switch (rtd->i2s_instance) {
> + case I2S_HS_INSTANCE:
> + reg_val = ACP_HSTDM_ITER;
> + frmt_val = ACP_HSTDM_TXFRMT;
> + break;
> + case I2S_SP_INSTANCE:
> + default:
> + reg_val = ACP_I2STDM_ITER;
> + frmt_val = ACP_I2STDM_TXFRMT;
> + }
> + acp_writel((rtd->xfer_resolution << 3),
> + rtd->acp5x_base + reg_val);
> + }
> +
> + if (adata->capture_stream && adata->capture_stream->runtime) {
> + struct i2s_stream_instance *rtd =
> + adata->capture_stream->runtime->private_data;
> + config_acp5x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE);
> + switch (rtd->i2s_instance) {
> + case I2S_HS_INSTANCE:
> + reg_val = ACP_HSTDM_IRER;
> + frmt_val = ACP_HSTDM_RXFRMT;
> + break;
> + case I2S_SP_INSTANCE:
> + default:
> + reg_val = ACP_I2STDM_IRER;
> + frmt_val = ACP_I2STDM_RXFRMT;
> + }
> + acp_writel((rtd->xfer_resolution << 3),
> + rtd->acp5x_base + reg_val);
> + }
> + if (adata->tdm_mode == TDM_ENABLE) {
> + acp_writel(adata->tdm_fmt, adata->acp5x_base + frmt_val);
> + val = acp_readl(adata->acp5x_base + reg_val);
> + acp_writel(val | 0x2, adata->acp5x_base + reg_val);
> + }
> + acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
> + return 0;
> +}
> +
> +static int acp5x_pcm_suspend(struct device *dev)
> +{
> + struct i2s_dev_data *adata;
> +
> + adata = dev_get_drvdata(dev);
> + acp_writel(0, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
> + return 0;
> +}
> +
> +static int acp5x_pcm_runtime_resume(struct device *dev)
> +{
> + struct i2s_dev_data *adata;
> +
> + adata = dev_get_drvdata(dev);
> + acp_writel(1, adata->acp5x_base + ACP_EXTERNAL_INTR_ENB);
> + return 0;
> +}


add __maybe_unused for all the suspend/resume functions, in case power management is not enabled

> +static const struct dev_pm_ops acp5x_pm_ops = {
> + SET_RUNTIME_PM_OPS(acp5x_pcm_suspend,
> + acp5x_pcm_runtime_resume, NULL)
> + SET_SYSTEM_SLEEP_PM_OPS(acp5x_pcm_suspend, acp5x_pcm_resume)
> +};
> +
> static struct platform_driver acp5x_dma_driver = {
> .probe = acp5x_audio_probe,
> + .remove = acp5x_audio_remove,
> .driver = {
> .name = "acp5x_i2s_dma",
> + .pm = &acp5x_pm_ops,
> },
> };
>
>