Unverified Commit 6879e8e7 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: amd: fix for pcm_read() error 



Below phython script throwing pcm_read() error.

import subprocess

p = subprocess.Popen(["aplay -t raw -D plughw:1,0 /dev/zero"], shell=True)
subprocess.call(["arecord -Dhw:1,0 --dump-hw-params"], shell=True)
subprocess.call(["arecord -Dhw:1,0 -fdat -d1 /dev/null"], shell=True)
p.kill()

Handling ACP global external interrupt enable register
causing this issue.
This register got updated wrongly when there is active
stream causing interrupts disabled for active stream.
Refactored code to handle enabling and disabling external interrupts.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/1619555017-29858-1-git-send-email-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6c9762a7

sound/soc/amd/raven/acp3x-pcm-dma.c

+0 −10
Original line number Diff line number Diff line
@@ -237,10 +237,6 @@ static int acp3x_dma_open(struct snd_soc_component *component, 
		return ret;

	}



	if (!adata->play_stream && !adata->capture_stream &&

	    !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);



	i2s_data->acp3x_base = adata->acp3x_base;

	runtime->private_data = i2s_data;

	return ret;
@@ -367,12 +363,6 @@ static int acp3x_dma_close(struct snd_soc_component *component, 
		}

	}



	/* Disable ACP irq, when the current stream is being closed and

	 * another stream is also not active.

	 */

	if (!adata->play_stream && !adata->capture_stream &&

		!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);

	return 0;

}

sound/soc/amd/raven/acp3x.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define ACP_POWER_OFF_IN_PROGRESS	0x03



#define ACP3x_ITER_IRER_SAMP_LEN_MASK	0x38

#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF



struct acp3x_platform_info {

	u16 play_i2s_instance;

sound/soc/amd/raven/pci-acp3x.c

+15 −0
Original line number Diff line number Diff line
@@ -76,6 +76,19 @@ static int acp3x_reset(void __iomem *acp3x_base) 
	return -ETIMEDOUT;

}



static void acp3x_enable_interrupts(void __iomem *acp_base)

{

	rv_writel(0x01, acp_base + mmACP_EXTERNAL_INTR_ENB);

}



static void acp3x_disable_interrupts(void __iomem *acp_base)

{

	rv_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +

		  mmACP_EXTERNAL_INTR_STAT);

	rv_writel(0x00, acp_base + mmACP_EXTERNAL_INTR_CNTL);

	rv_writel(0x00, acp_base + mmACP_EXTERNAL_INTR_ENB);

}



static int acp3x_init(struct acp3x_dev_data *adata)

{

	void __iomem *acp3x_base = adata->acp3x_base;
@@ -93,6 +106,7 @@ static int acp3x_init(struct acp3x_dev_data *adata) 
		pr_err("ACP3x reset failed\n");

		return ret;

	}

	acp3x_enable_interrupts(acp3x_base);

	return 0;

}
@@ -100,6 +114,7 @@ static int acp3x_deinit(void __iomem *acp3x_base) 
{

	int ret;



	acp3x_disable_interrupts(acp3x_base);

	/* Reset */

	ret = acp3x_reset(acp3x_base);

	if (ret) {