From 2513c70df497dc2ed5aa3977166a5e0a2b7efb48 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 30 Jun 2021 15:55:38 -0500 Subject: [PATCH 1/2] ASoC: SOF: core: allow module parameter to override trace selection For debug we want the module parameter to have precedence over Kconfig selections. Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 2268da6c8987bf..7f28fdd3084cf6 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -19,7 +19,7 @@ #endif /* see SOF_DBG_ flags */ -int sof_core_debug; +int sof_core_debug = IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_FIRMWARE_TRACE); module_param_named(sof_debug, sof_core_debug, int, 0444); MODULE_PARM_DESC(sof_debug, "SOF core debug options (0x0 all off)"); @@ -202,8 +202,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) goto fw_run_err; } - if (IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_FIRMWARE_TRACE) || - (sof_core_debug & SOF_DBG_ENABLE_TRACE)) { + if (sof_core_debug & SOF_DBG_ENABLE_TRACE) { sdev->dtrace_is_supported = true; /* init DMA trace */ From 1edfbdae6773e170ac973d050062be2797e46b08 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 30 Jun 2021 15:58:51 -0500 Subject: [PATCH 2/2] [HACK] ASoC: SOF: disable DMA trace Force DMA trace to be disabled to see if CI detects any of the issues reported by developers across the board. Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 7f28fdd3084cf6..1fd814c7be089a 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -19,7 +19,7 @@ #endif /* see SOF_DBG_ flags */ -int sof_core_debug = IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_FIRMWARE_TRACE); +int sof_core_debug = 0; module_param_named(sof_debug, sof_core_debug, int, 0444); MODULE_PARM_DESC(sof_debug, "SOF core debug options (0x0 all off)");