Commit 8a978234 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: topology: Add topology core 



The topology core parses the FW topology file for known block types and
instanciates any common ALSA/ASoC objects that it discovers. The core
also passes any block that is does not understand to client component
drivers for enumeration.

The core exports some APIs to client drivers in order to load and unload
firmware topology data as use case require.

Currently the core deals with the following object types :-

 o kcontrols. This includes TLV, enumerated and bytes controls.
 o DAPM widgets. All types with any associated kcontrol.
 o DAPM graph.
 o FE PCM. FE PCM capabilities and configuration can be defined.
 o BE DAI Link. BE DAI link capabilities and configuration can be defined.
 o Codec <-> codec style links capabilities and configuration.

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c147c0e1

include/sound/soc-dapm.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/types.h>

#include <sound/control.h>

#include <sound/soc-topology.h>

#include <sound/asoc.h>



struct device;
@@ -572,6 +573,7 @@ struct snd_soc_dapm_widget { 
	int num_kcontrols;

	const struct snd_kcontrol_new *kcontrol_news;

	struct snd_kcontrol **kcontrols;

	struct snd_soc_dobj dobj;



	/* widget input and outputs */

	struct list_head sources;

include/sound/soc-topology.h

0 → 100644
+168 −0
Original line number Diff line number Diff line 
/*

 * linux/sound/soc-topology.h -- ALSA SoC Firmware Controls and DAPM

 *

 * Copyright (C) 2012 Texas Instruments Inc.

 * Copyright (C) 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * Simple file API to load FW that includes mixers, coefficients, DAPM graphs,

 * algorithms, equalisers, DAIs, widgets, FE caps, BE caps, codec link caps etc.

 */



#ifndef __LINUX_SND_SOC_TPLG_H

#define __LINUX_SND_SOC_TPLG_H



#include <sound/asoc.h>

#include <linux/list.h>



struct firmware;

struct snd_kcontrol;

struct snd_soc_tplg_pcm_be;

struct snd_ctl_elem_value;

struct snd_ctl_elem_info;

struct snd_soc_dapm_widget;

struct snd_soc_component;

struct snd_soc_tplg_pcm_fe;

struct snd_soc_dapm_context;

struct snd_soc_card;



/* object scan be loaded and unloaded in groups with identfying indexes */

#define SND_SOC_TPLG_INDEX_ALL	0	/* ID that matches all FW objects */



/* dynamic object type */

enum snd_soc_dobj_type {

	SND_SOC_DOBJ_NONE		= 0,	/* object is not dynamic */

	SND_SOC_DOBJ_MIXER,

	SND_SOC_DOBJ_ENUM,

	SND_SOC_DOBJ_BYTES,

	SND_SOC_DOBJ_PCM,

	SND_SOC_DOBJ_DAI_LINK,

	SND_SOC_DOBJ_CODEC_LINK,

	SND_SOC_DOBJ_WIDGET,

};



/* dynamic control object */

struct snd_soc_dobj_control {

	struct snd_kcontrol *kcontrol;

	char **dtexts;

	unsigned long *dvalues;

};



/* dynamic widget object */

struct snd_soc_dobj_widget {

	unsigned int kcontrol_enum:1;	/* this widget is an enum kcontrol */

};



/* dynamic PCM DAI object */

struct snd_soc_dobj_pcm_dai {

	struct snd_soc_tplg_pcm_dai *pd;

	unsigned int count;

};



/* generic dynamic object - all dynamic objects belong to this struct */

struct snd_soc_dobj {

	enum snd_soc_dobj_type type;

	unsigned int index;	/* objects can belong in different groups */

	struct list_head list;

	struct snd_soc_tplg_ops *ops;

	union {

		struct snd_soc_dobj_control control;

		struct snd_soc_dobj_widget widget;

		struct snd_soc_dobj_pcm_dai pcm_dai;

	};

	void *private; /* core does not touch this */

};



/*

 * Kcontrol operations - used to map handlers onto firmware based controls.

 */

struct snd_soc_tplg_kcontrol_ops {

	u32 id;

	int (*get)(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol);

	int (*put)(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol);

	int (*info)(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_info *uinfo);

};



/*

 * DAPM widget event handlers - used to map handlers onto widgets.

 */

struct snd_soc_tplg_widget_events {

	u16 type;

	int (*event_handler)(struct snd_soc_dapm_widget *w,

			struct snd_kcontrol *k, int event);

};



/*

 * Public API - Used by component drivers to load and unload dynamic objects

 * and their resources.

 */

struct snd_soc_tplg_ops {



	/* external kcontrol init - used for any driver specific init */

	int (*control_load)(struct snd_soc_component *,

		struct snd_kcontrol_new *, struct snd_soc_tplg_ctl_hdr *);

	int (*control_unload)(struct snd_soc_component *,

		struct snd_soc_dobj *);



	/* external widget init - used for any driver specific init */

	int (*widget_load)(struct snd_soc_component *,

		struct snd_soc_dapm_widget *,

		struct snd_soc_tplg_dapm_widget *);

	int (*widget_unload)(struct snd_soc_component *,

		struct snd_soc_dobj *);



	/* FE - used for any driver specific init */

	int (*pcm_dai_load)(struct snd_soc_component *,

		struct snd_soc_tplg_pcm_dai *pcm_dai, int num_fe);

	int (*pcm_dai_unload)(struct snd_soc_component *,

		struct snd_soc_dobj *);



	/* callback to handle vendor bespoke data */

	int (*vendor_load)(struct snd_soc_component *,

		struct snd_soc_tplg_hdr *);

	int (*vendor_unload)(struct snd_soc_component *,

		struct snd_soc_tplg_hdr *);



	/* completion - called at completion of firmware loading */

	void (*complete)(struct snd_soc_component *);



	/* manifest - optional to inform component of manifest */

	int (*manifest)(struct snd_soc_component *,

		struct snd_soc_tplg_manifest *);



	/* bespoke kcontrol handlers available for binding */

	const struct snd_soc_tplg_kcontrol_ops *io_ops;

	int io_ops_count;

};



/* gets a pointer to data from the firmware block header */

static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr)

