From: "Mario Limonciello (AMD) (kernel.org)" <superm1@kernel.org>
To: Raghavendra Prasad Mallela <raghavendraprasad.mallela@amd.com>,
broonie@kernel.org, alsa-devel@alsa-project.org
Cc: Vijendar.Mukunda@amd.com, Basavaraj.Hiregoudar@amd.com,
Sunil-kumar.Dommati@amd.com,
Hemalatha Pinnamreddy <hemalatha.pinnamreddy2@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Venkata Prasad Potturu <venkataprasad.potturu@amd.com>,
Peter Zijlstra <peterz@infradead.org>,
"open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..."
<linux-sound@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v1] ASoC: amd: acp: Audio is not resuming after s0ix
Date: Tue, 2 Dec 2025 16:08:09 -0600 [thread overview]
Message-ID: <9070b032-03d3-4f01-85d7-d55918678659@kernel.org> (raw)
In-Reply-To: <20251202175616.2213054-1-raghavendraprasad.mallela@amd.com>
On 12/2/2025 11:56 AM, Raghavendra Prasad Mallela wrote:
> From: Hemalatha Pinnamreddy <hemalatha.pinnamreddy2@amd.com>
>
> Audio fails to resume after system exits suspend mode
> due to accessing incorrect ring buffer address during
> resume. This patch resolves issue by selecting correct
> address based on the ACP version.
>
> Signed-off-by: Hemalatha Pinnamreddy <hemalatha.pinnamreddy2@amd.com>
> Signed-off-by: Raghavendra Prasad Mallela <raghavendraprasad.mallela@amd.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
One nit below.
> ---
> sound/soc/amd/acp/acp-legacy-common.c | 32 +++++++++++++++++++++------
> 1 file changed, 25 insertions(+), 7 deletions(-)
>
> diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c
> index 3078f459e005..da80c761d657 100644
> --- a/sound/soc/amd/acp/acp-legacy-common.c
> +++ b/sound/soc/amd/acp/acp-legacy-common.c
> @@ -208,7 +208,7 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> struct acp_resource *rsrc = chip->rsrc;
> struct acp_stream *stream = substream->runtime->private_data;
> u32 reg_dma_size, reg_fifo_size, reg_fifo_addr;
> - u32 phy_addr, acp_fifo_addr, ext_int_ctrl;
> + u32 phy_addr = 0, acp_fifo_addr, ext_int_ctrl;
Why initialize this variable now?
> unsigned int dir = substream->stream;
>
> switch (dai->driver->id) {
> @@ -219,7 +219,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> SP_PB_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_I2S_TX_FIFOADDR(chip);
> reg_fifo_size = ACP_I2S_TX_FIFOSIZE(chip);
> - phy_addr = I2S_SP_TX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_SP_TX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_SP_TX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_I2S_TX_RINGBUFADDR(chip));
> } else {
> reg_dma_size = ACP_I2S_RX_DMA_SIZE(chip);
> @@ -227,7 +230,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> SP_CAPT_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_I2S_RX_FIFOADDR(chip);
> reg_fifo_size = ACP_I2S_RX_FIFOSIZE(chip);
> - phy_addr = I2S_SP_RX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_SP_RX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_SP_RX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_I2S_RX_RINGBUFADDR(chip));
> }
> break;
> @@ -238,7 +244,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> BT_PB_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_BT_TX_FIFOADDR(chip);
> reg_fifo_size = ACP_BT_TX_FIFOSIZE(chip);
> - phy_addr = I2S_BT_TX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_BT_TX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_BT_TX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_BT_TX_RINGBUFADDR(chip));
> } else {
> reg_dma_size = ACP_BT_RX_DMA_SIZE(chip);
> @@ -246,7 +255,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> BT_CAPT_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_BT_RX_FIFOADDR(chip);
> reg_fifo_size = ACP_BT_RX_FIFOSIZE(chip);
> - phy_addr = I2S_BT_TX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_BT_RX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_BT_RX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_BT_RX_RINGBUFADDR(chip));
> }
> break;
> @@ -257,7 +269,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> HS_PB_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_HS_TX_FIFOADDR;
> reg_fifo_size = ACP_HS_TX_FIFOSIZE;
> - phy_addr = I2S_HS_TX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_HS_TX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_HS_TX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_HS_TX_RINGBUFADDR);
> } else {
> reg_dma_size = ACP_HS_RX_DMA_SIZE;
> @@ -265,7 +280,10 @@ static int set_acp_i2s_dma_fifo(struct snd_pcm_substream *substream,
> HS_CAPT_FIFO_ADDR_OFFSET;
> reg_fifo_addr = ACP_HS_RX_FIFOADDR;
> reg_fifo_size = ACP_HS_RX_FIFOSIZE;
> - phy_addr = I2S_HS_RX_MEM_WINDOW_START + stream->reg_offset;
> + if (chip->acp_rev >= ACP70_PCI_ID)
> + phy_addr = ACP7x_I2S_HS_RX_MEM_WINDOW_START;
> + else
> + phy_addr = I2S_HS_RX_MEM_WINDOW_START + stream->reg_offset;
> writel(phy_addr, chip->base + ACP_HS_RX_RINGBUFADDR);
> }
> break;
next prev parent reply other threads:[~2025-12-02 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-02 17:56 Raghavendra Prasad Mallela
2025-12-02 22:08 ` Mario Limonciello (AMD) (kernel.org) [this message]
2025-12-03 3:23 ` Mukunda,Vijendar
2025-12-03 14:54 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9070b032-03d3-4f01-85d7-d55918678659@kernel.org \
--to=superm1@kernel.org \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=hemalatha.pinnamreddy2@amd.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peterz@infradead.org \
--cc=raghavendraprasad.mallela@amd.com \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®