Unverified Commit 277ff236 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: IPC: reduce verbosity of IPC pointer updates 



When using dynamic debug, the console is swamped with verbose position
pointer logs, which really don't add much information. Move then to
vdbg to keep traces usable and allow for easier end-user support.

Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200824200912.46852-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f46ff506

sound/soc/sof/ipc.c

+11 −5
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static void ipc_log_header(struct device *dev, u8 *text, u32 cmd) 
	u8 *str2 = NULL;

	u32 glb;

	u32 type;

	bool vdbg = false;



	glb = cmd & SOF_GLB_TYPE_MASK;

	type = cmd & SOF_CMD_TYPE_MASK;
@@ -146,6 +147,7 @@ static void ipc_log_header(struct device *dev, u8 *text, u32 cmd) 
		case SOF_IPC_STREAM_TRIG_XRUN:

			str2 = "TRIG_XRUN"; break;

		case SOF_IPC_STREAM_POSITION:

			vdbg = true;

			str2 = "POSITION"; break;

		case SOF_IPC_STREAM_VORBIS_PARAMS:

			str2 = "VORBIS_PARAMS"; break;
@@ -183,11 +185,15 @@ static void ipc_log_header(struct device *dev, u8 *text, u32 cmd) 
		str = "unknown GLB command"; break;

	}



	if (str2)

		dev_dbg(dev, "%s: 0x%x: %s: %s\n", text, cmd, str, str2);

	if (str2) {

		if (vdbg)

			dev_vdbg(dev, "%s: 0x%x: %s: %s\n", text, cmd, str, str2);

		else

			dev_dbg(dev, "%s: 0x%x: %s: %s\n", text, cmd, str, str2);

	} else {

		dev_dbg(dev, "%s: 0x%x: %s\n", text, cmd, str);

	}

}

#else

static inline void ipc_log_header(struct device *dev, u8 *text, u32 cmd)

{
@@ -449,7 +455,7 @@ static void ipc_period_elapsed(struct snd_sof_dev *sdev, u32 msg_id) 
	stream = &spcm->stream[direction];

	snd_sof_ipc_msg_data(sdev, stream->substream, &posn, sizeof(posn));



	dev_dbg(sdev->dev, "posn : host 0x%llx dai 0x%llx wall 0x%llx\n",

	dev_vdbg(sdev->dev, "posn : host 0x%llx dai 0x%llx wall 0x%llx\n",

		 posn.host_posn, posn.dai_posn, posn.wallclock);



	memcpy(&stream->posn, &posn, sizeof(posn));

sound/soc/sof/pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, 
	dai = bytes_to_frames(substream->runtime,

			      spcm->stream[substream->stream].posn.dai_posn);



	dev_dbg(component->dev,

	dev_vdbg(component->dev,

		 "PCM: stream %d dir %d DMA position %lu DAI position %lu\n",

		 spcm->pcm.pcm_id, substream->stream, host, dai);