ASoC: SOF: modify the SOF_DBG flags

The SOF_DBG_* macros are used for dual purposes right now, for the
sof_core_debug module parameter and for the dbg_dump() ops. So, separate
these two types of flags into different types to avoid confusion.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@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/20201211100743.3188821-3-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index 143117334ae55b21fc6eace1a87743da2a2b31d4..30213a1beaaa28115179c5622c03cfdb011046d2 100644 (file)
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -817,7 +817,7 @@ void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev)
        }
 
        /* dump vital information to the logs */
-       snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);
+       snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
        snd_sof_ipc_dump(sdev);
        snd_sof_trace_notify_for_error(sdev);
 }

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index 186736ee5fc2e8d54c53dea40553bcf1a0719026..19260dbecac56282f8bce1133f369b9188f3fdf2 100644 (file)
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -336,7 +336,7 @@ static int byt_run(struct snd_sof_dev *sdev)
        }
        if (tries < 0) {
                dev_err(sdev->dev, "error:  unable to run DSP firmware\n");
-               byt_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);
+               byt_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
                return -ENODEV;
        }
 

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index d8fb4e277c19c32e357e29e9ad80aa5770c5584b..c4dcbe50063598499d57f11eeab26f1a1fdfd874 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -175,7 +175,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)
                        __func__);
 
 err:
-       hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX);
+       hda_dsp_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);
        hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
 
        return ret;
@@ -411,7 +411,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
        if (!ret) {
                dev_dbg(sdev->dev, "Firmware download successful, booting...\n");
        } else {
-               hda_dsp_dump(sdev, SOF_DBG_REGS | SOF_DBG_PCI | SOF_DBG_MBOX);
+               hda_dsp_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);
                dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret);
        }
 

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index cbce484b64690ea2ffba9db104ac815bd966ec1c..df39f477239a86e5abe2fff23e5f111b2c8f5171 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -856,8 +856,8 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
                                 msecs_to_jiffies(sdev->boot_timeout));
        if (ret == 0) {
                dev_err(sdev->dev, "error: firmware boot failure\n");
-               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX |
-                       SOF_DBG_TEXT | SOF_DBG_PCI);
+               snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
+                       SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);
                sdev->fw_state = SOF_FW_BOOT_FAILED;
                return -EIO;
        }

diff --git a/sound/soc/sof/ops.c b/sound/soc/sof/ops.c
index 1a394b4c6a2fd401f087e47584688dbec5f8292a..11ecebd079073fdabc4e112a9f9273c380a8e77b 100644 (file)
--- a/sound/soc/sof/ops.c
+++ b/sound/soc/sof/ops.c
@@ -157,7 +157,7 @@ void snd_sof_dsp_panic(struct snd_sof_dev *sdev, u32 offset)
                dev_dbg(sdev->dev, "panic: dsp_oops_offset %zu offset %d\n",
                        sdev->dsp_oops_offset, offset);
 
-       snd_sof_dsp_dbg_dump(sdev, SOF_DBG_REGS | SOF_DBG_MBOX);
+       snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX);
        snd_sof_trace_notify_for_error(sdev);
 }
 EXPORT_SYMBOL(snd_sof_dsp_panic);

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index 9ba3e3ceed0120635d8ad0f4b14c01eab3ca2536..ba317d3b8e535a91c66624dd3ef7e403b78f1518 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -22,11 +22,12 @@
 
 /* debug flags */
 #define SOF_DBG_ENABLE_TRACE   BIT(0)
-#define SOF_DBG_REGS           BIT(1)
-#define SOF_DBG_MBOX           BIT(2)
-#define SOF_DBG_TEXT           BIT(3)
-#define SOF_DBG_PCI            BIT(4)
-#define SOF_DBG_RETAIN_CTX     BIT(5)  /* prevent DSP D3 on FW exception */
+#define SOF_DBG_RETAIN_CTX     BIT(1)  /* prevent DSP D3 on FW exception */
+
+#define SOF_DBG_DUMP_REGS              BIT(0)
+#define SOF_DBG_DUMP_MBOX              BIT(1)
+#define SOF_DBG_DUMP_TEXT              BIT(2)
+#define SOF_DBG_DUMP_PCI               BIT(3)
 
 /* global debug state set by SOF_DBG_ flags */
 extern int sof_core_debug;