ASoC: SOF: Intel: remove the HDA_DSP_CORE_MASK() macro

Remove the HDA_DSP_CORE_MASK() macro and use BIT() and GENMASK()
macros directly for more clarity.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Keyon Jie <yang.jie@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200910164125.2033062-4-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 25d3f57..4eeade2 100644 (file)
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -129,7 +129,7 @@ const struct sof_intel_dsp_desc apl_chip_info = {
        /* Apollolake */
        .cores_num = 2,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0) | HDA_DSP_CORE_MASK(1),
+       .host_managed_cores_mask = GENMASK(1, 0),
        .ipc_req = HDA_DSP_REG_HIPCI,
        .ipc_req_mask = HDA_DSP_REG_HIPCI_BUSY,
        .ipc_ack = HDA_DSP_REG_HIPCIE,

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index 51e336d..a5d3258 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -334,10 +334,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = {
        /* Cannonlake */
        .cores_num = 4,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |
-                               HDA_DSP_CORE_MASK(1) |
-                               HDA_DSP_CORE_MASK(2) |
-                               HDA_DSP_CORE_MASK(3),
+       .host_managed_cores_mask = GENMASK(3, 0),
        .ipc_req = CNL_DSP_REG_HIPCIDR,
        .ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
        .ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -353,10 +350,7 @@ const struct sof_intel_dsp_desc icl_chip_info = {
        /* Icelake */
        .cores_num = 4,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |
-                               HDA_DSP_CORE_MASK(1) |
-                               HDA_DSP_CORE_MASK(2) |
-                               HDA_DSP_CORE_MASK(3),
+       .host_managed_cores_mask = GENMASK(3, 0),
        .ipc_req = CNL_DSP_REG_HIPCIDR,
        .ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
        .ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -372,7 +366,7 @@ const struct sof_intel_dsp_desc ehl_chip_info = {
        /* Elkhartlake */
        .cores_num = 4,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0),
+       .host_managed_cores_mask = BIT(0),
        .ipc_req = CNL_DSP_REG_HIPCIDR,
        .ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
        .ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -388,8 +382,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = {
        /* Jasperlake */
        .cores_num = 2,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |
-                               HDA_DSP_CORE_MASK(1),
+       .host_managed_cores_mask = GENMASK(1, 0),
        .ipc_req = CNL_DSP_REG_HIPCIDR,
        .ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
        .ipc_ack = CNL_DSP_REG_HIPCIDA,

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 713ebe8..5515c75 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -114,7 +114,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag, int iteration)
                          ((stream_tag - 1) << 9)));
 
        /* step 3: unset core 0 reset state & unstall/run core 0 */
-       ret = hda_dsp_core_run(sdev, HDA_DSP_CORE_MASK(0));
+       ret = hda_dsp_core_run(sdev, BIT(0));
        if (ret < 0) {
                if (iteration == HDA_FW_BOOT_ATTEMPTS)
                        dev_err(sdev->dev,
@@ -146,8 +146,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag, int iteration)
                                       chip->ipc_ack_mask);
 
        /* step 5: power down corex */
-       ret = hda_dsp_core_power_down(sdev,
-                                 chip->host_managed_cores_mask & ~(HDA_DSP_CORE_MASK(0)));
+       ret = hda_dsp_core_power_down(sdev, chip->host_managed_cores_mask & ~(BIT(0)));
        if (ret < 0) {
                if (iteration == HDA_FW_BOOT_ATTEMPTS)
                        dev_err(sdev->dev,

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 5ee2f83..f0f8f95 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -305,9 +305,6 @@
 #define HDA_DSP_ADSPCS_CPA_SHIFT       24
 #define HDA_DSP_ADSPCS_CPA_MASK(cm)    ((cm) << HDA_DSP_ADSPCS_CPA_SHIFT)
 
-/* Mask for a given core index, c = 0.. number of supported cores - 1 */
-#define HDA_DSP_CORE_MASK(c)           BIT(c)
-
 /*
  * Mask for a given number of cores
  * nc = number of supported cores

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 8f3fe82..f8d04fd 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -124,7 +124,7 @@ const struct sof_intel_dsp_desc tgl_chip_info = {
        /* Tigerlake */
        .cores_num = 4,
        .init_core_mask = 1,
-       .host_managed_cores_mask = HDA_DSP_CORE_MASK(0),
+       .host_managed_cores_mask = BIT(0),
        .ipc_req = CNL_DSP_REG_HIPCIDR,
        .ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
        .ipc_ack = CNL_DSP_REG_HIPCIDA,