From: Syed Saba Kareem <ssabakar@amd.com>
To: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
"Syed Saba kareem" <Syed.SabaKareem@amd.com>,
broonie@kernel.org, alsa-devel@alsa-project.org
Cc: Sunil-kumar.Dommati@amd.com, Basavaraj.Hiregoudar@amd.com,
Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
open list <linux-kernel@vger.kernel.org>,
mario.limonciello@amd.com, Vijendar.Mukunda@amd.com
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6.2 init/de-init functions
Date: Tue, 16 Aug 2022 12:18:37 +0530 [thread overview]
Message-ID: <d4af3093-a0d4-554d-5b16-438c81af4d14@amd.com> (raw)
In-Reply-To: <08ef0e7e-bc7a-9db5-23a4-4fd4fb70dd9a@linux.intel.com>
On 8/12/22 19:49, Amadeusz Sławiński wrote:
> [CAUTION: External Email]
>
> On 8/12/2022 2:07 PM, Syed Saba kareem wrote:
>> Add Pink Sardine platform ACP6.2 PCI driver init/deinit functions.
>>
>> Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
>> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
>> ---
>> sound/soc/amd/ps/acp62.h | 12 +++++
>> sound/soc/amd/ps/pci-ps.c | 109 ++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 121 insertions(+)
>>
>> diff --git a/sound/soc/amd/ps/acp62.h b/sound/soc/amd/ps/acp62.h
>> index e91762240c93..8e734f190b11 100644
>> --- a/sound/soc/amd/ps/acp62.h
>> +++ b/sound/soc/amd/ps/acp62.h
>> @@ -10,6 +10,18 @@
>> #define ACP_DEVICE_ID 0x15E2
>> #define ACP62_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 acp62_readl(void __iomem *base_addr)
>> {
>> return readl(base_addr - ACP62_PHY_BASE_ADDRESS);
>> diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
>> index 25169797275c..2014f415af15 100644
>> --- a/sound/soc/amd/ps/pci-ps.c
>> +++ b/sound/soc/amd/ps/pci-ps.c
>> @@ -8,6 +8,7 @@
>> #include <linux/pci.h>
>> #include <linux/module.h>
>> #include <linux/io.h>
>> +#include <linux/delay.h>
>>
>> #include "acp62.h"
>>
>> @@ -15,6 +16,103 @@ struct acp62_dev_data {
>> void __iomem *acp62_base;
>> };
>>
>> +static int acp62_power_on(void __iomem *acp_base)
>> +{
>> + u32 val;
>> + int timeout;
>> +
>> + val = acp62_readl(acp_base + ACP_PGFSM_STATUS);
>> +
>> + if (!val)
>> + return val;
>> +
>> + if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
>> + acp62_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base +
>> ACP_PGFSM_CONTROL);
>> + timeout = 0;
>> + while (++timeout < 500) {
>> + val = acp62_readl(acp_base + ACP_PGFSM_STATUS);
>> + if (!val)
>> + return 0;
>> + udelay(1);
>> + }
>> + return -ETIMEDOUT;
>> +}
>> +
>> +static int acp62_reset(void __iomem *acp_base)
>> +{
>> + u32 val;
>> + int timeout;
>> +
>> + acp62_writel(1, acp_base + ACP_SOFT_RESET);
>> + timeout = 0;
>> + while (++timeout < 500) {
>> + val = acp62_readl(acp_base + ACP_SOFT_RESET);
>> + if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
>> + break;
>> + cpu_relax();
>> + }
>> + acp62_writel(0, acp_base + ACP_SOFT_RESET);
>> + timeout = 0;
>> + while (++timeout < 500) {
>> + val = acp62_readl(acp_base + ACP_SOFT_RESET);
>> + if (!val)
>> + return 0;
>> + cpu_relax();
>> + }
>> + return -ETIMEDOUT;
>> +}
>> +
>> +static void acp62_enable_interrupts(void __iomem *acp_base)
>> +{
>> + acp62_writel(0x01, acp_base + ACP_EXTERNAL_INTR_ENB);
>
> In function before you just write decimal 1 and 0, and here and later in
> patch you use hex values? Should probably be consistent.
>
Will fix it.
>> +}
>> +
>> +static void acp62_disable_interrupts(void __iomem *acp_base)
>> +{
>> + acp62_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +
>> + ACP_EXTERNAL_INTR_STAT);
>> + acp62_writel(0x00, acp_base + ACP_EXTERNAL_INTR_CNTL);
>> + acp62_writel(0x00, acp_base + ACP_EXTERNAL_INTR_ENB);
>> +}
>> +
>> +static int acp62_init(void __iomem *acp_base)
>> +{
>> + int ret;
>> +
>> + /* power on */
> Unnecessary comment? Called function name is already self explanatory,
> no need to repeat it.
Will remove it.
>> + ret = acp62_power_on(acp_base);
>> + if (ret) {
>> + pr_err("ACP power on failed\n");
>> + return ret;
>> + }
>> + acp62_writel(0x01, acp_base + ACP_CONTROL);
>> + /* Reset */
> Same here?
Will remove it.
>> + ret = acp62_reset(acp_base);
>> + if (ret) {
>> + pr_err("ACP reset failed\n");
>> + return ret;
>> + }
>> + acp62_writel(0x03, acp_base + ACP_CLKMUX_SEL);
>> + acp62_enable_interrupts(acp_base);
>> + return 0;
>> +}
>> +
>> +static int acp62_deinit(void __iomem *acp_base)
>> +{
>> + int ret;
>> +
>> + acp62_disable_interrupts(acp_base);
>> + /* Reset */
> Again
Will remove it.
>> + ret = acp62_reset(acp_base);
>> + if (ret) {
>> + pr_err("ACP reset failed\n");
>> + return ret;
>> + }
>> + acp62_writel(0x00, acp_base + ACP_CLKMUX_SEL);
>> + acp62_writel(0x00, acp_base + ACP_CONTROL);
>> + return 0;
>> +}
>> +
>> static int snd_acp62_probe(struct pci_dev *pci,
>> const struct pci_device_id *pci_id)
>> {
>> @@ -56,6 +154,10 @@ static int snd_acp62_probe(struct pci_dev *pci,
>> }
>> pci_set_master(pci);
>> pci_set_drvdata(pci, adata);
>> + ret = acp62_init(adata->acp62_base);
>> + if (ret)
>> + goto release_regions;
>> +
>> return 0;
>> release_regions:
>> pci_release_regions(pci);
>> @@ -67,6 +169,13 @@ static int snd_acp62_probe(struct pci_dev *pci,
>>
>> static void snd_acp62_remove(struct pci_dev *pci)
>> {
>> + struct acp62_dev_data *adata;
>> + int ret;
>> +
>> + adata = pci_get_drvdata(pci);
>> + ret = acp62_deinit(adata->acp62_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:[~2022-08-16 6:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 12:07 [PATCH 00/13] Add Pink Sardine platform ASoC driver Syed Saba kareem
2022-08-12 12:07 ` [PATCH 01/13] ASoC: amd: add Pink Sardine platform ACP IP register header Syed Saba kareem
2022-08-12 12:07 ` [PATCH 02/13] ASoC: amd: add Pink Sardine ACP PCI driver Syed Saba kareem
2022-08-12 14:19 ` Amadeusz Sławiński
2022-08-16 6:00 ` Syed Saba Kareem
2022-08-12 12:07 ` [PATCH 03/13] ASoC: amd: add acp6.2 init/de-init functions Syed Saba kareem
2022-08-12 12:33 ` Mark Brown
2022-08-16 5:47 ` Syed Saba Kareem
2022-08-12 14:19 ` Amadeusz Sławiński
2022-08-16 6:48 ` Syed Saba Kareem [this message]
2022-08-12 12:07 ` [PATCH 04/13] ASoC: amd: add platform devices for acp6.2 pdm driver and dmic driver Syed Saba kareem
2022-08-12 14:20 ` Amadeusz Sławiński
2022-08-16 6:49 ` Syed Saba Kareem
2022-08-12 12:07 ` [PATCH 05/13] ASoC: amd: add acp6.2 pdm platform driver Syed Saba kareem
2022-08-12 14:20 ` Amadeusz Sławiński
2022-08-12 12:07 ` [PATCH 06/13] ASoC: amd: add acp6.2 irq handler Syed Saba kareem
2022-08-12 12:07 ` [PATCH 07/13] ASoC: amd: add acp6.2 pdm driver dma ops Syed Saba kareem
[not found] ` <2dca1704-c04b-9c42-ce1a-51a16530af38@linux.intel.com>
2022-08-16 7:02 ` Syed Saba Kareem
2022-08-12 12:07 ` [PATCH 08/13] ASoC: amd: add acp6.2 pci driver pm ops Syed Saba kareem
2022-08-12 12:07 ` [PATCH 09/13] ASoC: amd: add acp6.2 pdm " Syed Saba kareem
2022-08-12 12:07 ` [PATCH 10/13] ASoC: amd: enable Pink Sardine acp6.2 drivers build Syed Saba kareem
[not found] ` <YvZeNDg++YwEsgdI@sirena.org.uk>
2022-08-27 16:50 ` Syed Saba Kareem
2022-08-12 12:07 ` [PATCH 11/13] ASoC: amd: create platform device for acp6.2 machine driver Syed Saba kareem
2022-08-12 12:07 ` [PATCH 12/13] ASoC: amd: add Pink Sardine machine driver using dmic Syed Saba kareem
2022-08-12 12:07 ` [PATCH 13/13] ASoC: amd: enable Pink sardine platform machine driver build Syed Saba kareem
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=d4af3093-a0d4-554d-5b16-438c81af4d14@amd.com \
--to=ssabakar@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.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).