ASoC: qcom: audioreach: add support for static calibration

This change adds support for static calibration data via ASoC topology
file. This static calibration data could include binary blob of data
that is required by specific module and is not part of topology tokens.

Reason for adding this support is to allow loading module specific data
that can not be part of the tplg tokens, example, Echo and Noise cancelling
module needs a blob of calibration data to function correctly.

This support is also one of the building block for adding speaker
protection support.

Tested this with Single Mic ECNS(Echo and Noise Cancellation).

tplg can now contain this calibration data like:

SectionWidget."stream2.SMECNS_V224" {
	...
	data [
		...
		"stream2.SMECNS_V224_cfg_data"
	]
}

SectionData."stream2.SMECNS_V224_cfg_data" {
	words "0x00000330, 0x01001006,0x00000000,0x00000000,
		0x00004145,0x08001026,0x00000004,0x00000000,
		..."
	}
}

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250819100151.1294047-4-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/uapi/sound/snd_ar_tokens.h b/include/uapi/sound/snd_ar_tokens.h
index 92cf72a6fdd489de70cd187665b1df99814a2088..6b8102eaa121f100aefc47487f44f6863744534b 100644 (file)
--- a/include/uapi/sound/snd_ar_tokens.h
+++ b/include/uapi/sound/snd_ar_tokens.h
@@ -3,6 +3,8 @@
 #ifndef __SND_AR_TOKENS_H__
 #define __SND_AR_TOKENS_H__
 
+#include <linux/types.h>
+
 #define APM_SUB_GRAPH_PERF_MODE_LOW_POWER      0x1
 #define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY    0x2
 
@@ -238,4 +240,12 @@ enum ar_event_types {
 #define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID     260
 #define AR_TKN_U32_MODULE_LOG_MODE             261
 
+#define SND_SOC_AR_TPLG_MODULE_CFG_TYPE 0x01001006
+struct audioreach_module_priv_data {
+       __le32 size;    /* size in bytes of the array, including all elements */
+       __le32 type;    /* SND_SOC_AR_TPLG_MODULE_CFG_TYPE */
+       __le32 priv[2]; /* Private data for future expansion */
+       __le32 data[0]; /* config data */
+};
+
 #endif /* __SND_AR_TOKENS_H__ */

diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h
index 9b30177463e636d8eca5488fcd426772140601b1..617bda051cf8862cc0c26b86a9f1907638fb3f59 100644 (file)
--- a/sound/soc/qcom/qdsp6/audioreach.h
+++ b/sound/soc/qcom/qdsp6/audioreach.h
@@ -4,6 +4,7 @@
 #define __AUDIOREACH_H__
 #include <linux/types.h>
 #include <linux/soc/qcom/apr.h>
+#include <uapi/sound/snd_ar_tokens.h>
 #include <sound/soc.h>
 struct q6apm;
 struct q6apm_graph;
@@ -742,6 +743,7 @@ struct audioreach_module {
        struct list_head node;
        struct audioreach_container *container;
        struct snd_soc_dapm_widget *widget;
+       struct audioreach_module_priv_data *data;
 };
 
 struct audioreach_module_config {

diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c
index a3b0f558260c2614a36c92e638e07ef90ce64ecf..ec51fabd98cb876bfb50230039b6183ebda4cb9f 100644 (file)
--- a/sound/soc/qcom/qdsp6/topology.c
+++ b/sound/soc/qcom/qdsp6/topology.c
@@ -305,6 +305,34 @@ static struct snd_soc_tplg_vendor_array *audioreach_get_module_array(
        return NULL;
 }
 
+static struct audioreach_module_priv_data *audioreach_get_module_priv_data(
+               struct snd_soc_tplg_private *private)
+{
+       int sz;
+
+       for (sz = 0; sz < le32_to_cpu(private->size); ) {
+               struct snd_soc_tplg_vendor_array *mod_array;
+
+               mod_array = (struct snd_soc_tplg_vendor_array *)((u8 *)private->array + sz);
+               if (mod_array->type == SND_SOC_AR_TPLG_MODULE_CFG_TYPE) {
+                       struct audioreach_module_priv_data *pdata;
+
+                       pdata = kzalloc(struct_size(pdata, data, le32_to_cpu(mod_array->size)),
+                                      GFP_KERNEL);
+                       if (!pdata)
+                               return ERR_PTR(-ENOMEM);
+
+                       memcpy(pdata, ((u8 *)private->data + sz), struct_size(pdata, data,
+                                               le32_to_cpu(mod_array->size)));
+                       return pdata;
+               }
+
+               sz = sz + le32_to_cpu(mod_array->size);
+       }
+
+       return NULL;
+}
+
 static struct audioreach_sub_graph *audioreach_parse_sg_tokens(struct q6apm *apm,
                                                       struct snd_soc_tplg_private *private)
 {
@@ -582,6 +610,8 @@ static int audioreach_widget_load_module_common(struct snd_soc_component *compon
        if (IS_ERR(mod))
                return PTR_ERR(mod);
 
+       mod->data = audioreach_get_module_priv_data(&tplg_w->priv);
+
        dobj = &w->dobj;
        dobj->private = mod;
 
@@ -939,6 +969,7 @@ static int audioreach_widget_unload(struct snd_soc_component *scomp,
        cont->num_modules--;
 
        list_del(&mod->node);
+       kfree(mod->data);
        kfree(mod);
        /* Graph Info has N sub-graphs, sub-graph has N containers, Container has N Modules */
        if (list_empty(&cont->modules_list)) { /* if no modules in the container then remove it */