ASoC: amd: acp: refactor the acp init and de-init sequence
authorSyed Saba Kareem <Syed.SabaKareem@amd.com>
Mon, 26 Jun 2023 13:55:05 +0000 (19:25 +0530)
committerMark Brown <broonie@kernel.org>
Sun, 9 Jul 2023 21:47:33 +0000 (22:47 +0100)
Remove the individual acp init and de-init functions from different
variants of acp pci driver(for renoir/rembrandt platforms) and use a
common file to define callbacks and refactor the callbacks to support
existing platforms.

Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
Link: https://lore.kernel.org/r/20230626135515.1252063-2-Syed.SabaKareem@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/acp/Kconfig
sound/soc/amd/acp/Makefile
sound/soc/amd/acp/acp-legacy-common.c [new file with mode: 0644]
sound/soc/amd/acp/acp-pci.c
sound/soc/amd/acp/acp-rembrandt.c
sound/soc/amd/acp/acp-renoir.c
sound/soc/amd/acp/amd.h

index ce00378..6a369e5 100644 (file)
@@ -18,6 +18,9 @@ if SND_SOC_AMD_ACP_COMMON
 config SND_SOC_AMD_ACP_PDM
        tristate
 
+config SND_SOC_AMD_ACP_LEGACY_COMMON
+       tristate
+
 config SND_SOC_AMD_ACP_I2S
        tristate
 
@@ -28,6 +31,7 @@ config SND_SOC_AMD_ACP_PCM
 config SND_SOC_AMD_ACP_PCI
        tristate "AMD ACP PCI Driver Support"
        depends on X86 && PCI
+       select SND_SOC_AMD_ACP_LEGACY_COMMON
        help
          This options enables generic PCI driver for ACP device.
 
index d9abb0e..4e65fdb 100644 (file)
@@ -8,6 +8,7 @@
 snd-acp-pcm-objs     := acp-platform.o
 snd-acp-i2s-objs     := acp-i2s.o
 snd-acp-pdm-objs     := acp-pdm.o
+snd-acp-legacy-common-objs   := acp-legacy-common.o
 snd-acp-pci-objs     := acp-pci.o
 
 #platform specific driver
@@ -22,6 +23,7 @@ snd-acp-sof-mach-objs     := acp-sof-mach.o
 obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o
 obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o
 obj-$(CONFIG_SND_SOC_AMD_ACP_PDM) += snd-acp-pdm.o
+obj-$(CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON) += snd-acp-legacy-common.o
 obj-$(CONFIG_SND_SOC_AMD_ACP_PCI) += snd-acp-pci.o
 
 obj-$(CONFIG_SND_AMD_ASOC_RENOIR) += snd-acp-renoir.o
diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c
new file mode 100644 (file)
index 0000000..5b7000e
--- /dev/null
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license. When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2023 Advanced Micro Devices, Inc.
+//
+// Authors: Syed Saba Kareem <Syed.SabaKareem@amd.com>
+//
+
+/*
+ * Common file to be used by amd platforms
+ */
+
+#include "amd.h"
+#include <linux/export.h>
+
+static int acp_power_on(struct acp_chip_info *chip)
+{
+       u32 val, acp_pgfsm_stat_reg, acp_pgfsm_ctrl_reg;
+       void __iomem *base;
+
+       base = chip->base;
+       switch (chip->acp_rev) {
+       case ACP3X_DEV:
+               acp_pgfsm_stat_reg = ACP_PGFSM_STATUS;
+               acp_pgfsm_ctrl_reg = ACP_PGFSM_CONTROL;
+               break;
+       case ACP6X_DEV:
+               acp_pgfsm_stat_reg = ACP6X_PGFSM_STATUS;
+               acp_pgfsm_ctrl_reg = ACP6X_PGFSM_CONTROL;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       val = readl(base + acp_pgfsm_stat_reg);
+       if (val == ACP_POWERED_ON)
+               return 0;
+
+       if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
+               writel(ACP_PGFSM_CNTL_POWER_ON_MASK, base + acp_pgfsm_ctrl_reg);
+
+       return readl_poll_timeout(base + acp_pgfsm_stat_reg, val,
+                                 !val, DELAY_US, ACP_TIMEOUT);
+}
+
+static int acp_reset(void __iomem *base)
+{
+       u32 val;
+       int ret;
+
+       writel(1, base + ACP_SOFT_RESET);
+       ret = readl_poll_timeout(base + ACP_SOFT_RESET, val, val & ACP_SOFT_RST_DONE_MASK,
+                                DELAY_US, ACP_TIMEOUT);
+       if (ret)
+               return ret;
+
+       writel(0, base + ACP_SOFT_RESET);
+       return readl_poll_timeout(base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP_TIMEOUT);
+}
+
+int acp_init(struct acp_chip_info *chip)
+{
+       int ret;
+
+       /* power on */
+       ret = acp_power_on(chip);
+       if (ret) {
+               pr_err("ACP power on failed\n");
+               return ret;
+       }
+       writel(0x01, chip->base + ACP_CONTROL);
+
+       /* Reset */
+       ret = acp_reset(chip->base);
+       if (ret) {
+               pr_err("ACP reset failed\n");
+               return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL_NS_GPL(acp_init, SND_SOC_ACP_COMMON);
+
+int acp_deinit(void __iomem *base)
+{
+       int ret;
+
+       /* Reset */
+       ret = acp_reset(base);
+       if (ret)
+               return ret;
+
+       writel(0, base + ACP_CONTROL);
+       return 0;
+}
+EXPORT_SYMBOL_NS_GPL(acp_deinit, SND_SOC_ACP_COMMON);
+
+MODULE_LICENSE("Dual BSD/GPL");
index 8154fbf..a51cf7f 100644 (file)
@@ -106,6 +106,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
                goto unregister_dmic_dev;
        }
 
+       acp_init(chip);
        res = devm_kcalloc(&pci->dev, num_res, sizeof(struct resource), GFP_KERNEL);
        if (!res) {
                ret = -ENOMEM;
@@ -154,10 +155,17 @@ disable_pci:
 
 static void acp_pci_remove(struct pci_dev *pci)
 {
+       struct acp_chip_info *chip;
+       int ret;
+
+       chip = pci_get_drvdata(pci);
        if (dmic_dev)
                platform_device_unregister(dmic_dev);
        if (pdev)
                platform_device_unregister(pdev);
+       ret = acp_deinit(chip->base);
+       if (ret)
+               dev_err(&pci->dev, "ACP de-init failed\n");
 }
 
 /* PCI IDs */
@@ -177,4 +185,5 @@ static struct pci_driver snd_amd_acp_pci_driver = {
 module_pci_driver(snd_amd_acp_pci_driver);
 
 MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(SND_SOC_ACP_COMMON);
 MODULE_ALIAS(DRV_NAME);
index 1b99783..59b1653 100644 (file)
 
 #define DRV_NAME "acp_asoc_rembrandt"
 
-#define ACP6X_PGFSM_CONTROL                    0x1024
-#define ACP6X_PGFSM_STATUS                     0x1028
-
-#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK  0x00010001
-
-#define ACP_PGFSM_CNTL_POWER_ON_MASK           0x01
-#define ACP_PGFSM_CNTL_POWER_OFF_MASK          0x00
-#define ACP_PGFSM_STATUS_MASK                  0x03
-#define ACP_POWERED_ON                         0x00
-#define ACP_POWER_ON_IN_PROGRESS               0x01
-#define ACP_POWERED_OFF                                0x02
-#define ACP_POWER_OFF_IN_PROGRESS              0x03
-
-#define ACP_ERROR_MASK                         0x20000000
-#define ACP_EXT_INTR_STAT_CLEAR_MASK           0xFFFFFFFF
-
-
-static int rmb_acp_init(void __iomem *base);
-static int rmb_acp_deinit(void __iomem *base);
-
 static struct acp_resource rsrc = {
        .offset = 0,
        .no_of_ctrls = 2,
@@ -180,54 +160,6 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = {
 },
 };
 
-static int acp6x_power_on(void __iomem *base)
-{
-       u32 val;
-       int timeout;
-
-       val = readl(base + ACP6X_PGFSM_STATUS);
-
-       if (val == ACP_POWERED_ON)
-               return 0;
-
-       if ((val & ACP_PGFSM_STATUS_MASK) !=
-                               ACP_POWER_ON_IN_PROGRESS)
-               writel(ACP_PGFSM_CNTL_POWER_ON_MASK,
-                      base + ACP6X_PGFSM_CONTROL);
-       timeout = 0;
-       while (++timeout < 500) {
-               val = readl(base + ACP6X_PGFSM_STATUS);
-               if (!val)
-                       return 0;
-               udelay(1);
-       }
-       return -ETIMEDOUT;
-}
-
-static int acp6x_reset(void __iomem *base)
-{
-       u32 val;
-       int timeout;
-
-       writel(1, base + ACP_SOFT_RESET);
-       timeout = 0;
-       while (++timeout < 500) {
-               val = readl(base + ACP_SOFT_RESET);
-               if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
-                       break;
-               cpu_relax();
-       }
-       writel(0, base + ACP_SOFT_RESET);
-       timeout = 0;
-       while (++timeout < 500) {
-               val = readl(base + ACP_SOFT_RESET);
-               if (!val)
-                       return 0;
-               cpu_relax();
-       }
-       return -ETIMEDOUT;
-}
-
 static void acp6x_enable_interrupts(struct acp_dev_data *adata)
 {
        struct acp_resource *rsrc = adata->rsrc;
@@ -248,43 +180,6 @@ static void acp6x_disable_interrupts(struct acp_dev_data *adata)
        writel(0x00, ACP_EXTERNAL_INTR_ENB(adata));
 }
 
-static int rmb_acp_init(void __iomem *base)
-{
-       int ret;
-
-       /* power on */
-       ret = acp6x_power_on(base);
-       if (ret) {
-               pr_err("ACP power on failed\n");
-               return ret;
-       }
-       writel(0x01, base + ACP_CONTROL);
-
-       /* Reset */
-       ret = acp6x_reset(base);
-       if (ret) {
-               pr_err("ACP reset failed\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static int rmb_acp_deinit(void __iomem *base)
-{
-       int ret = 0;
-
-       /* Reset */
-       ret = acp6x_reset(base);
-       if (ret) {
-               pr_err("ACP reset failed\n");
-               return ret;
-       }
-
-       writel(0x00, base + ACP_CONTROL);
-       return 0;
-}
-
 static int rembrandt_audio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -303,8 +198,6 @@ static int rembrandt_audio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       rmb_acp_init(chip->base);
-
        adata = devm_kzalloc(dev, sizeof(struct acp_dev_data), GFP_KERNEL);
        if (!adata)
                return -ENOMEM;
@@ -345,9 +238,6 @@ static void rembrandt_audio_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct acp_dev_data *adata = dev_get_drvdata(dev);
-       struct acp_chip_info *chip = dev_get_platdata(dev);
-
-       rmb_acp_deinit(chip->base);
 
        acp6x_disable_interrupts(adata);
        acp_platform_unregister(dev);
index f188365..a73fd70 100644 (file)
 
 #define DRV_NAME "acp_asoc_renoir"
 
-#define ACP_SOFT_RST_DONE_MASK 0x00010001
-
-#define ACP_PWR_ON_MASK                0x01
-#define ACP_PWR_OFF_MASK       0x00
-#define ACP_PGFSM_STAT_MASK    0x03
-#define ACP_POWERED_ON         0x00
-#define ACP_PWR_ON_IN_PROGRESS 0x01
-#define ACP_POWERED_OFF                0x02
-#define DELAY_US               5
-#define ACP_TIMEOUT            500
-
-#define ACP_ERROR_MASK 0x20000000
-#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
-
 static struct acp_resource rsrc = {
        .offset = 20,
        .no_of_ctrls = 1,
@@ -154,38 +140,6 @@ static struct snd_soc_dai_driver acp_renoir_dai[] = {
 },
 };
 
-static int acp3x_power_on(void __iomem *base)
-{
-       u32 val;
-
-       val = readl(base + ACP_PGFSM_STATUS);
-
-       if (val == ACP_POWERED_ON)
-               return 0;
-
-       if ((val & ACP_PGFSM_STAT_MASK) != ACP_PWR_ON_IN_PROGRESS)
-               writel(ACP_PWR_ON_MASK, base + ACP_PGFSM_CONTROL);
-
-       return readl_poll_timeout(base + ACP_PGFSM_STATUS, val, !val, DELAY_US, ACP_TIMEOUT);
-}
-
-static int acp3x_reset(void __iomem *base)
-{
-       u32 val;
-       int ret;
-
-       writel(1, base + ACP_SOFT_RESET);
-
-       ret = readl_poll_timeout(base + ACP_SOFT_RESET, val, val & ACP_SOFT_RST_DONE_MASK,
-                                DELAY_US, ACP_TIMEOUT);
-       if (ret)
-               return ret;
-
-       writel(0, base + ACP_SOFT_RESET);
-
-       return readl_poll_timeout(base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP_TIMEOUT);
-}
-
 static void acp3x_enable_interrupts(struct acp_dev_data *adata)
 {
        struct acp_resource *rsrc = adata->rsrc;
@@ -206,37 +160,6 @@ static void acp3x_disable_interrupts(struct acp_dev_data *adata)
        writel(0x00, ACP_EXTERNAL_INTR_ENB(adata));
 }
 
-static int rn_acp_init(void __iomem *base)
-{
-       int ret;
-
-       /* power on */
-       ret = acp3x_power_on(base);
-       if (ret)
-               return ret;
-
-       writel(0x01, base + ACP_CONTROL);
-
-       /* Reset */
-       ret = acp3x_reset(base);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static int rn_acp_deinit(void __iomem *base)
-{
-       int ret = 0;
-
-       /* Reset */
-       ret = acp3x_reset(base);
-       if (ret)
-               return ret;
-
-       writel(0x00, base + ACP_CONTROL);
-       return 0;
-}
 static int renoir_audio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -256,12 +179,6 @@ static int renoir_audio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ret = rn_acp_init(chip->base);
-       if (ret) {
-               dev_err(&pdev->dev, "ACP Init failed\n");
-               return -EINVAL;
-       }
-
        adata = devm_kzalloc(dev, sizeof(struct acp_dev_data), GFP_KERNEL);
        if (!adata)
                return -ENOMEM;
@@ -300,17 +217,8 @@ static void renoir_audio_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct acp_dev_data *adata = dev_get_drvdata(dev);
-       struct acp_chip_info *chip;
-       int ret;
-
-       chip = dev_get_platdata(&pdev->dev);
 
        acp3x_disable_interrupts(adata);
-
-       ret = rn_acp_deinit(chip->base);
-       if (ret)
-               dev_err(&pdev->dev, "ACP de-init Failed (%pe)\n", ERR_PTR(ret));
-
        acp_platform_unregister(dev);
 }
 
index 12a176a..19327c4 100644 (file)
 #define SLOT_WIDTH_24  0x18
 #define SLOT_WIDTH_32  0x20
 
+#define ACP6X_PGFSM_CONTROL                     0x1024
+#define ACP6X_PGFSM_STATUS                      0x1028
+
+#define ACP_SOFT_RST_DONE_MASK 0x00010001
+
+#define ACP_PGFSM_CNTL_POWER_ON_MASK            0x01
+#define ACP_PGFSM_CNTL_POWER_OFF_MASK           0x00
+#define ACP_PGFSM_STATUS_MASK                   0x03
+#define ACP_POWERED_ON                          0x00
+#define ACP_POWER_ON_IN_PROGRESS                0x01
+#define ACP_POWERED_OFF                         0x02
+#define ACP_POWER_OFF_IN_PROGRESS               0x03
+
+#define ACP_ERROR_MASK                          0x20000000
+#define ACP_EXT_INTR_STAT_CLEAR_MASK            0xffffffff
+
+#define ACP_TIMEOUT            500
+#define DELAY_US               5
+
 struct acp_chip_info {
        char *name;             /* Platform name */
        unsigned int acp_rev;   /* ACP Revision id */
@@ -168,6 +187,8 @@ int acp_platform_unregister(struct device *dev);
 
 int acp_machine_select(struct acp_dev_data *adata);
 
+int acp_init(struct acp_chip_info *chip);
+int acp_deinit(void __iomem *base);
 /* Machine configuration */
 int snd_amd_acp_find_config(struct pci_dev *pci);