Unverified Commit 7bbdda80 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: probe: Merge and clean up the probe and compress files 



The probe debug functionality is implemented via compress support and it
was spread across two set of files:
probe.c/h
compress.c/h

Merge the two files into sof-probes.s/h and clean them up by removing
unused struct definitions, functions. We can also move most of the
functions static as they are only used internally.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210916103211.1573-5-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o utils.o sof-audio.o

snd-sof-$(CONFIG_SND_SOC_SOF_DEBUG_PROBES) += probe.o compress.o



snd-sof-$(CONFIG_SND_SOC_SOF_DEBUG_PROBES) += sof-probes.o



snd-sof-pci-objs := sof-pci-dev.o

snd-sof-acpi-objs := sof-acpi-dev.o

sound/soc/sof/compress.c

deleted100644 → 0
+0 −152
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)

//

// This file is provided under a dual BSD/GPLv2 license.  When using or

// redistributing this file, you may do so under either license.

//

// Copyright(c) 2019-2020 Intel Corporation. All rights reserved.

//

// Author: Cezary Rojewski <cezary.rojewski@intel.com>

//



#include <sound/soc.h>

#include "compress.h"

#include "ops.h"

#include "probe.h"



static int sof_probe_compr_open(struct snd_compr_stream *cstream,

				struct snd_soc_dai *dai)

{

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);

	int ret;



	ret = snd_sof_probe_compr_assign(sdev, cstream, dai);

	if (ret < 0) {

		dev_err(dai->dev, "Failed to assign probe stream: %d\n", ret);

		return ret;

	}



	sdev->extractor_stream_tag = ret;

	return 0;

}



static int sof_probe_compr_free(struct snd_compr_stream *cstream,

				struct snd_soc_dai *dai)

{

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);

	struct sof_probe_point_desc *desc;

	size_t num_desc;

	int i, ret;



	/* disconnect all probe points */

	ret = sof_ipc_probe_points_info(sdev, &desc, &num_desc);

	if (ret < 0) {

		dev_err(dai->dev, "Failed to get probe points: %d\n", ret);

		goto exit;

	}



	for (i = 0; i < num_desc; i++)

		sof_ipc_probe_points_remove(sdev, &desc[i].buffer_id, 1);

	kfree(desc);



exit:

	ret = sof_ipc_probe_deinit(sdev);

	if (ret < 0)

		dev_err(dai->dev, "Failed to deinit probe: %d\n", ret);



	sdev->extractor_stream_tag = SOF_PROBE_INVALID_NODE_ID;

	snd_compr_free_pages(cstream);



	return snd_sof_probe_compr_free(sdev, cstream, dai);

}



static int sof_probe_compr_set_params(struct snd_compr_stream *cstream,

				      struct snd_compr_params *params,

				      struct snd_soc_dai *dai)

{

	struct snd_compr_runtime *rtd = cstream->runtime;

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);

	int ret;



	cstream->dma_buffer.dev.type = SNDRV_DMA_TYPE_DEV_SG;

	cstream->dma_buffer.dev.dev = sdev->dev;

	ret = snd_compr_malloc_pages(cstream, rtd->buffer_size);

	if (ret < 0)

		return ret;



	ret = snd_sof_probe_compr_set_params(sdev, cstream, params, dai);

	if (ret < 0)

		return ret;



	ret = sof_ipc_probe_init(sdev, sdev->extractor_stream_tag,

				 rtd->dma_bytes);

	if (ret < 0) {

		dev_err(dai->dev, "Failed to init probe: %d\n", ret);

		return ret;

	}



	return 0;

}



static int sof_probe_compr_trigger(struct snd_compr_stream *cstream, int cmd,

				   struct snd_soc_dai *dai)

{

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);



	return snd_sof_probe_compr_trigger(sdev, cstream, cmd, dai);

}



static int sof_probe_compr_pointer(struct snd_compr_stream *cstream,

				   struct snd_compr_tstamp *tstamp,

				   struct snd_soc_dai *dai)

{

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);



	return snd_sof_probe_compr_pointer(sdev, cstream, tstamp, dai);

}



struct snd_soc_cdai_ops sof_probe_compr_ops = {

	.startup	= sof_probe_compr_open,

	.shutdown	= sof_probe_compr_free,

	.set_params	= sof_probe_compr_set_params,

	.trigger	= sof_probe_compr_trigger,

	.pointer	= sof_probe_compr_pointer,

};

EXPORT_SYMBOL(sof_probe_compr_ops);



static int sof_probe_compr_copy(struct snd_soc_component *component,

				struct snd_compr_stream *cstream,

				char __user *buf, size_t count)

{

	struct snd_compr_runtime *rtd = cstream->runtime;

	unsigned int offset, n;

	void *ptr;

	int ret;



	if (count > rtd->buffer_size)

		count = rtd->buffer_size;



	div_u64_rem(rtd->total_bytes_transferred, rtd->buffer_size, &offset);

	ptr = rtd->dma_area + offset;

	n = rtd->buffer_size - offset;



	if (count < n) {

		ret = copy_to_user(buf, ptr, count);

	} else {

		ret = copy_to_user(buf, ptr, n);

		ret += copy_to_user(buf + n, rtd->dma_area, count - n);

	}



	if (ret)

		return count - ret;

	return count;

}



const struct snd_compress_ops sof_probe_compressed_ops = {

	.copy		= sof_probe_compr_copy,

};

EXPORT_SYMBOL(sof_probe_compressed_ops);

sound/soc/sof/core.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "sof-priv.h"

#include "ops.h"

#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)

#include "probe.h"

#include "sof-probes.h"

#endif



/* see SOF_DBG_ flags */

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "ops.h"



#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)

#include "probe.h"

#include "sof-probes.h"



/**

 * strsplit_u32 - Split string into sequence of u32 tokens

sound/soc/sof/intel/hda-dai.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)



#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)

#include "../compress.h"

#include "../sof-probes.h"

#endif



struct hda_pipe_params {