ASoC: amd: added error checks in dma driver
added additional error checks in acp dma driver v2: printed error codes for acp init & acp deinit failure cases. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Signed-off-by: Mark Brown <broonie@kernel.org>zero-colors
parent
d218439fec
commit
7afa535eb1
|
@ -850,6 +850,9 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream)
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct audio_substream_data *rtd = runtime->private_data;
|
struct audio_substream_data *rtd = runtime->private_data;
|
||||||
|
|
||||||
|
if (!rtd)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
buffersize = frames_to_bytes(runtime, runtime->buffer_size);
|
buffersize = frames_to_bytes(runtime, runtime->buffer_size);
|
||||||
bytescount = acp_get_byte_count(rtd->acp_mmio, substream->stream);
|
bytescount = acp_get_byte_count(rtd->acp_mmio, substream->stream);
|
||||||
|
|
||||||
|
@ -875,6 +878,8 @@ static int acp_dma_prepare(struct snd_pcm_substream *substream)
|
||||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
struct audio_substream_data *rtd = runtime->private_data;
|
struct audio_substream_data *rtd = runtime->private_data;
|
||||||
|
|
||||||
|
if (!rtd)
|
||||||
|
return -EINVAL;
|
||||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
config_acp_dma_channel(rtd->acp_mmio, SYSRAM_TO_ACP_CH_NUM,
|
config_acp_dma_channel(rtd->acp_mmio, SYSRAM_TO_ACP_CH_NUM,
|
||||||
PLAYBACK_START_DMA_DESCR_CH12,
|
PLAYBACK_START_DMA_DESCR_CH12,
|
||||||
|
@ -1091,7 +1096,11 @@ static int acp_audio_probe(struct platform_device *pdev)
|
||||||
dev_set_drvdata(&pdev->dev, audio_drv_data);
|
dev_set_drvdata(&pdev->dev, audio_drv_data);
|
||||||
|
|
||||||
/* Initialize the ACP */
|
/* Initialize the ACP */
|
||||||
acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);
|
status = acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);
|
||||||
|
if (status) {
|
||||||
|
dev_err(&pdev->dev, "ACP Init failed status:%d\n", status);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
status = snd_soc_register_platform(&pdev->dev, &acp_asoc_platform);
|
status = snd_soc_register_platform(&pdev->dev, &acp_asoc_platform);
|
||||||
if (status != 0) {
|
if (status != 0) {
|
||||||
|
@ -1108,9 +1117,12 @@ static int acp_audio_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
static int acp_audio_remove(struct platform_device *pdev)
|
static int acp_audio_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
int status;
|
||||||
struct audio_drv_data *adata = dev_get_drvdata(&pdev->dev);
|
struct audio_drv_data *adata = dev_get_drvdata(&pdev->dev);
|
||||||
|
|
||||||
acp_deinit(adata->acp_mmio);
|
status = acp_deinit(adata->acp_mmio);
|
||||||
|
if (status)
|
||||||
|
dev_err(&pdev->dev, "ACP Deinit failed status:%d\n", status);
|
||||||
snd_soc_unregister_platform(&pdev->dev);
|
snd_soc_unregister_platform(&pdev->dev);
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
|
||||||
|
@ -1120,9 +1132,14 @@ static int acp_audio_remove(struct platform_device *pdev)
|
||||||
static int acp_pcm_resume(struct device *dev)
|
static int acp_pcm_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
u16 bank;
|
u16 bank;
|
||||||
|
int status;
|
||||||
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
acp_init(adata->acp_mmio, adata->asic_type);
|
status = acp_init(adata->acp_mmio, adata->asic_type);
|
||||||
|
if (status) {
|
||||||
|
dev_err(dev, "ACP Init failed status:%d\n", status);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
if (adata->play_stream && adata->play_stream->runtime) {
|
if (adata->play_stream && adata->play_stream->runtime) {
|
||||||
/* For Stoney, Memory gating is disabled,i.e SRAM Banks
|
/* For Stoney, Memory gating is disabled,i.e SRAM Banks
|
||||||
|
@ -1154,18 +1171,26 @@ static int acp_pcm_resume(struct device *dev)
|
||||||
|
|
||||||
static int acp_pcm_runtime_suspend(struct device *dev)
|
static int acp_pcm_runtime_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
|
int status;
|
||||||
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
acp_deinit(adata->acp_mmio);
|
status = acp_deinit(adata->acp_mmio);
|
||||||
|
if (status)
|
||||||
|
dev_err(dev, "ACP Deinit failed status:%d\n", status);
|
||||||
acp_reg_write(0, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
|
acp_reg_write(0, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acp_pcm_runtime_resume(struct device *dev)
|
static int acp_pcm_runtime_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
|
int status;
|
||||||
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
struct audio_drv_data *adata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
acp_init(adata->acp_mmio, adata->asic_type);
|
status = acp_init(adata->acp_mmio, adata->asic_type);
|
||||||
|
if (status) {
|
||||||
|
dev_err(dev, "ACP Init failed status:%d\n", status);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
acp_reg_write(1, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
|
acp_reg_write(1, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue