ASoC: SOF: Intel: ICL: move ICL-specific ops to icl.c

Move the ICL specific ops to icl.c. Also introduce a
macro ICL_DSP_HPRO_CORE_ID to define the core that
should be powered up when HPRO is enabled.

Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211207193947.71080-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 40201e5..bfb0e37 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -481,49 +481,6 @@ int hda_dsp_post_fw_run(struct snd_sof_dev *sdev)
        return hda_dsp_ctrl_clock_power_gating(sdev, true);
 }
 
-/*
- * post fw run operations for ICL,
- * Core 3 will be powered up and in stall when HPRO is enabled
- */
-int hda_dsp_post_fw_run_icl(struct snd_sof_dev *sdev)
-{
-       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
-       int ret;
-
-       if (sdev->first_boot) {
-               ret = hda_sdw_startup(sdev);
-               if (ret < 0) {
-                       dev_err(sdev->dev,
-                               "error: could not startup SoundWire links\n");
-                       return ret;
-               }
-       }
-
-       hda_sdw_int_enable(sdev, true);
-
-       /*
-        * The recommended HW programming sequence for ICL is to
-        * power up core 3 and keep it in stall if HPRO is enabled.
-        * Major difference between ICL and TGL, on ICL core 3 is managed by
-        * the host whereas on TGL it is handled by the firmware.
-        */
-       if (!hda->clk_config_lpro) {
-               ret = hda_dsp_enable_core(sdev, BIT(3));
-               if (ret < 0) {
-                       dev_err(sdev->dev, "error: dsp core power up failed on core 3\n");
-                       return ret;
-               }
-
-               sdev->enabled_cores_mask |= BIT(3);
-               sdev->dsp_core_ref_count[3]++;
-
-               snd_sof_dsp_stall(sdev, BIT(3));
-       }
-
-       /* re-enable clock gating and power gating */
-       return hda_dsp_ctrl_clock_power_gating(sdev, true);
-}
-
 int hda_dsp_ext_man_get_cavs_config_data(struct snd_sof_dev *sdev,
                                         const struct sof_ext_man_elem_header *hdr)
 {
@@ -561,24 +518,3 @@ int hda_dsp_ext_man_get_cavs_config_data(struct snd_sof_dev *sdev,
 
        return 0;
 }
-
-int hda_dsp_core_stall_icl(struct snd_sof_dev *sdev, unsigned int core_mask)
-{
-       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
-       const struct sof_intel_dsp_desc *chip = hda->desc;
-
-       /* make sure core_mask in host managed cores */
-       core_mask &= chip->host_managed_cores_mask;
-       if (!core_mask) {
-               dev_err(sdev->dev, "error: core_mask is not in host managed cores\n");
-               return -EINVAL;
-       }
-
-       /* stall core */
-       snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR,
-                                        HDA_DSP_REG_ADSPCS,
-                                        HDA_DSP_ADSPCS_CSTALL_MASK(core_mask),
-                                        HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));
-
-       return 0;
-}

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 72e78c4..e2055b6 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -618,8 +618,6 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev);
 /* pre and post fw run ops */
 int hda_dsp_pre_fw_run(struct snd_sof_dev *sdev);
 int hda_dsp_post_fw_run(struct snd_sof_dev *sdev);
-int hda_dsp_post_fw_run_icl(struct snd_sof_dev *sdev);
-int hda_dsp_core_stall_icl(struct snd_sof_dev *sdev, unsigned int core_mask);
 
 /* parse platform specific ext manifest ops */
 int hda_dsp_ext_man_get_cavs_config_data(struct snd_sof_dev *sdev,

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index 343c1af..f75e398 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -18,12 +18,75 @@
 #include "hda-ipc.h"
 #include "../sof-audio.h"
 
+#define ICL_DSP_HPRO_CORE_ID 3
+
 static const struct snd_sof_debugfs_map icl_dsp_debugfs[] = {
        {"hda", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},
        {"pp", HDA_DSP_PP_BAR,  0, 0x1000, SOF_DEBUGFS_ACCESS_ALWAYS},
        {"dsp", HDA_DSP_BAR,  0, 0x10000, SOF_DEBUGFS_ACCESS_ALWAYS},
 };
 
+static int icl_dsp_core_stall(struct snd_sof_dev *sdev, unsigned int core_mask)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       const struct sof_intel_dsp_desc *chip = hda->desc;
+
+       /* make sure core_mask in host managed cores */
+       core_mask &= chip->host_managed_cores_mask;
+       if (!core_mask) {
+               dev_err(sdev->dev, "error: core_mask is not in host managed cores\n");
+               return -EINVAL;
+       }
+
+       /* stall core */
+       snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS,
+                                        HDA_DSP_ADSPCS_CSTALL_MASK(core_mask),
+                                        HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));
+
+       return 0;
+}
+
+/*
+ * post fw run operation for ICL.
+ * Core 3 will be powered up and in stall when HPRO is enabled
+ */
+static int icl_dsp_post_fw_run(struct snd_sof_dev *sdev)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       int ret;
+
+       if (sdev->first_boot) {
+               ret = hda_sdw_startup(sdev);
+               if (ret < 0) {
+                       dev_err(sdev->dev, "error: could not startup SoundWire links\n");
+                       return ret;
+               }
+       }
+
+       hda_sdw_int_enable(sdev, true);
+
+       /*
+        * The recommended HW programming sequence for ICL is to
+        * power up core 3 and keep it in stall if HPRO is enabled.
+        */
+       if (!hda->clk_config_lpro) {
+               ret = hda_dsp_enable_core(sdev, BIT(ICL_DSP_HPRO_CORE_ID));
+               if (ret < 0) {
+                       dev_err(sdev->dev, "error: dsp core power up failed on core %d\n",
+                               ICL_DSP_HPRO_CORE_ID);
+                       return ret;
+               }
+
+               sdev->enabled_cores_mask |= BIT(ICL_DSP_HPRO_CORE_ID);
+               sdev->dsp_core_ref_count[ICL_DSP_HPRO_CORE_ID]++;
+
+               snd_sof_dsp_stall(sdev, BIT(ICL_DSP_HPRO_CORE_ID));
+       }
+
+       /* re-enable clock gating and power gating */
+       return hda_dsp_ctrl_clock_power_gating(sdev, true);
+}
+
 /* Icelake ops */
 const struct snd_sof_dsp_ops sof_icl_ops = {
        /* probe/remove/shutdown */
@@ -93,7 +156,7 @@ const struct snd_sof_dsp_ops sof_icl_ops = {
 
        /* pre/post fw run */
        .pre_fw_run = hda_dsp_pre_fw_run,
-       .post_fw_run = hda_dsp_post_fw_run_icl,
+       .post_fw_run = icl_dsp_post_fw_run,
 
        /* parse platform specific extended manifest */
        .parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,
@@ -103,7 +166,7 @@ const struct snd_sof_dsp_ops sof_icl_ops = {
 
        /* firmware run */
        .run = hda_dsp_cl_boot_firmware_iccmax,
-       .stall = hda_dsp_core_stall_icl,
+       .stall = icl_dsp_core_stall,
 
        /* trace callback */
        .trace_init = hda_dsp_trace_init,