From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>,
<pierre-louis.bossart@linux.intel.com>,
<Basavaraj.Hiregoudar@amd.com>, <Sunil-kumar.Dommati@amd.com>,
<Mastan.Katragadda@amd.com>, <Arungopal.kondaveeti@amd.com>,
<mario.limonciello@amd.com>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Syed Saba Kareem <Syed.SabaKareem@amd.com>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH V2 2/9] ASoC: amd: ps: handle SoundWire interrupts in acp pci driver
Date: Mon, 22 May 2023 19:01:15 +0530 [thread overview]
Message-ID: <20230522133122.166841-3-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20230522133122.166841-1-Vijendar.Mukunda@amd.com>
Handle SoundWire manager related interrupts in ACP PCI driver
interrupt handler and schedule SoundWire manager work queue for
further processing.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
sound/soc/amd/ps/acp63.h | 4 ++++
sound/soc/amd/ps/pci-ps.c | 43 ++++++++++++++++++++++++++++++++++-----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h
index 95bb1cef900a..d296059be4f0 100644
--- a/sound/soc/amd/ps/acp63.h
+++ b/sound/soc/amd/ps/acp63.h
@@ -88,6 +88,10 @@
/* time in ms for acp timeout */
#define ACP_TIMEOUT 500
+#define ACP_SDW0_STAT BIT(21)
+#define ACP_SDW1_STAT BIT(2)
+#define ACP_ERROR_IRQ BIT(29)
+
enum acp_config {
ACP_CONFIG_0 = 0,
ACP_CONFIG_1,
diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
index 02caae6968ad..26514e340a33 100644
--- a/sound/soc/amd/ps/pci-ps.c
+++ b/sound/soc/amd/ps/pci-ps.c
@@ -56,6 +56,7 @@ static int acp63_reset(void __iomem *acp_base)
static void acp63_enable_interrupts(void __iomem *acp_base)
{
writel(1, acp_base + ACP_EXTERNAL_INTR_ENB);
+ writel(ACP_ERROR_IRQ, acp_base + ACP_EXTERNAL_INTR_CNTL);
}
static void acp63_disable_interrupts(void __iomem *acp_base)
@@ -102,23 +103,55 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id)
{
struct acp63_dev_data *adata;
struct pdm_dev_data *ps_pdm_data;
- u32 val;
+ struct amd_sdw_manager *amd_manager;
+ u32 ext_intr_stat, ext_intr_stat1;
+ u16 irq_flag = 0;
u16 pdev_index;
adata = dev_id;
if (!adata)
return IRQ_NONE;
+ ext_intr_stat = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
+ if (ext_intr_stat & ACP_SDW0_STAT) {
+ writel(ACP_SDW0_STAT, adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
+ pdev_index = adata->sdw0_dev_index;
+ amd_manager = dev_get_drvdata(&adata->pdev[pdev_index]->dev);
+ if (amd_manager)
+ schedule_work(&amd_manager->amd_sdw_irq_thread);
+ irq_flag = 1;
+ }
- val = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
- if (val & BIT(PDM_DMA_STAT)) {
+ ext_intr_stat1 = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT1);
+ if (ext_intr_stat1 & ACP_SDW1_STAT) {
+ writel(ACP_SDW1_STAT, adata->acp63_base + ACP_EXTERNAL_INTR_STAT1);
+ pdev_index = adata->sdw1_dev_index;
+ amd_manager = dev_get_drvdata(&adata->pdev[pdev_index]->dev);
+ if (amd_manager)
+ schedule_work(&amd_manager->amd_sdw_irq_thread);
+ irq_flag = 1;
+ }
+
+ if (ext_intr_stat & ACP_ERROR_IRQ) {
+ writel(ACP_ERROR_IRQ, adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
+ /* TODO: Report SoundWire Manager instance errors */
+ writel(0, adata->acp63_base + ACP_SW0_I2S_ERROR_REASON);
+ writel(0, adata->acp63_base + ACP_SW1_I2S_ERROR_REASON);
+ writel(0, adata->acp63_base + ACP_ERROR_STATUS);
+ irq_flag = 1;
+ }
+
+ if (ext_intr_stat & BIT(PDM_DMA_STAT)) {
pdev_index = adata->pdm_dev_index;
ps_pdm_data = dev_get_drvdata(&adata->pdev[pdev_index]->dev);
writel(BIT(PDM_DMA_STAT), adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
if (ps_pdm_data->capture_stream)
snd_pcm_period_elapsed(ps_pdm_data->capture_stream);
- return IRQ_HANDLED;
+ irq_flag = 1;
}
- return IRQ_NONE;
+ if (irq_flag)
+ return IRQ_HANDLED;
+ else
+ return IRQ_NONE;
}
static int sdw_amd_scan_controller(struct device *dev)
--
2.34.1
next prev parent reply other threads:[~2023-05-22 13:27 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230522133122.166841-1-Vijendar.Mukunda@amd.com>
2023-05-22 13:31 ` [PATCH V2 1/9] ASoC: amd: ps: create platform devices based on acp config Vijendar Mukunda
2023-05-22 16:16 ` Pierre-Louis Bossart
2023-05-23 6:25 ` Mukunda,Vijendar
2023-05-23 14:29 ` Pierre-Louis Bossart
2023-05-24 7:02 ` Mukunda,Vijendar
2023-05-22 13:31 ` Vijendar Mukunda [this message]
2023-05-22 16:26 ` [PATCH V2 2/9] ASoC: amd: ps: handle SoundWire interrupts in acp pci driver Pierre-Louis Bossart
2023-05-23 6:49 ` Mukunda,Vijendar
2023-05-23 14:34 ` Pierre-Louis Bossart
2023-05-24 7:01 ` Mukunda,Vijendar
2023-05-22 13:31 ` [PATCH V2 3/9] ASoC: amd: ps: add SoundWire dma driver Vijendar Mukunda
2023-05-22 16:34 ` Pierre-Louis Bossart
2023-05-23 7:11 ` Mukunda,Vijendar
2023-05-23 14:48 ` Pierre-Louis Bossart
2023-05-24 11:37 ` Mukunda,Vijendar
2023-05-25 11:43 ` Mukunda,Vijendar
2023-05-22 13:31 ` [PATCH V2 4/9] ASoC: amd: ps: add SoundWire dma driver dma ops Vijendar Mukunda
2023-05-22 16:39 ` Pierre-Louis Bossart
2023-05-23 5:41 ` Mukunda,Vijendar
2023-05-22 13:31 ` [PATCH V2 5/9] ASoC: amd: ps: add support for SoundWire DMA interrupts Vijendar Mukunda
2023-05-22 18:12 ` Pierre-Louis Bossart
2023-05-23 7:36 ` Mukunda,Vijendar
2023-05-23 15:00 ` Pierre-Louis Bossart
2023-05-24 7:45 ` Mukunda,Vijendar
2023-05-31 7:28 ` Mukunda,Vijendar
2023-05-31 13:53 ` Pierre-Louis Bossart
2023-06-05 11:24 ` Mukunda,Vijendar
2023-05-22 13:31 ` [PATCH V2 6/9] ASoC: amd: ps: add pm ops support for SoundWire dma driver Vijendar Mukunda
2023-05-22 18:20 ` Pierre-Louis Bossart
2023-05-23 10:53 ` Mukunda,Vijendar
2023-05-23 15:03 ` Pierre-Louis Bossart
2023-05-22 13:31 ` [PATCH V2 7/9] ASoC: amd: ps: enable SoundWire dma driver build Vijendar Mukunda
2023-05-22 13:31 ` [PATCH V2 8/9] ASoC: amd: update comments in Kconfig file Vijendar Mukunda
2023-05-22 13:31 ` [PATCH V2 9/9] ASoC: amd: ps: Add SoundWire specific checks in pci driver in pm ops Vijendar Mukunda
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=20230522133122.166841-3-Vijendar.Mukunda@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=Arungopal.kondaveeti@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Mastan.Katragadda@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.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;
as well as URLs for NNTP newsgroup(s).