{

	const void *ptr = hdr;



	return ptr + sizeof(*hdr);

}



/* Dynamic Object loading and removal for component drivers */

int snd_soc_tplg_component_load(struct snd_soc_component *comp,

	struct snd_soc_tplg_ops *ops, const struct firmware *fw,

	u32 index);

int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index);



/* Widget removal - widgets also removed wth component API */

void snd_soc_tplg_widget_remove(struct snd_soc_dapm_widget *w);

void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,

	u32 index);



/* Binds event handlers to dynamic widgets */

int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w,

	const struct snd_soc_tplg_widget_events *events, int num_events,

	u16 event_type);



#endif

include/sound/soc.h

+11 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sound/compress_driver.h>

#include <sound/control.h>

#include <sound/ac97_codec.h>

#include <sound/soc-topology.h>



/*

 * Convenience kcontrol builders
@@ -764,6 +765,9 @@ struct snd_soc_component { 


	struct mutex io_mutex;



	/* attached dynamic objects */

	struct list_head dobj_list;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_root;

#endif
@@ -1108,6 +1112,9 @@ struct snd_soc_card { 
	struct list_head dapm_list;

	struct list_head dapm_dirty;



	/* attached dynamic objects */

	struct list_head dobj_list;



	/* Generic DAPM context for the card */

	struct snd_soc_dapm_context dapm;

	struct snd_soc_dapm_stats dapm_stats;
@@ -1167,6 +1174,7 @@ struct soc_mixer_control { 
	unsigned int sign_bit;

	unsigned int invert:1;

	unsigned int autodisable:1;

	struct snd_soc_dobj dobj;

};



struct soc_bytes {
@@ -1177,6 +1185,8 @@ struct soc_bytes { 


struct soc_bytes_ext {

	int max;

	struct snd_soc_dobj dobj;



	/* used for TLV byte control */

	int (*get)(unsigned int __user *bytes, unsigned int size);

	int (*put)(const unsigned int __user *bytes, unsigned int size);
@@ -1198,6 +1208,7 @@ struct soc_enum { 
	const char * const *texts;

	const unsigned int *values;

	unsigned int autodisable:1;

	struct snd_soc_dobj dobj;

};



/**

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line 
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o

snd-soc-core-objs += soc-topology.o



ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

snd-soc-core-objs += soc-generic-dmaengine-pcm.o

sound/soc/soc-core.c

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-dpcm.h>

#include <sound/soc-topology.h>

#include <sound/initval.h>



#define CREATE_TRACE_POINTS
@@ -2422,6 +2423,7 @@ int snd_soc_register_card(struct snd_soc_card *card) 
		card->rtd_aux[i].card = card;



	INIT_LIST_HEAD(&card->dapm_dirty);

	INIT_LIST_HEAD(&card->dobj_list);

	card->instantiated = 0;

	mutex_init(&card->mutex);

	mutex_init(&card->dapm_mutex);
@@ -2736,6 +2738,7 @@ static void snd_soc_component_add_unlocked(struct snd_soc_component *component) 
	}



	list_add(&component->list, &component_list);

	INIT_LIST_HEAD(&component->dobj_list);

}



static void snd_soc_component_add(struct snd_soc_component *component)
@@ -2812,6 +2815,7 @@ void snd_soc_unregister_component(struct device *dev) 
	return;



found:

	snd_soc_tplg_component_remove(cmpnt, SND_SOC_TPLG_INDEX_ALL);

	snd_soc_component_del_unlocked(cmpnt);

	mutex_unlock(&client_mutex);

	snd_soc_component_cleanup(cmpnt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE