Unverified Commit 8e0850f9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Clean up the probe support" from Peter Ujfalusi... 

Merge series "ASoC: SOF: Clean up the probe support" from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

The probe debug feature of SOF can be used to extract streams of data from a
given point of a pipeline for analysis.

The support is implemented by using the ALSA/ASoC compress support for the
capture stream, but the code can not be used by/for a normal compressed data
stream. It is a debug feature.

Merge the probe implementation in the core (compress.c/h and probe.c/h) into
one file: sof-probes.c/h

Rename the Intel HDA specific probe implementation from hda-compressc.c to
hda-probes.c

We also need to add IPC logging support for the probes messages and drop the
unused references to SOF compress to have reasonably clean code.

Regards,
Peter
---
Peter Ujfalusi (5):
  ASoC: SOF: ipc: Add probe message logging to ipc_log_header()
  ASoC: SOF: pcm: Remove non existent CONFIG_SND_SOC_SOF_COMPRESS
    reference
  ASoC: SOF: probe: Merge and clean up the probe and compress files
  ASoC: SOF: Intel: Rename hda-compress.c to hda-probes.c
  ASoC: SOF: sof-probes: Correct the function names used for
    snd_soc_cdai_ops

Ranjani Sridharan (1):
  ASoC: SOF: compress: move and export sof_probe_compr_ops

 sound/soc/sof/Makefile                        |   3 +-
 sound/soc/sof/compress.c                      | 147 ---------
 sound/soc/sof/compress.h                      |  32 --
 sound/soc/sof/core.c                          |   2 +-
 sound/soc/sof/debug.c                         |   2 +-
 sound/soc/sof/intel/Makefile                  |   2 +-
 sound/soc/sof/intel/hda-dai.c                 |  16 +-
 .../intel/{hda-compress.c => hda-probes.c}    |   0
 sound/soc/sof/ipc.c                           |  23 ++
 sound/soc/sof/pcm.c                           |   6 +-
 sound/soc/sof/probe.h                         |  85 ------
 sound/soc/sof/sof-priv.h                      |   5 -
 sound/soc/sof/{probe.c => sof-probes.c}       | 280 +++++++++++-------
 sound/soc/sof/sof-probes.h                    |  38 +++
 14 files changed, 248 insertions(+), 393 deletions(-)
 delete mode 100644 sound/soc/sof/compress.c
 delete mode 100644 sound/soc/sof/compress.h
 rename sound/soc/sof/intel/{hda-compress.c => hda-probes.c} (100%)
 delete mode 100644 sound/soc/sof/probe.h
 rename sound/soc/sof/{probe.c => sof-probes.c} (52%)
 create mode 100644 sound/soc/sof/sof-probes.h

--
2.33.0
parents 8461d7d8 49efed50

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 −147
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"



const struct snd_compress_ops sof_probe_compressed_ops = {

	.copy		= sof_probe_compr_copy,

};

EXPORT_SYMBOL(sof_probe_compressed_ops);



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;

}

EXPORT_SYMBOL(sof_probe_compr_open);



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);

}

EXPORT_SYMBOL(sof_probe_compr_free);



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;

}

EXPORT_SYMBOL(sof_probe_compr_set_params);



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);

}

EXPORT_SYMBOL(sof_probe_compr_trigger);



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);

}

EXPORT_SYMBOL(sof_probe_compr_pointer);



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;

}

EXPORT_SYMBOL(sof_probe_compr_copy);

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/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \ 
				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-bus.o \

				 apl.o cnl.o tgl.o icl.o

snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-compress.o

snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o



snd-sof-intel-hda-objs := hda-codec.o