Add Pink Sardine platform ACP6.2 PCI driver init/deinit functions.
Signed-off-by: Syed Saba Kareem <[email protected]>
Signed-off-by: Vijendar Mukunda <[email protected]>
---
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);
+}
+
+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 */
+ 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 */
+ 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 */
+ 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);
}
--
2.25.1
On Fri, Aug 12, 2022 at 05:37:21PM +0530, Syed Saba kareem wrote:
> + /* power on */
> + ret = acp62_power_on(acp_base);
> + if (ret) {
> + pr_err("ACP power on failed\n");
> + return ret;
> + }
It would be better if you passed the device in so messages like this
could be dev_err() rather than just pr_err().
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 <[email protected]>
> Signed-off-by: Vijendar Mukunda <[email protected]>
> ---
> 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.
> +}
> +
> +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.
> + 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?
> + 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
> + 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);
> }
Will fix it and Will resend the patch series.
On 8/12/22 18:03, Mark Brown wrote:
> [CAUTION: External Email]
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 <[email protected]>
>> Signed-off-by: Vijendar Mukunda <[email protected]>
>> ---
>> 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);
>> }
>