3 files changed, 37 insertions, 0 deletions

diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 0a0d09cde99d..31e5bc356aa2 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -80,6 +80,9 @@ struct skl_sst {
 
         /* multi-core */
         struct skl_dsp_cores cores;
+
+        /* tplg manifest */
+        struct skl_dfw_manifest manifest;
 };
 
 struct skl_ipc_init_instance_msg {
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 904103056d62..a1d9f84d9674 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1789,11 +1789,33 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt,
         return 0;
 }
 
+static int skl_manifest_load(struct snd_soc_component *cmpnt,
+                                struct snd_soc_tplg_manifest *manifest)
+{
+        struct skl_dfw_manifest *minfo;
+        struct hdac_ext_bus *ebus = snd_soc_component_get_drvdata(cmpnt);
+        struct hdac_bus *bus = ebus_to_hbus(ebus);
+        struct skl *skl = ebus_to_skl(ebus);
+        int ret = 0;
+
+        minfo = &skl->skl_sst->manifest;
+        memcpy(minfo, manifest->priv.data, sizeof(struct skl_dfw_manifest));
+
+        if (minfo->lib_count > HDA_MAX_LIB) {
+                dev_err(bus->dev, "Exceeding max Library count. Got:%d\n",
+                                        minfo->lib_count);
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
 static struct snd_soc_tplg_ops skl_tplg_ops  = {
         .widget_load = skl_tplg_widget_load,
         .control_load = skl_tplg_control_load,
         .bytes_ext_ops = skl_tlv_ops,
         .bytes_ext_ops_count = ARRAY_SIZE(skl_tlv_ops),
+        .manifest = skl_manifest_load,
 };
 
 /*
diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h
index a32e5e9cc530..1b531c165a91 100644
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
@@ -228,4 +228,16 @@ struct skl_dfw_algo_data {
         char params[0];
 } __packed;
 
+#define LIB_NAME_LENGTH 128
+#define HDA_MAX_LIB     16
+
+struct lib_info {
+        char name[LIB_NAME_LENGTH];
+} __packed;
+
+struct skl_dfw_manifest {
+        u32 lib_count;
+        struct lib_info lib[HDA_MAX_LIB];
+} __packed;
+
 #endif