ASoC: SOF: Drop SOF_DBG_DUMP_FORCE_ERR_LEVEL and sof_dev_dbg_or_err

The sof_dev_dbg_or_err() is only used by intel/hda.c when dumping dsp
debug information.
It was used to print the extended rom status in either dev_dbg (during
retries) and finally with dev_err, but other lines were printed with
dev_err regardless.

Since we now only print the dump once, the flag and the macros is no longer
needed.

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-11-peter.ujfalusi@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 d2be02dc2801edf4ed3f3b0fd2aba0303c1bc1a3..10b37e8ad30baf7ccb2aef8c84677b18e949c61a 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -180,14 +180,9 @@ err:
        flags = SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX |
                SOF_DBG_DUMP_OPTIONAL;
 
-       /*
-        * after max boot attempts make sure that the dump is printed and error
-        * log level is used
-        */
-       if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS) {
-               flags |= SOF_DBG_DUMP_FORCE_ERR_LEVEL;
+       /* after max boot attempts make sure that the dump is printed */
+       if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
                flags &= ~SOF_DBG_DUMP_OPTIONAL;
-       }
 
        snd_sof_dsp_dbg_dump(sdev, flags);
        snd_sof_dsp_core_power_down(sdev, chip->host_managed_cores_mask);
@@ -421,7 +416,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
                dev_dbg(sdev->dev, "Firmware download successful, booting...\n");
        } else {
                snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_PCI |
-                                    SOF_DBG_DUMP_MBOX | SOF_DBG_DUMP_FORCE_ERR_LEVEL);
+                                    SOF_DBG_DUMP_MBOX);
                dev_err(sdev->dev, "error: load fw failed ret: %d\n", ret);
        }
 

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 1463f3de01bc741c99aa759cce42628e540d1106..c4dcab10e64bfb563b2bafa03d1bea4aa2298658 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -532,8 +532,7 @@ static void hda_dsp_dump_ext_rom_status(struct snd_sof_dev *sdev, u32 flags)
                len += snprintf(msg + len, sizeof(msg) - len, " 0x%x", value);
        }
 
-       sof_dev_dbg_or_err(sdev->dev, flags & SOF_DBG_DUMP_FORCE_ERR_LEVEL,
-                          "extended rom status: %s", msg);
+       dev_err(sdev->dev, "error: extended rom status: %s", msg);
 
 }
 

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index babb96d685aec2645ad2ba9484a4e6ab81bc9d7b..b30cc653aeba9ec4ce9682a3eac9f14cee601e11 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -821,7 +821,7 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
        if (ret < 0) {
                dev_err(sdev->dev, "error: failed to start DSP\n");
                snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
-                                    SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_FORCE_ERR_LEVEL);
+                                    SOF_DBG_DUMP_PCI);
                return ret;
        }
 
@@ -837,7 +837,7 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
        if (ret == 0) {
                dev_err(sdev->dev, "error: firmware boot failure\n");
                snd_sof_dsp_dbg_dump(sdev, SOF_DBG_DUMP_REGS | SOF_DBG_DUMP_MBOX |
-                       SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_FORCE_ERR_LEVEL);
+                                    SOF_DBG_DUMP_TEXT | SOF_DBG_DUMP_PCI);
                sdev->fw_state = SOF_FW_BOOT_FAILED;
                return -EIO;
        }

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index d20ead47be1b71183a607f5ec8cdf890578d1113..5c19393399369b87d9d006a08208ed1b2d68f21f 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -39,8 +39,7 @@
 #define SOF_DBG_DUMP_MBOX              BIT(1)
 #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 */
+#define SOF_DBG_DUMP_OPTIONAL          BIT(4) /* only dump if SOF_DBG_PRINT_ALL_DUMPS is set */
 
 /* global debug state set by SOF_DBG_ flags */
 extern int sof_core_debug;
@@ -593,13 +592,4 @@ int intel_pcm_close(struct snd_sof_dev *sdev,
                    struct snd_pcm_substream *substream);
 
 int sof_machine_check(struct snd_sof_dev *sdev);
-
-#define sof_dev_dbg_or_err(dev, is_err, fmt, ...)                      \
-       do {                                                            \
-               if (is_err)                                             \
-                       dev_err(dev, "error: " fmt, __VA_ARGS__);       \
-               else                                                    \
-                       dev_dbg(dev, fmt, __VA_ARGS__);                 \
-       } while (0)
-
 #endif