ASoC: amd: ps: add callback functions for acp pci driver pm ops

Add acp pci driver pm ops related callback functions for ACP6.3
platform.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://patch.msgid.link/20250207062819.1527184-5-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h
index ec22a7dad6ac7a2d73a1ebdd2fbebd0ea5f4fa08..4e3f7eaac04041bc7c113265180f6b8e29799a6c 100644 (file)
--- a/sound/soc/amd/ps/acp63.h
+++ b/sound/soc/amd/ps/acp63.h
@@ -221,10 +221,18 @@ struct acp63_dev_data;
  * struct acp_hw_ops - ACP PCI driver platform specific ops
  * @acp_init: ACP initialization
  * @acp_deinit: ACP de-initialization
+ * acp_suspend: ACP system level suspend callback
+ * acp_resume: ACP system level resume callback
+ * acp_suspend_runtime: ACP runtime suspend callback
+ * acp_resume_runtime: ACP runtime resume callback
  */
 struct acp_hw_ops {
        int (*acp_init)(void __iomem *acp_base, struct device *dev);
        int (*acp_deinit)(void __iomem *acp_base, struct device *dev);
+       int (*acp_suspend)(struct device *dev);
+       int (*acp_resume)(struct device *dev);
+       int (*acp_suspend_runtime)(struct device *dev);
+       int (*acp_resume_runtime)(struct device *dev);
 };
 
 /**
@@ -295,4 +303,40 @@ static inline int acp_hw_deinit(struct acp63_dev_data *adata, struct device *dev
        return -EOPNOTSUPP;
 }
 
+static inline int acp_hw_suspend(struct device *dev)
+{
+       struct acp63_dev_data *adata = dev_get_drvdata(dev);
+
+       if (adata && adata->hw_ops && adata->hw_ops->acp_suspend)
+               return ACP_HW_OPS(adata, acp_suspend)(dev);
+       return -EOPNOTSUPP;
+}
+
+static inline int acp_hw_resume(struct device *dev)
+{
+       struct acp63_dev_data *adata = dev_get_drvdata(dev);
+
+       if (adata && adata->hw_ops && adata->hw_ops->acp_resume)
+               return ACP_HW_OPS(adata, acp_resume)(dev);
+       return -EOPNOTSUPP;
+}
+
+static inline int acp_hw_suspend_runtime(struct device *dev)
+{
+       struct acp63_dev_data *adata = dev_get_drvdata(dev);
+
+       if (adata && adata->hw_ops && adata->hw_ops->acp_suspend_runtime)
+               return ACP_HW_OPS(adata, acp_suspend_runtime)(dev);
+       return -EOPNOTSUPP;
+}
+
+static inline int acp_hw_runtime_resume(struct device *dev)
+{
+       struct acp63_dev_data *adata = dev_get_drvdata(dev);
+
+       if (adata && adata->hw_ops && adata->hw_ops->acp_resume_runtime)
+               return ACP_HW_OPS(adata, acp_resume_runtime)(dev);
+       return -EOPNOTSUPP;
+}
+
 int snd_amd_acp_find_config(struct pci_dev *pci);

diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
index 120bab1844bbb35dd81b53b1b7cb5e05b2ef600c..a37fb6172958effc2e8de47471b897ea579f48db 100644 (file)
--- a/sound/soc/amd/ps/pci-ps.c
+++ b/sound/soc/amd/ps/pci-ps.c
@@ -584,90 +584,24 @@ disable_pci:
        return ret;
 }
 
-static bool check_acp_sdw_enable_status(struct acp63_dev_data *adata)
+static int __maybe_unused snd_acp_suspend(struct device *dev)
 {
-       u32 sdw0_en, sdw1_en;
-
-       sdw0_en = readl(adata->acp63_base + ACP_SW0_EN);
-       sdw1_en = readl(adata->acp63_base + ACP_SW1_EN);
-       return (sdw0_en || sdw1_en);
+       return acp_hw_suspend(dev);
 }
 
-static void handle_acp63_sdw_pme_event(struct acp63_dev_data *adata)
+static int __maybe_unused snd_acp_runtime_resume(struct device *dev)
 {
-       u32 val;
-
-       val = readl(adata->acp63_base + ACP_SW0_WAKE_EN);
-       if (val && adata->sdw->pdev[0])
-               pm_request_resume(&adata->sdw->pdev[0]->dev);
-
-       val = readl(adata->acp63_base + ACP_SW1_WAKE_EN);
-       if (val && adata->sdw->pdev[1])
-               pm_request_resume(&adata->sdw->pdev[1]->dev);
+       return acp_hw_runtime_resume(dev);
 }
 
-static int __maybe_unused snd_acp63_suspend(struct device *dev)
+static int __maybe_unused snd_acp_resume(struct device *dev)
 {
-       struct acp63_dev_data *adata;
-       int ret;
-
-       adata = dev_get_drvdata(dev);
-       if (adata->is_sdw_dev) {
-               adata->sdw_en_stat = check_acp_sdw_enable_status(adata);
-               if (adata->sdw_en_stat) {
-                       writel(1, adata->acp63_base + ACP_ZSC_DSP_CTRL);
-                       return 0;
-               }
-       }
-       ret = acp_hw_deinit(adata, dev);
-       if (ret)
-               dev_err(dev, "ACP de-init failed\n");
-
-       return ret;
-}
-
-static int __maybe_unused snd_acp63_runtime_resume(struct device *dev)
-{
-       struct acp63_dev_data *adata;
-       int ret;
-
-       adata = dev_get_drvdata(dev);
-       if (adata->sdw_en_stat) {
-               writel(0, adata->acp63_base + ACP_ZSC_DSP_CTRL);
-               return 0;
-       }
-       ret = acp_hw_init(adata, dev);
-       if (ret) {
-               dev_err(dev, "ACP init failed\n");
-               return ret;
-       }
-
-       if (!adata->sdw_en_stat)
-               handle_acp63_sdw_pme_event(adata);
-       return 0;
-}
-
-static int __maybe_unused snd_acp63_resume(struct device *dev)
-{
-       struct acp63_dev_data *adata;
-       int ret;
-
-       adata = dev_get_drvdata(dev);
-       if (adata->sdw_en_stat) {
-               writel(0, adata->acp63_base + ACP_ZSC_DSP_CTRL);
-               return 0;
-       }
-
-       ret = acp_hw_deinit(adata, dev);
-       if (ret)
-               dev_err(dev, "ACP init failed\n");
-
-       return ret;
+       return acp_hw_resume(dev);
 }
 
 static const struct dev_pm_ops acp63_pm_ops = {
-       SET_RUNTIME_PM_OPS(snd_acp63_suspend, snd_acp63_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(snd_acp63_suspend, snd_acp63_resume)
+       SET_RUNTIME_PM_OPS(snd_acp_suspend, snd_acp_runtime_resume, NULL)
+       SET_SYSTEM_SLEEP_PM_OPS(snd_acp_suspend, snd_acp_resume)
 };
 
 static void snd_acp63_remove(struct pci_dev *pci)

diff --git a/sound/soc/amd/ps/ps-common.c b/sound/soc/amd/ps/ps-common.c
index 771249a7653746e6820024eeeb5c5d2740d261cf..7643f321be3749f4745ed4979369debebaa86fbf 100644 (file)
--- a/sound/soc/amd/ps/ps-common.c
+++ b/sound/soc/amd/ps/ps-common.c
@@ -13,6 +13,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 
 #include "acp63.h"
 
@@ -97,8 +98,93 @@ static int acp63_deinit(void __iomem *acp_base, struct device *dev)
        return 0;
 }
 
+static bool check_acp_sdw_enable_status(struct acp63_dev_data *adata)
+{
+       u32 sdw0_en, sdw1_en;
+
+       sdw0_en = readl(adata->acp63_base + ACP_SW0_EN);
+       sdw1_en = readl(adata->acp63_base + ACP_SW1_EN);
+       return (sdw0_en || sdw1_en);
+}
+
+static void handle_acp63_sdw_pme_event(struct acp63_dev_data *adata)
+{
+       u32 val;
+
+       val = readl(adata->acp63_base + ACP_SW0_WAKE_EN);
+       if (val && adata->sdw->pdev[0])
+               pm_request_resume(&adata->sdw->pdev[0]->dev);
+
+       val = readl(adata->acp63_base + ACP_SW1_WAKE_EN);
+       if (val && adata->sdw->pdev[1])
+               pm_request_resume(&adata->sdw->pdev[1]->dev);
+}
+
+static int __maybe_unused snd_acp63_suspend(struct device *dev)
+{
+       struct acp63_dev_data *adata;
+       int ret;
+
+       adata = dev_get_drvdata(dev);
+       if (adata->is_sdw_dev) {
+               adata->sdw_en_stat = check_acp_sdw_enable_status(adata);
+               if (adata->sdw_en_stat) {
+                       writel(1, adata->acp63_base + ACP_ZSC_DSP_CTRL);
+                       return 0;
+               }
+       }
+       ret = acp_hw_deinit(adata, dev);
+       if (ret)
+               dev_err(dev, "ACP de-init failed\n");
+
+       return ret;
+}
+
+static int __maybe_unused snd_acp63_runtime_resume(struct device *dev)
+{
+       struct acp63_dev_data *adata;
+       int ret;
+
+       adata = dev_get_drvdata(dev);
+       if (adata->sdw_en_stat) {
+               writel(0, adata->acp63_base + ACP_ZSC_DSP_CTRL);
+               return 0;
+       }
+       ret = acp_hw_init(adata, dev);
+       if (ret) {
+               dev_err(dev, "ACP init failed\n");
+               return ret;
+       }
+
+       if (!adata->sdw_en_stat)
+               handle_acp63_sdw_pme_event(adata);
+       return 0;
+}
+
+static int __maybe_unused snd_acp63_resume(struct device *dev)
+{
+       struct acp63_dev_data *adata;
+       int ret;
+
+       adata = dev_get_drvdata(dev);
+       if (adata->sdw_en_stat) {
+               writel(0, adata->acp63_base + ACP_ZSC_DSP_CTRL);
+               return 0;
+       }
+
+       ret = acp_hw_init(adata, dev);
+       if (ret)
+               dev_err(dev, "ACP init failed\n");
+
+       return ret;
+}
+
 void acp63_hw_init_ops(struct acp_hw_ops *hw_ops)
 {
        hw_ops->acp_init = acp63_init;
        hw_ops->acp_deinit = acp63_deinit;
+       hw_ops->acp_suspend = snd_acp63_suspend;
+       hw_ops->acp_resume = snd_acp63_resume;
+       hw_ops->acp_suspend_runtime = snd_acp63_suspend;
+       hw_ops->acp_resume_runtime = snd_acp63_runtime_resume;
 }