| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <6acfaa80-f8f0-4735-40c5-2b91fa0a14ed@amd.com>
Date: Mon, 11 Oct 2021 06:04:30 -0500
From: "Gong, Richard" <richard.gong@....com>
To: Vijendar Mukunda <Vijendar.Mukunda@....com>,
"broonie@...nel.org" <broonie@...nel.org>,
"alsa-devel@...a-project.org" <alsa-devel@...a-project.org>
Cc: "Deucher, Alexander" <Alexander.Deucher@....com>,
"Hiregoudar, Basavaraj" <Basavaraj.Hiregoudar@....com>,
"Dommati, Sunil-kumar" <Sunil-kumar.Dommati@....com>,
"Limonciello, Mario" <Mario.Limonciello@....com>,
Liam Girdwood <lgirdwood@...il.com>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions
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@....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);
> }
Powered by blists - more mailing lists