From: "Gong, Richard" <richard.gong@amd.com>
To: Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
"broonie@kernel.org" <broonie@kernel.org>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
Cc: "Deucher, Alexander" <Alexander.Deucher@amd.com>,
"Hiregoudar, Basavaraj" <Basavaraj.Hiregoudar@amd.com>,
"Dommati, Sunil-kumar" <Sunil-kumar.Dommati@amd.com>,
"Limonciello, Mario" <Mario.Limonciello@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions
Date: Mon, 11 Oct 2021 06:06:22 -0500 [thread overview]
Message-ID: <32f0e33d-0f9b-f27d-2fa8-63b493c2d9aa@amd.com> (raw)
In-Reply-To: <20211011055621.13240-4-Vijendar.Mukunda@amd.com>
On 10/11/2021 12:56 AM, Vijendar Mukunda wrote:
> Add Yellow Carp platform ACP6x PCI driver init/deinit functions.
>
> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> ---
> sound/soc/amd/yc/acp6x.h | 12 ++++
> sound/soc/amd/yc/pci-acp6x.c | 109 +++++++++++++++++++++++++++++++++++
> 2 files changed, 121 insertions(+)
>
> diff --git a/sound/soc/amd/yc/acp6x.h b/sound/soc/amd/yc/acp6x.h
> index 62a05db5e34c..76e9e860e9bb 100644
> --- a/sound/soc/amd/yc/acp6x.h
> +++ b/sound/soc/amd/yc/acp6x.h
> @@ -10,6 +10,18 @@
> #define ACP_DEVICE_ID 0x15E2
> #define ACP6x_PHY_BASE_ADDRESS 0x1240000
>
> +#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
> +#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
> +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
> +#define ACP_PGFSM_STATUS_MASK 3
> +#define ACP_POWERED_ON 0
> +#define ACP_POWER_ON_IN_PROGRESS 1
> +#define ACP_POWERED_OFF 2
> +#define ACP_POWER_OFF_IN_PROGRESS 3
> +
> +#define ACP_ERROR_MASK 0x20000000
> +#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
> +
> static inline u32 acp6x_readl(void __iomem *base_addr)
> {
> return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
> diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
> index 2965e8b00314..56fd7cdbc442 100644
> --- a/sound/soc/amd/yc/pci-acp6x.c
> +++ b/sound/soc/amd/yc/pci-acp6x.c
> @@ -7,6 +7,7 @@
> #include <linux/pci.h>
> #include <linux/module.h>
> #include <linux/io.h>
> +#include <linux/delay.h>
>
> #include "acp6x.h"
>
> @@ -14,6 +15,103 @@ struct acp6x_dev_data {
> void __iomem *acp6x_base;
> };
>
> +static int acp6x_power_on(void __iomem *acp_base)
> +{
> + u32 val;
> + int timeout;
> +
> + val = acp6x_readl(acp_base + ACP_PGFSM_STATUS);
> +
> + if (val == 0)
s/val == 0/!val
> + return val;
> +
> + if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
> + acp6x_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
> + timeout = 0;
> + while (++timeout < 500) {
> + val = acp6x_readl(acp_base + ACP_PGFSM_STATUS);
> + if (!val)
> + return 0;
> + udelay(1);
> + }
> + return -ETIMEDOUT;
> +}
> +
> +static int acp6x_reset(void __iomem *acp_base)
> +{
> + u32 val;
> + int timeout;
> +
> + acp6x_writel(1, acp_base + ACP_SOFT_RESET);
> + timeout = 0;
> + while (++timeout < 500) {
> + val = acp6x_readl(acp_base + ACP_SOFT_RESET);
> + if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
> + break;
> + cpu_relax();
> + }
> + acp6x_writel(0, acp_base + ACP_SOFT_RESET);
> + timeout = 0;
> + while (++timeout < 500) {
> + val = acp6x_readl(acp_base + ACP_SOFT_RESET);
> + if (!val)
> + return 0;
> + cpu_relax();
> + }
> + return -ETIMEDOUT;
> +}
> +
> +static void acp6x_enable_interrupts(void __iomem *acp_base)
> +{
> + acp6x_writel(0x01, acp_base + ACP_EXTERNAL_INTR_ENB);
> +}
> +
> +static void acp6x_disable_interrupts(void __iomem *acp_base)
> +{
> + acp6x_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +
> + ACP_EXTERNAL_INTR_STAT);
> + acp6x_writel(0x00, acp_base + ACP_EXTERNAL_INTR_CNTL);
> + acp6x_writel(0x00, acp_base + ACP_EXTERNAL_INTR_ENB);
> +}
> +
> +static int acp6x_init(void __iomem *acp_base)
> +{
> + int ret;
> +
> + /* power on */
> + ret = acp6x_power_on(acp_base);
> + if (ret) {
> + pr_err("ACP power on failed\n");
> + return ret;
> + }
> + acp6x_writel(0x01, acp_base + ACP_CONTROL);
> + /* Reset */
> + ret = acp6x_reset(acp_base);
> + if (ret) {
> + pr_err("ACP reset failed\n");
> + return ret;
> + }
> + acp6x_writel(0x03, acp_base + ACP_CLKMUX_SEL);
> + acp6x_enable_interrupts(acp_base);
> + return 0;
> +}
> +
> +static int acp6x_deinit(void __iomem *acp_base)
> +{
> + int ret;
> +
> + acp6x_disable_interrupts(acp_base);
> + /* Reset */
> + ret = acp6x_reset(acp_base);
> + if (ret) {
> + pr_err("ACP reset failed\n");
> + return ret;
> + }
> + acp6x_writel(0x00, acp_base + ACP_CLKMUX_SEL);
> + acp6x_writel(0x00, acp_base + ACP_CONTROL);
> + return 0;
> +}
> +
> static int snd_acp6x_probe(struct pci_dev *pci,
> const struct pci_device_id *pci_id)
> {
> @@ -52,6 +150,10 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> }
> pci_set_master(pci);
> pci_set_drvdata(pci, adata);
> + ret = acp6x_init(adata->acp6x_base);
> + if (ret)
> + goto release_regions;
> +
> return 0;
> release_regions:
> pci_release_regions(pci);
> @@ -63,6 +165,13 @@ static int snd_acp6x_probe(struct pci_dev *pci,
>
> static void snd_acp6x_remove(struct pci_dev *pci)
> {
> + struct acp6x_dev_data *adata;
> + int ret;
> +
> + adata = pci_get_drvdata(pci);
> + ret = acp6x_deinit(adata->acp6x_base);
> + if (ret)
> + dev_err(&pci->dev, "ACP de-init failed\n");
> pci_release_regions(pci);
> pci_disable_device(pci);
> }
next prev parent reply other threads:[~2021-10-11 11:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211011055621.13240-1-Vijendar.Mukunda@amd.com>
2021-10-11 5:56 ` [PATCH 01/13] ASoC: amd: add Yellow Carp ACP6x IP register header Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 02/13] ASoC: amd: add Yellow Carp ACP PCI driver Vijendar Mukunda
[not found] ` <e61fa81d-bf63-8b41-03d8-12bd3e61af59@amd.com>
2021-10-11 11:43 ` Mukunda,Vijendar
2021-10-11 5:56 ` [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions Vijendar Mukunda
2021-10-11 11:04 ` Gong, Richard
2021-10-11 11:06 ` Gong, Richard [this message]
2021-10-11 11:40 ` Mukunda,Vijendar
2021-10-11 5:56 ` [PATCH 04/13] ASoC: amd: add platform devices for acp6x pdm driver and dmic driver Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 05/13] ASoC: amd: add acp6x pdm platform driver Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 06/13] ASoC: amd: add acp6x irq handler Vijendar Mukunda
2021-10-11 8:58 ` Joe Perches
2021-10-11 9:28 ` Mukunda,Vijendar
2021-10-11 5:56 ` [PATCH 07/13] ASoC: amd: add acp6x pdm driver dma ops Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 08/13] ASoC: amd: add acp6x pci driver pm ops Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 09/13] ASoC: amd: add acp6x pdm " Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 10/13] ASoC: amd: enable Yellow carp acp6x drivers build Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 11/13] ASoC: amd: create platform device for acp6x machine driver Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 12/13] ASoC: amd: add YC machine driver using dmic Vijendar Mukunda
2021-10-11 5:56 ` [PATCH 13/13] ASoC: amd: enable yc machine driver build Vijendar Mukunda
2021-10-11 7:55 ` Randy Dunlap
2021-10-11 8:25 ` Mukunda,Vijendar
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=32f0e33d-0f9b-f27d-2fa8-63b493c2d9aa@amd.com \
--to=richard.gong@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--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®