Unverified Commit ed914a2a authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Data probing soc-component 



Define stub component for data probing. Stub as most operations from
standard PCM case do not apply here. Specific bits are CPU DAIs and
compress_ops. FE DAIs can link against these new CPU DAI to create new
compress devices.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20221202152841.672536-12-cezary.rojewski@intel.com


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

sound/soc/intel/avs/avs.h

+10 −0
Original line number Diff line number Diff line
@@ -322,6 +322,9 @@ struct avs_soc_component { 


extern const struct snd_soc_dai_ops avs_dai_fe_ops;



int avs_soc_component_register(struct device *dev, const char *name,

			       const struct snd_soc_component_driver *drv,

			       struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais);

int avs_dmic_platform_register(struct avs_dev *adev, const char *name);

int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned long port_mask,

			      unsigned long *tdms);
@@ -373,6 +376,8 @@ struct apl_log_buffer_layout { 
bool avs_logging_fw(struct avs_dev *adev);

void avs_dump_fw_log(struct avs_dev *adev, const void __iomem *src, unsigned int len);

void avs_dump_fw_log_wakeup(struct avs_dev *adev, const void __iomem *src, unsigned int len);



int avs_probe_platform_register(struct avs_dev *adev, const char *name);

#else

#define AVS_SET_ENABLE_LOGS_OP(name)
@@ -389,6 +394,11 @@ static inline void 
avs_dump_fw_log_wakeup(struct avs_dev *adev, const void __iomem *src, unsigned int len)

{

}



static inline int avs_probe_platform_register(struct avs_dev *adev, const char *name)

{

	return 0;

}

#endif



#endif /* __SOUND_SOC_INTEL_AVS_H */

sound/soc/intel/avs/pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static const struct snd_soc_component_driver avs_component_driver = { 
	.topology_name_prefix	= "intel/avs",

};



static int avs_soc_component_register(struct device *dev, const char *name,

int avs_soc_component_register(struct device *dev, const char *name,

			       const struct snd_soc_component_driver *drv,

			       struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais)

{

sound/soc/intel/avs/probes.c

+51 −2
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static int avs_probe_compr_copy(struct snd_soc_component *comp, struct snd_compr 
	return count;

}



__maybe_unused

static const struct snd_soc_cdai_ops avs_probe_dai_ops = {

	.startup = avs_probe_compr_open,

	.shutdown = avs_probe_compr_free,
@@ -258,7 +257,57 @@ static const struct snd_soc_cdai_ops avs_probe_dai_ops = { 
	.pointer = avs_probe_compr_pointer,

};



__maybe_unused

static const struct snd_compress_ops avs_probe_compress_ops = {

	.copy = avs_probe_compr_copy,

};



static struct snd_soc_dai_driver probe_cpu_dais[] = {

{

	.name = "Probe Extraction CPU DAI",

	.compress_new = snd_soc_new_compress,

	.cops = &avs_probe_dai_ops,

	.capture = {

		.stream_name = "Probe Extraction",

		.channels_min = 1,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_48000,

		.rate_min = 48000,

		.rate_max = 48000,

	},

},

};



static int avs_probe_component_probe(struct snd_soc_component *component)

{

	struct avs_soc_component *acomp = to_avs_soc_component(component);

	struct avs_dev *adev = to_avs_dev(component->dev);



	mutex_lock(&adev->comp_list_mutex);

	list_add_tail(&acomp->node, &adev->comp_list);

	mutex_unlock(&adev->comp_list_mutex);

	return 0;

}



static void avs_probe_component_remove(struct snd_soc_component *component)

{

	struct avs_soc_component *acomp = to_avs_soc_component(component);

	struct avs_dev *adev = to_avs_dev(component->dev);



	mutex_lock(&adev->comp_list_mutex);

	list_del(&acomp->node);

	mutex_unlock(&adev->comp_list_mutex);

}



static const struct snd_soc_component_driver avs_probe_component_driver = {

	.name			= "avs-probe-compr",

	.probe			= avs_probe_component_probe,

	.remove			= avs_probe_component_remove,

	.compress_ops		= &avs_probe_compress_ops,

	.module_get_upon_open	= 1, /* increment refcount when a stream is opened */

};



int avs_probe_platform_register(struct avs_dev *adev, const char *name)

{

	return avs_soc_component_register(adev->dev, name, &avs_probe_component_driver,

					  probe_cpu_dais, ARRAY_SIZE(probe_cpu_dais));

}