From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <--to=broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>, <Basavaraj.Hiregoudar@amd.com>,
<Sunil-kumar.Dommati@amd.com>, <Mastan.Katragadda@amd.com>,
<Arungopal.kondaveeti@amd.com>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
"Syed Saba Kareem" <Syed.SabaKareem@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/9] ASoC: amd: ps: add support for Soundwire DMA interrupts
Date: Tue, 16 May 2023 16:05:39 +0530 [thread overview]
Message-ID: <20230516103543.2515097-6-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20230516103543.2515097-1-Vijendar.Mukunda@amd.com>
Initialize workqueue for Soundwire DMA interrupts handling.
Whenever audio data equal to the Soundwire FIFO watermark level
are produced/consumed, interrupt is generated.
Acknowledge the interrupt and schedule the workqueue.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
sound/soc/amd/ps/acp63.h | 17 ++++++++
sound/soc/amd/ps/pci-ps.c | 87 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h
index 7f8e1c76ba4f..f03a98a0b9e3 100644
--- a/sound/soc/amd/ps/acp63.h
+++ b/sound/soc/amd/ps/acp63.h
@@ -135,6 +135,20 @@ enum acp_pdev_mask {
ACP63_SDW_PDM_DEV_MASK,
};
+enum amd_sdw0_channel {
+ ACP_SDW0_AUDIO0_TX = 0,
+ ACP_SDW0_AUDIO1_TX,
+ ACP_SDW0_AUDIO2_TX,
+ ACP_SDW0_AUDIO0_RX,
+ ACP_SDW0_AUDIO1_RX,
+ ACP_SDW0_AUDIO2_RX,
+};
+
+enum amd_sdw1_channel {
+ ACP_SDW1_AUDIO1_TX,
+ ACP_SDW1_AUDIO1_RX,
+};
+
struct pdm_stream_instance {
u16 num_pages;
u16 channels;
@@ -217,9 +231,12 @@ struct acp63_dev_data {
struct platform_device *pdev[ACP63_DEVS];
struct mutex acp_lock; /* protect shared registers */
struct fwnode_handle *sdw_fw_node;
+ struct work_struct acp_sdw_dma_work;
u16 pdev_mask;
u16 pdev_count;
u16 pdm_dev_index;
+ u16 sdw0_dma_intr_stat[ACP63_SDW0_DMA_MAX_STREAMS];
+ u16 sdw1_dma_intr_stat[ACP63_SDW1_DMA_MAX_STREAMS];
u8 sdw_manager_count;
u16 sdw0_dev_index;
u16 sdw1_dev_index;
diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
index 6566ee14d300..ba8ec8442a6e 100644
--- a/sound/soc/amd/ps/pci-ps.c
+++ b/sound/soc/amd/ps/pci-ps.c
@@ -99,14 +99,44 @@ static int acp63_deinit(void __iomem *acp_base, struct device *dev)
return 0;
}
+static void acp63_sdw_dma_workthread(struct work_struct *work)
+{
+ struct acp63_dev_data *adata = container_of(work, struct acp63_dev_data,
+ acp_sdw_dma_work);
+ struct sdw_dma_dev_data *sdw_dma_data;
+ u32 stream_index;
+ u16 pdev_index;
+
+ pdev_index = adata->sdw_dma_dev_index;
+ sdw_dma_data = dev_get_drvdata(&adata->pdev[pdev_index]->dev);
+
+ for (stream_index = 0; stream_index < ACP63_SDW0_DMA_MAX_STREAMS; stream_index++) {
+ if (adata->sdw0_dma_intr_stat[stream_index]) {
+ if (sdw_dma_data->sdw0_dma_stream[stream_index])
+ snd_pcm_period_elapsed(sdw_dma_data->sdw0_dma_stream[stream_index]);
+ adata->sdw0_dma_intr_stat[stream_index] = 0;
+ }
+ }
+ for (stream_index = 0; stream_index < ACP63_SDW1_DMA_MAX_STREAMS; stream_index++) {
+ if (adata->sdw1_dma_intr_stat[stream_index]) {
+ if (sdw_dma_data->sdw1_dma_stream[stream_index])
+ snd_pcm_period_elapsed(sdw_dma_data->sdw1_dma_stream[stream_index]);
+ adata->sdw1_dma_intr_stat[stream_index] = 0;
+ }
+ }
+}
+
static irqreturn_t acp63_irq_handler(int irq, void *dev_id)
{
struct acp63_dev_data *adata;
struct pdm_dev_data *ps_pdm_data;
struct amd_sdw_manager *amd_manager;
u32 ext_intr_stat, ext_intr_stat1;
+ u32 stream_id = 0;
u16 irq_flag = 0;
+ u16 sdw_dma_irq_flag = 0;
u16 pdev_index;
+ u16 index;
adata = dev_id;
if (!adata)
@@ -147,7 +177,57 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id)
snd_pcm_period_elapsed(ps_pdm_data->capture_stream);
irq_flag = 1;
}
- if (irq_flag)
+ if (ext_intr_stat & ACP_SDW_DMA_IRQ_MASK) {
+ for (index = ACP_AUDIO2_RX_THRESHOLD; index <= ACP_AUDIO0_TX_THRESHOLD; index++) {
+ if (ext_intr_stat & BIT(index)) {
+ writel(BIT(index), adata->acp63_base + ACP_EXTERNAL_INTR_STAT);
+ switch (index) {
+ case ACP_AUDIO0_TX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO0_TX;
+ break;
+ case ACP_AUDIO1_TX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO1_TX;
+ break;
+ case ACP_AUDIO2_TX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO2_TX;
+ break;
+ case ACP_AUDIO0_RX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO0_RX;
+ break;
+ case ACP_AUDIO1_RX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO1_RX;
+ break;
+ case ACP_AUDIO2_RX_THRESHOLD:
+ stream_id = ACP_SDW0_AUDIO2_RX;
+ break;
+ }
+
+ adata->sdw0_dma_intr_stat[stream_id] = 1;
+ sdw_dma_irq_flag = 1;
+ }
+ }
+ }
+
+ /* SDW1 BT RX */
+ if (ext_intr_stat1 & BIT(ACP_P1_AUDIO1_RX_THRESHOLD)) {
+ writel(BIT(ACP_P1_AUDIO1_RX_THRESHOLD),
+ adata->acp63_base + ACP_EXTERNAL_INTR_STAT1);
+ adata->sdw1_dma_intr_stat[ACP_SDW1_AUDIO1_RX] = 1;
+ sdw_dma_irq_flag = 1;
+ }
+
+ /* SDW1 BT TX*/
+ if (ext_intr_stat1 & BIT(ACP_P1_AUDIO1_TX_THRESHOLD)) {
+ writel(BIT(ACP_P1_AUDIO1_TX_THRESHOLD),
+ adata->acp63_base + ACP_EXTERNAL_INTR_STAT1);
+ adata->sdw1_dma_intr_stat[ACP_SDW1_AUDIO1_TX] = 1;
+ sdw_dma_irq_flag = 1;
+ }
+
+ if (sdw_dma_irq_flag)
+ schedule_work(&adata->acp_sdw_dma_work);
+
+ if (irq_flag || sdw_dma_irq_flag)
return IRQ_HANDLED;
else
return IRQ_NONE;
@@ -229,6 +309,7 @@ static int get_acp63_device_config(u32 config, struct pci_dev *pci, struct acp63
sdw_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_SDW_ADDR, 0);
if (sdw_dev) {
acp_data->sdw_fw_node = acpi_fwnode_handle(sdw_dev);
+ INIT_WORK(&acp_data->acp_sdw_dma_work, acp63_sdw_dma_workthread);
ret = sdw_amd_scan_controller(&pci->dev);
if (!ret)
is_sdw_dev = true;
@@ -607,6 +688,10 @@ static void snd_acp63_remove(struct pci_dev *pci)
int ret, index;
adata = pci_get_drvdata(pci);
+
+ if (adata->pdev_mask & ACP63_SDW_DEV_MASK)
+ cancel_work_sync(&adata->acp_sdw_dma_work);
+
for (index = 0; index < adata->pdev_count; index++)
platform_device_unregister(adata->pdev[index]);
ret = acp63_deinit(adata->acp63_base, &pci->dev);
--
2.34.1
next prev parent reply other threads:[~2023-05-16 10:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230516103543.2515097-1-Vijendar.Mukunda@amd.com>
2023-05-16 10:35 ` [PATCH 1/9] ASoC: amd: ps: create platform devices based on acp config Vijendar Mukunda
2023-05-16 14:32 ` Pierre-Louis Bossart
2023-05-17 8:38 ` Mukunda,Vijendar
2023-05-17 13:40 ` Pierre-Louis Bossart
2023-05-16 10:35 ` [PATCH 2/9] ASoC: amd: ps: handle soundwire interrupts in acp pci driver Vijendar Mukunda
2023-05-16 14:39 ` Pierre-Louis Bossart
2023-05-17 7:18 ` Mukunda,Vijendar
2023-05-17 13:36 ` Pierre-Louis Bossart
2023-05-16 10:35 ` [PATCH 3/9] ASoC: amd: ps: add soundwire dma driver Vijendar Mukunda
2023-05-16 14:40 ` Pierre-Louis Bossart
2023-05-16 16:50 ` Limonciello, Mario
2023-05-17 6:29 ` Mukunda,Vijendar
2023-05-16 10:35 ` [PATCH 4/9] ASoC: amd: ps: add soundwire dma driver dma ops Vijendar Mukunda
2023-05-16 10:35 ` Vijendar Mukunda [this message]
2023-05-16 10:35 ` [PATCH 6/9] ASoC: amd: ps: add pm ops support for soundwire dma driver Vijendar Mukunda
2023-05-16 10:35 ` [PATCH 7/9] ASoC: amd: ps: enable SoundWire dma driver build Vijendar Mukunda
2023-05-17 16:17 ` kernel test robot
2023-05-18 5:01 ` Mukunda,Vijendar
2023-05-16 10:35 ` [PATCH 8/9] ASoC: amd: update comments in Kconfig file Vijendar Mukunda
2023-05-16 10:35 ` [PATCH 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=20230516103543.2515097-6-Vijendar.Mukunda@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=--to=broonie@kernel.org \
--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=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
all inboxes | Powered by JetHome®