ASoC: SOF: debug: Add SOF_DBG_DUMP_OPTIONAL flag for DSP dumping

The new SOF_DBG_DUMP_OPTIONAL flag can be used to mark a DSP dump that
should only be printed when the SOF_DBG_PRINT_ALL_DUMPS sof_core_debug
flag is set, otherwise it should be ignored and not printed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211006110645.26679-9-peter.ujfalusi@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 9ed6728c2017239967302a011713c083fa64c895..bcd381f495c0c5c3e98d0ee36844aa6cb7c30390 100644 (file)
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -824,11 +824,16 @@ EXPORT_SYMBOL_GPL(snd_sof_free_debug);
 
 void snd_sof_dsp_dbg_dump(struct snd_sof_dev *sdev, u32 flags)
 {
+       bool print_all = !!(sof_core_debug & SOF_DBG_PRINT_ALL_DUMPS);
+
+       if (flags & SOF_DBG_DUMP_OPTIONAL && !print_all)
+               return;
+
        if (sof_ops(sdev)->dbg_dump && !sdev->dbg_dump_printed) {
                dev_err(sdev->dev, "------------[ DSP dump start ]------------\n");
                sof_ops(sdev)->dbg_dump(sdev, flags);
                dev_err(sdev->dev, "------------[ DSP dump end ]------------\n");
-               if (!(sof_core_debug & SOF_DBG_PRINT_ALL_DUMPS))
+               if (!print_all)
                        sdev->dbg_dump_printed = true;
        }
 }

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index bb6de1c1e3ecd3198f28d955914ce00152b5e070..d20ead47be1b71183a607f5ec8cdf890578d1113 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -40,7 +40,7 @@
 #define SOF_DBG_DUMP_TEXT              BIT(2)
 #define SOF_DBG_DUMP_PCI               BIT(3)
 #define SOF_DBG_DUMP_FORCE_ERR_LEVEL   BIT(4) /* used to dump dsp status with error log level */
-
+#define SOF_DBG_DUMP_OPTIONAL          BIT(5) /* only dump if SOF_DBG_PRINT_ALL_DUMPS is set */
 
 /* global debug state set by SOF_DBG_ flags */
 extern int sof_core_debug;