| Message ID | 1527191363-21021-1-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ac9391daac004e12dc4e4c62e130b09f245ece2b |
| Headers | show |
Adding Vinod to help review as well.. > Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE > DAI") introduced sound topology files version 5. Initially, this > change made the topology code incompatible with v4 topology files. > Backwards compatibility with v4 configuration files was > subsequently added with commit 288b8da7e992 ("ASoC: topology: > Support topology file of ABI v4"). > > Unfortunately, backwards compatibility was never fully implemented. > > First, the manifest size in (Skylake) v4 configuration files is set > to 0, which causes manifest_new_ver() to bail out with error messages > similar to the following. > > snd_soc_skl 0000:00:1f.3: ASoC: invalid manifest size > snd_soc_skl 0000:00:1f.3: tplg component load failed-22 > snd_soc_skl 0000:00:1f.3: Failed to init topology! > snd_soc_skl 0000:00:1f.3: ASoC: failed to probe component -22 > skl_n88l25_m98357a skl_n88l25_m98357a: ASoC: failed to instantiate card -22 > skl_n88l25_m98357a: probe of skl_n88l25_m98357a failed with error -22 > > After this problem is fixed, the following error message is seen instead. > > snd_soc_skl 0000:00:1f.3: ASoC: old version of manifest > snd_soc_skl 0000:00:1f.3: Invalid descriptor token 1093938482 > snd_soc_skl 0000:00:1f.3: ASoC: failed to load widget media0_in cpr 0 > snd_soc_skl 0000:00:1f.3: tPlg component load failed-22 > > This message is seen because backwards compatibility for loading widgets > was never implemented. > > The lack of audio support when running the upstream kernel on recent > Chromebooks has been reported in various forums, and can be traced back > to this problem. Attempts to fix the problem, usually by providing v5 > configuration files, were only partially successful. > > Let's implement backward compatibility properly to solve the problem > for good. > > Signed-off-by: Guenter Roeck <groeck@chromium.org> > --- > Tested on Caroline (Samsung Chromebook Pro) and Chell (HP Chromebook 13 > G1) running v4.17-rc6 plus this patch, with original (v4) configuration > files. Also tested on several other Chromebooks with this patch on top > of chromeos-4.14. > > v2: > - Move on from RFC/RFT to real patch > - Move v4 structure definitions into header file > - Add support for copying private capabilities > - Declare skl_dfw_v4_module_caps as __packed > - Drop duplicate assignment of mconfig->pipe->state > > sound/soc/intel/skylake/skl-topology.c | 169 +++++++++++++++++++ > sound/soc/intel/skylake/skl-tplg-interface.h | 74 ++++++++ > sound/soc/soc-topology.c | 7 +- > 3 files changed, 248 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c > index 3b1dca419883..9e4c2cb88dea 100644 > --- a/sound/soc/intel/skylake/skl-topology.c > +++ b/sound/soc/intel/skylake/skl-topology.c > @@ -19,6 +19,7 @@ > #include <linux/slab.h> > #include <linux/types.h> > #include <linux/firmware.h> > +#include <linux/uuid.h> > #include <sound/soc.h> > #include <sound/soc-topology.h> > #include <uapi/sound/snd_sst_tokens.h> > @@ -2724,6 +2725,167 @@ static int skl_tplg_get_desc_blocks(struct device *dev, > return -EINVAL; > } > > +/* Functions to parse private data from configuration file format v4 */ > + > +/* > + * Add pipeline from topology binary into driver pipeline list > + * > + * If already added we return that instance > + * Otherwise we create a new instance and add into driver list > + */ > +static int skl_tplg_add_pipe_v4(struct device *dev, > + struct skl_module_cfg *mconfig, struct skl *skl, > + struct skl_dfw_v4_pipe *dfw_pipe) > +{ > + struct skl_pipeline *ppl; > + struct skl_pipe *pipe; > + struct skl_pipe_params *params; > + > + list_for_each_entry(ppl, &skl->ppl_list, node) { > + if (ppl->pipe->ppl_id == dfw_pipe->pipe_id) { > + mconfig->pipe = ppl->pipe; > + return 0; > + } > + } > + > + ppl = devm_kzalloc(dev, sizeof(*ppl), GFP_KERNEL); > + if (!ppl) > + return -ENOMEM; > + > + pipe = devm_kzalloc(dev, sizeof(*pipe), GFP_KERNEL); > + if (!pipe) > + return -ENOMEM; > + > + params = devm_kzalloc(dev, sizeof(*params), GFP_KERNEL); > + if (!params) > + return -ENOMEM; > + > + pipe->ppl_id = dfw_pipe->pipe_id; > + pipe->memory_pages = dfw_pipe->memory_pages; > + pipe->pipe_priority = dfw_pipe->pipe_priority; > + pipe->conn_type = dfw_pipe->conn_type; > + pipe->state = SKL_PIPE_INVALID; > + pipe->p_params = params; > + INIT_LIST_HEAD(&pipe->w_list); > + > + ppl->pipe = pipe; > + list_add(&ppl->node, &skl->ppl_list); > + > + mconfig->pipe = pipe; > + > + return 0; > +} > + > +static void skl_fill_module_pin_info_v4(struct skl_dfw_v4_module_pin *dfw_pin, > + struct skl_module_pin *m_pin, > + bool is_dynamic, int max_pin) > +{ > + int i; > + > + for (i = 0; i < max_pin; i++) { > + m_pin[i].id.module_id = dfw_pin[i].module_id; > + m_pin[i].id.instance_id = dfw_pin[i].instance_id; > + m_pin[i].in_use = false; > + m_pin[i].is_dynamic = is_dynamic; > + m_pin[i].pin_state = SKL_PIN_UNBIND; > + } > +} > + > +static void skl_tplg_fill_fmt_v4(struct skl_module_pin_fmt *dst_fmt, > + struct skl_dfw_v4_module_fmt *src_fmt, > + int pins) > +{ > + int i; > + > + for (i = 0; i < pins; i++) { > + dst_fmt[i].fmt.channels = src_fmt[i].channels; > + dst_fmt[i].fmt.s_freq = src_fmt[i].freq; > + dst_fmt[i].fmt.bit_depth = src_fmt[i].bit_depth; > + dst_fmt[i].fmt.valid_bit_depth = src_fmt[i].valid_bit_depth; > + dst_fmt[i].fmt.ch_cfg = src_fmt[i].ch_cfg; > + dst_fmt[i].fmt.ch_map = src_fmt[i].ch_map; > + dst_fmt[i].fmt.interleaving_style = > + src_fmt[i].interleaving_style; > + dst_fmt[i].fmt.sample_type = src_fmt[i].sample_type; > + } > +} > + > +static int skl_tplg_get_pvt_data_v4(struct snd_soc_tplg_dapm_widget *tplg_w, > + struct skl *skl, struct device *dev, > + struct skl_module_cfg *mconfig) > +{ > + struct skl_dfw_v4_module *dfw = > + (struct skl_dfw_v4_module *)tplg_w->priv.data; > + int ret; > + > + dev_dbg(dev, "Parsing Skylake v4 widget topology data\n"); > + > + ret = guid_parse(dfw->uuid, (guid_t *)mconfig->guid); > + if (ret) > + return ret; > + mconfig->id.module_id = -1; > + mconfig->id.instance_id = dfw->instance_id; > + mconfig->module->resources[0].cps = dfw->max_mcps; > + mconfig->module->resources[0].ibs = dfw->ibs; > + mconfig->module->resources[0].obs = dfw->obs; > + mconfig->core_id = dfw->core_id; > + mconfig->module->max_input_pins = dfw->max_in_queue; > + mconfig->module->max_output_pins = dfw->max_out_queue; > + mconfig->module->loadable = dfw->is_loadable; > + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].inputs, dfw->in_fmt, > + MAX_IN_QUEUE); > + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].outputs, dfw->out_fmt, > + MAX_OUT_QUEUE); > + > + mconfig->params_fixup = dfw->params_fixup; > + mconfig->converter = dfw->converter; > + mconfig->m_type = dfw->module_type; > + mconfig->vbus_id = dfw->vbus_id; > + mconfig->module->resources[0].is_pages = dfw->mem_pages; > + > + ret = skl_tplg_add_pipe_v4(dev, mconfig, skl, &dfw->pipe); > + if (ret) > + return ret; > + > + mconfig->dev_type = dfw->dev_type; > + mconfig->hw_conn_type = dfw->hw_conn_type; > + mconfig->time_slot = dfw->time_slot; > + mconfig->formats_config.caps_size = dfw->caps.caps_size; > + > + mconfig->m_in_pin = devm_kzalloc(dev, > + MAX_IN_QUEUE * sizeof(*mconfig->m_in_pin), > + GFP_KERNEL); > + if (!mconfig->m_in_pin) > + return -ENOMEM; > + > + mconfig->m_out_pin = devm_kzalloc(dev, > + MAX_OUT_QUEUE * sizeof(*mconfig->m_out_pin), > + GFP_KERNEL); > + if (!mconfig->m_out_pin) > + return -ENOMEM; > + > + skl_fill_module_pin_info_v4(dfw->in_pin, mconfig->m_in_pin, > + dfw->is_dynamic_in_pin, > + mconfig->module->max_input_pins); > + skl_fill_module_pin_info_v4(dfw->out_pin, mconfig->m_out_pin, > + dfw->is_dynamic_out_pin, > + mconfig->module->max_output_pins); > + > + if (mconfig->formats_config.caps_size) { > + mconfig->formats_config.set_params = dfw->caps.set_params; > + mconfig->formats_config.param_id = dfw->caps.param_id; > + mconfig->formats_config.caps = > + devm_kzalloc(dev, mconfig->formats_config.caps_size, > + GFP_KERNEL); > + if (!mconfig->formats_config.caps) > + return -ENOMEM; > + memcpy(mconfig->formats_config.caps, dfw->caps.caps, > + dfw->caps.caps_size); > + } > + > + return 0; > +} > + > /* > * Parse the private data for the token and corresponding value. > * The private data can have multiple data blocks. So, a data block > @@ -2739,6 +2901,13 @@ static int skl_tplg_get_pvt_data(struct snd_soc_tplg_dapm_widget *tplg_w, > char *data; > int ret; > > + /* > + * v4 configuration files have a valid UUID at the start of > + * the widget's private data. > + */ > + if (uuid_is_valid((char *)tplg_w->priv.data)) > + return skl_tplg_get_pvt_data_v4(tplg_w, skl, dev, mconfig); > + > /* Read the NUM_DATA_BLOCKS descriptor */ > array = (struct snd_soc_tplg_vendor_array *)tplg_w->priv.data; > ret = skl_tplg_get_desc_blocks(dev, array); > diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h > index f8d1749a2e0c..b0e3d376594c 100644 > --- a/sound/soc/intel/skylake/skl-tplg-interface.h > +++ b/sound/soc/intel/skylake/skl-tplg-interface.h > @@ -169,4 +169,78 @@ enum skl_tuple_type { > SKL_TYPE_DATA > }; > > +/* v4 configuration data */ > + > +struct skl_dfw_v4_module_pin { > + u16 module_id; > + u16 instance_id; > +} __packed; > + > +struct skl_dfw_v4_module_fmt { > + u32 channels; > + u32 freq; > + u32 bit_depth; > + u32 valid_bit_depth; > + u32 ch_cfg; > + u32 interleaving_style; > + u32 sample_type; > + u32 ch_map; > +} __packed; > + > +struct skl_dfw_v4_module_caps { > + u32 set_params:2; > + u32 rsvd:30; > + u32 param_id; > + u32 caps_size; > + u32 caps[HDA_SST_CFG_MAX]; > +} __packed; > + > +struct skl_dfw_v4_pipe { > + u8 pipe_id; > + u8 pipe_priority; > + u16 conn_type:4; > + u16 rsvd:4; > + u16 memory_pages:8; > +} __packed; > + > +struct skl_dfw_v4_module { > + char uuid[SKL_UUID_STR_SZ]; > + > + u16 module_id; > + u16 instance_id; > + u32 max_mcps; > + u32 mem_pages; > + u32 obs; > + u32 ibs; > + u32 vbus_id; > + > + u32 max_in_queue:8; > + u32 max_out_queue:8; > + u32 time_slot:8; > + u32 core_id:4; > + u32 rsvd1:4; > + > + u32 module_type:8; > + u32 conn_type:4; > + u32 dev_type:4; > + u32 hw_conn_type:4; > + u32 rsvd2:12; > + > + u32 params_fixup:8; > + u32 converter:8; > + u32 input_pin_type:1; > + u32 output_pin_type:1; > + u32 is_dynamic_in_pin:1; > + u32 is_dynamic_out_pin:1; > + u32 is_loadable:1; > + u32 rsvd3:11; > + > + struct skl_dfw_v4_pipe pipe; > + struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE]; > + struct skl_dfw_v4_module_fmt out_fmt[MAX_OUT_QUEUE]; > + struct skl_dfw_v4_module_pin in_pin[MAX_IN_QUEUE]; > + struct skl_dfw_v4_module_pin out_pin[MAX_OUT_QUEUE]; > + struct skl_dfw_v4_module_caps caps; > +} __packed; > + > #endif > diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c > index 986b8b2f90fb..d66b2e5ccd67 100644 > --- a/sound/soc/soc-topology.c > +++ b/sound/soc/soc-topology.c > @@ -2293,8 +2293,11 @@ static int manifest_new_ver(struct soc_tplg *tplg, > *manifest = NULL; > > if (src->size != sizeof(*src_v4)) { > - dev_err(tplg->dev, "ASoC: invalid manifest size\n"); > - return -EINVAL; > + dev_warn(tplg->dev, "ASoC: invalid manifest size %d\n", > + src->size); > + if (src->size) > + return -EINVAL; > + src->size = sizeof(*src_v4); > } > > dev_warn(tplg->dev, "ASoC: old version of manifest\n"); > -- > 2.17.0.441.gb46fe60e1d-goog > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On 25-05-18, 19:03, Shreyas NC wrote: > Adding Vinod to help review as well.. Thanks Shreyas, > > Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE > > DAI") introduced sound topology files version 5. Initially, this > > change made the topology code incompatible with v4 topology files. > > Backwards compatibility with v4 configuration files was > > subsequently added with commit 288b8da7e992 ("ASoC: topology: > > Support topology file of ABI v4"). > > > > Unfortunately, backwards compatibility was never fully implemented. To give the history, we implement the binary method for data. The structures given here were indeed ABI but we didn't move them to uapi/ as it was still in development and with help from Takashi we finally zoomed on Tuple method for describing the data and hence that was implemented and updated and alsa-lib files also updated. I am not sure we were able to ship any alsa release with this method due to complexity of running intel tool to generate binary data and patch the topology files. > > First, the manifest size in (Skylake) v4 configuration files is set > > to 0, which causes manifest_new_ver() to bail out with error messages > > similar to the following. So is this issue with Chrome kernel or upstream? We did ask Chrome to cherry-pick patches for tuple support for SKL but I guess it was late for release cycle for them and for SKL I dont think Chrome people took it. Yeah perils of upstream and production racing... > > > > snd_soc_skl 0000:00:1f.3: ASoC: invalid manifest size > > snd_soc_skl 0000:00:1f.3: tplg component load failed-22 > > snd_soc_skl 0000:00:1f.3: Failed to init topology! > > snd_soc_skl 0000:00:1f.3: ASoC: failed to probe component -22 > > skl_n88l25_m98357a skl_n88l25_m98357a: ASoC: failed to instantiate card -22 > > skl_n88l25_m98357a: probe of skl_n88l25_m98357a failed with error -22 > > > > After this problem is fixed, the following error message is seen instead. > > > > snd_soc_skl 0000:00:1f.3: ASoC: old version of manifest > > snd_soc_skl 0000:00:1f.3: Invalid descriptor token 1093938482 > > snd_soc_skl 0000:00:1f.3: ASoC: failed to load widget media0_in cpr 0 > > snd_soc_skl 0000:00:1f.3: tPlg component load failed-22 > > > > This message is seen because backwards compatibility for loading widgets > > was never implemented. > > > > The lack of audio support when running the upstream kernel on recent > > Chromebooks has been reported in various forums, and can be traced back > > to this problem. Attempts to fix the problem, usually by providing v5 > > configuration files, were only partially successful. > > > > Let's implement backward compatibility properly to solve the problem > > for good. Thanks for doing this, great work indeed. > > diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h > > index f8d1749a2e0c..b0e3d376594c 100644 > > --- a/sound/soc/intel/skylake/skl-tplg-interface.h > > +++ b/sound/soc/intel/skylake/skl-tplg-interface.h Don't we want to move these to upai/ as that is right place and use that in alsa-lib.
On 05/27/2018 11:03 PM, Vinod wrote: [ ... ] >>> diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h >>> index f8d1749a2e0c..b0e3d376594c 100644 >>> --- a/sound/soc/intel/skylake/skl-tplg-interface.h >>> +++ b/sound/soc/intel/skylake/skl-tplg-interface.h > > Don't we want to move these to upai/ as that is right place and use that in > alsa-lib. > I did that in patch 3 of the series [1]. Guenter --- [1] https://patchwork.kernel.org/patch/10425387/
On Thu, May 24, 2018 at 12:49:21PM -0700, Guenter Roeck wrote: > From: Guenter Roeck <groeck@chromium.org> > > Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE > DAI") introduced sound topology files version 5. Initially, this > change made the topology code incompatible with v4 topology files. No review on these from anyone at Intel?
On 06/01/2018 03:25 AM, Mark Brown wrote: > On Thu, May 24, 2018 at 12:49:21PM -0700, Guenter Roeck wrote: >> From: Guenter Roeck <groeck@chromium.org> >> >> Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE >> DAI") introduced sound topology files version 5. Initially, this >> change made the topology code incompatible with v4 topology files. > > No review on these from anyone at Intel? > The only actionable feedback I have seen is that the header file changes should be in uapi, which is done in patches 2 and 3. Other than that, there was a question if this is a Linux issue or a Chromebook issue (it appears that only Chromebooks shipped with v4 configuration files). I took that as rhetorical since upstream kernels (at least v4.4 and v4.5) support topology v4 configuration files, and it should not matter which products shipped using those. Guenter
On 6/1/18 8:17 AM, Guenter Roeck wrote: > On 06/01/2018 03:25 AM, Mark Brown wrote: >> On Thu, May 24, 2018 at 12:49:21PM -0700, Guenter Roeck wrote: >>> From: Guenter Roeck <groeck@chromium.org> >>> >>> Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE >>> DAI") introduced sound topology files version 5. Initially, this >>> change made the topology code incompatible with v4 topology files. >> >> No review on these from anyone at Intel? >> > > The only actionable feedback I have seen is that the header file > changes should be in uapi, which is done in patches 2 and 3. > > Other than that, there was a question if this is a Linux issue or > a Chromebook issue (it appears that only Chromebooks shipped with > v4 configuration files). I took that as rhetorical since upstream > kernels (at least v4.4 and v4.5) support topology v4 configuration > files, and it should not matter which products shipped using those. I wanted to ack this patch but the Intel validation folks asked for a couple of days to finish their tests on a variety of Chromebooks (e.g. Lars) and double-check which models used the v4 topology. There is an internal thread on all this which remains active. I don't think the feedback will be delayed beyond early next week.
On Fri, Jun 01, 2018 at 10:19:58AM -0500, Pierre-Louis Bossart wrote: > On 6/1/18 8:17 AM, Guenter Roeck wrote: > >On 06/01/2018 03:25 AM, Mark Brown wrote: > >>On Thu, May 24, 2018 at 12:49:21PM -0700, Guenter Roeck wrote: > >>>From: Guenter Roeck <groeck@chromium.org> > >>> > >>>Commit dc31e741db49 ("ASoC: topology: ABI - Add the types for BE > >>>DAI") introduced sound topology files version 5. Initially, this > >>>change made the topology code incompatible with v4 topology files. > >> > >>No review on these from anyone at Intel? > >> > > > >The only actionable feedback I have seen is that the header file > >changes should be in uapi, which is done in patches 2 and 3. > > > >Other than that, there was a question if this is a Linux issue or > >a Chromebook issue (it appears that only Chromebooks shipped with > >v4 configuration files). I took that as rhetorical since upstream > >kernels (at least v4.4 and v4.5) support topology v4 configuration > >files, and it should not matter which products shipped using those. > > I wanted to ack this patch but the Intel validation folks asked for a couple > of days to finish their tests on a variety of Chromebooks (e.g. Lars) and > double-check which models used the v4 topology. There is an internal thread > on all this which remains active. I don't think the feedback will be delayed > beyond early next week. Skylake-Y: caroline, cave, chell Skylake-U: asuka, lars, lili, sentry ApolloLake (alan, electro, sand, and many more) also seem to use the same file format (or a variant of it), but I am not sure. I didn't get to testing it due to other problems with the upstream kernel which I did not have time to track down yet. Guenter
On Fri, Jun 01, 2018 at 10:19:58AM -0500, Pierre-Louis Bossart wrote: > I wanted to ack this patch but the Intel validation folks asked for a couple > of days to finish their tests on a variety of Chromebooks (e.g. Lars) and > double-check which models used the v4 topology. There is an internal thread > on all this which remains active. I don't think the feedback will be delayed > beyond early next week. OK, I'm expecting the merge window to open over the weekend so I think I'm just going to apply now so we it's in -next when that happens.
On Fri, Jun 01, 2018 at 06:17:05AM -0700, Guenter Roeck wrote: > Other than that, there was a question if this is a Linux issue or > a Chromebook issue (it appears that only Chromebooks shipped with > v4 configuration files). I took that as rhetorical since upstream > kernels (at least v4.4 and v4.5) support topology v4 configuration > files, and it should not matter which products shipped using those. Yes, that's definitely completely irrelevant here - one of the great things about Chromebooks is their upstream support and this code was definitely no exception!
On 06/01/2018 12:08 PM, Mark Brown wrote: > On Fri, Jun 01, 2018 at 10:19:58AM -0500, Pierre-Louis Bossart wrote: > >> I wanted to ack this patch but the Intel validation folks asked for a couple >> of days to finish their tests on a variety of Chromebooks (e.g. Lars) and >> double-check which models used the v4 topology. There is an internal thread >> on all this which remains active. I don't think the feedback will be delayed >> beyond early next week. > OK, I'm expecting the merge window to open over the weekend so I think > I'm just going to apply now so we it's in -next when that happens. quick follow-up note: Intel folks successfully tested this patchset on chell, sentry, lars, glados, asuka platforms. There is an unrelated issue on chell with playback not working, but at least the topology parsing is handled correctly with Guenter's contribution.
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 3b1dca419883..9e4c2cb88dea 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/types.h> #include <linux/firmware.h> +#include <linux/uuid.h> #include <sound/soc.h> #include <sound/soc-topology.h> #include <uapi/sound/snd_sst_tokens.h> @@ -2724,6 +2725,167 @@ static int skl_tplg_get_desc_blocks(struct device *dev, return -EINVAL; } +/* Functions to parse private data from configuration file format v4 */ + +/* + * Add pipeline from topology binary into driver pipeline list + * + * If already added we return that instance + * Otherwise we create a new instance and add into driver list + */ +static int skl_tplg_add_pipe_v4(struct device *dev, + struct skl_module_cfg *mconfig, struct skl *skl, + struct skl_dfw_v4_pipe *dfw_pipe) +{ + struct skl_pipeline *ppl; + struct skl_pipe *pipe; + struct skl_pipe_params *params; + + list_for_each_entry(ppl, &skl->ppl_list, node) { + if (ppl->pipe->ppl_id == dfw_pipe->pipe_id) { + mconfig->pipe = ppl->pipe; + return 0; + } + } + + ppl = devm_kzalloc(dev, sizeof(*ppl), GFP_KERNEL); + if (!ppl) + return -ENOMEM; + + pipe = devm_kzalloc(dev, sizeof(*pipe), GFP_KERNEL); + if (!pipe) + return -ENOMEM; + + params = devm_kzalloc(dev, sizeof(*params), GFP_KERNEL); + if (!params) + return -ENOMEM; + + pipe->ppl_id = dfw_pipe->pipe_id; + pipe->memory_pages = dfw_pipe->memory_pages; + pipe->pipe_priority = dfw_pipe->pipe_priority; + pipe->conn_type = dfw_pipe->conn_type; + pipe->state = SKL_PIPE_INVALID; + pipe->p_params = params; + INIT_LIST_HEAD(&pipe->w_list); + + ppl->pipe = pipe; + list_add(&ppl->node, &skl->ppl_list); + + mconfig->pipe = pipe; + + return 0; +} + +static void skl_fill_module_pin_info_v4(struct skl_dfw_v4_module_pin *dfw_pin, + struct skl_module_pin *m_pin, + bool is_dynamic, int max_pin) +{ + int i; + + for (i = 0; i < max_pin; i++) { + m_pin[i].id.module_id = dfw_pin[i].module_id; + m_pin[i].id.instance_id = dfw_pin[i].instance_id; + m_pin[i].in_use = false; + m_pin[i].is_dynamic = is_dynamic; + m_pin[i].pin_state = SKL_PIN_UNBIND; + } +} + +static void skl_tplg_fill_fmt_v4(struct skl_module_pin_fmt *dst_fmt, + struct skl_dfw_v4_module_fmt *src_fmt, + int pins) +{ + int i; + + for (i = 0; i < pins; i++) { + dst_fmt[i].fmt.channels = src_fmt[i].channels; + dst_fmt[i].fmt.s_freq = src_fmt[i].freq; + dst_fmt[i].fmt.bit_depth = src_fmt[i].bit_depth; + dst_fmt[i].fmt.valid_bit_depth = src_fmt[i].valid_bit_depth; + dst_fmt[i].fmt.ch_cfg = src_fmt[i].ch_cfg; + dst_fmt[i].fmt.ch_map = src_fmt[i].ch_map; + dst_fmt[i].fmt.interleaving_style = + src_fmt[i].interleaving_style; + dst_fmt[i].fmt.sample_type = src_fmt[i].sample_type; + } +} + +static int skl_tplg_get_pvt_data_v4(struct snd_soc_tplg_dapm_widget *tplg_w, + struct skl *skl, struct device *dev, + struct skl_module_cfg *mconfig) +{ + struct skl_dfw_v4_module *dfw = + (struct skl_dfw_v4_module *)tplg_w->priv.data; + int ret; + + dev_dbg(dev, "Parsing Skylake v4 widget topology data\n"); + + ret = guid_parse(dfw->uuid, (guid_t *)mconfig->guid); + if (ret) + return ret; + mconfig->id.module_id = -1; + mconfig->id.instance_id = dfw->instance_id; + mconfig->module->resources[0].cps = dfw->max_mcps; + mconfig->module->resources[0].ibs = dfw->ibs; + mconfig->module->resources[0].obs = dfw->obs; + mconfig->core_id = dfw->core_id; + mconfig->module->max_input_pins = dfw->max_in_queue; + mconfig->module->max_output_pins = dfw->max_out_queue; + mconfig->module->loadable = dfw->is_loadable; + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].inputs, dfw->in_fmt, + MAX_IN_QUEUE); + skl_tplg_fill_fmt_v4(mconfig->module->formats[0].outputs, dfw->out_fmt, + MAX_OUT_QUEUE); + + mconfig->params_fixup = dfw->params_fixup; + mconfig->converter = dfw->converter; + mconfig->m_type = dfw->module_type; + mconfig->vbus_id = dfw->vbus_id; + mconfig->module->resources[0].is_pages = dfw->mem_pages; + + ret = skl_tplg_add_pipe_v4(dev, mconfig, skl, &dfw->pipe); + if (ret) + return ret; + + mconfig->dev_type = dfw->dev_type; + mconfig->hw_conn_type = dfw->hw_conn_type; + mconfig->time_slot = dfw->time_slot; + mconfig->formats_config.caps_size = dfw->caps.caps_size; + + mconfig->m_in_pin = devm_kzalloc(dev, + MAX_IN_QUEUE * sizeof(*mconfig->m_in_pin), + GFP_KERNEL); + if (!mconfig->m_in_pin) + return -ENOMEM; + + mconfig->m_out_pin = devm_kzalloc(dev, + MAX_OUT_QUEUE * sizeof(*mconfig->m_out_pin), + GFP_KERNEL); + if (!mconfig->m_out_pin) + return -ENOMEM; + + skl_fill_module_pin_info_v4(dfw->in_pin, mconfig->m_in_pin, + dfw->is_dynamic_in_pin, + mconfig->module->max_input_pins); + skl_fill_module_pin_info_v4(dfw->out_pin, mconfig->m_out_pin, + dfw->is_dynamic_out_pin, + mconfig->module->max_output_pins); + + if (mconfig->formats_config.caps_size) { + mconfig->formats_config.set_params = dfw->caps.set_params; + mconfig->formats_config.param_id = dfw->caps.param_id; + mconfig->formats_config.caps = + devm_kzalloc(dev, mconfig->formats_config.caps_size, + GFP_KERNEL); + if (!mconfig->formats_config.caps) + return -ENOMEM; + memcpy(mconfig->formats_config.caps, dfw->caps.caps, + dfw->caps.caps_size); + } + + return 0; +} + /* * Parse the private data for the token and corresponding value. * The private data can have multiple data blocks. So, a data block @@ -2739,6 +2901,13 @@ static int skl_tplg_get_pvt_data(struct snd_soc_tplg_dapm_widget *tplg_w, char *data; int ret; + /* + * v4 configuration files have a valid UUID at the start of + * the widget's private data. + */ + if (uuid_is_valid((char *)tplg_w->priv.data)) + return skl_tplg_get_pvt_data_v4(tplg_w, skl, dev, mconfig); + /* Read the NUM_DATA_BLOCKS descriptor */ array = (struct snd_soc_tplg_vendor_array *)tplg_w->priv.data; ret = skl_tplg_get_desc_blocks(dev, array); diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h index f8d1749a2e0c..b0e3d376594c 100644 --- a/sound/soc/intel/skylake/skl-tplg-interface.h +++ b/sound/soc/intel/skylake/skl-tplg-interface.h @@ -169,4 +169,78 @@ enum skl_tuple_type { SKL_TYPE_DATA }; +/* v4 configuration data */ + +struct skl_dfw_v4_module_pin { + u16 module_id; + u16 instance_id; +} __packed; + +struct skl_dfw_v4_module_fmt { + u32 channels; + u32 freq; + u32 bit_depth; + u32 valid_bit_depth; + u32 ch_cfg; + u32 interleaving_style; + u32 sample_type; + u32 ch_map; +} __packed; + +struct skl_dfw_v4_module_caps { + u32 set_params:2; + u32 rsvd:30; + u32 param_id; + u32 caps_size; + u32 caps[HDA_SST_CFG_MAX]; +} __packed; + +struct skl_dfw_v4_pipe { + u8 pipe_id; + u8 pipe_priority; + u16 conn_type:4; + u16 rsvd:4; + u16 memory_pages:8; +} __packed; + +struct skl_dfw_v4_module { + char uuid[SKL_UUID_STR_SZ]; + + u16 module_id; + u16 instance_id; + u32 max_mcps; + u32 mem_pages; + u32 obs; + u32 ibs; + u32 vbus_id; + + u32 max_in_queue:8; + u32 max_out_queue:8; + u32 time_slot:8; + u32 core_id:4; + u32 rsvd1:4; + + u32 module_type:8; + u32 conn_type:4; + u32 dev_type:4; + u32 hw_conn_type:4; + u32 rsvd2:12; + + u32 params_fixup:8; + u32 converter:8; + u32 input_pin_type:1; + u32 output_pin_type:1; + u32 is_dynamic_in_pin:1; + u32 is_dynamic_out_pin:1; + u32 is_loadable:1; + u32 rsvd3:11; + + struct skl_dfw_v4_pipe pipe; + struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE]; + struct skl_dfw_v4_module_fmt out_fmt[MAX_OUT_QUEUE]; + struct skl_dfw_v4_module_pin in_pin[MAX_IN_QUEUE]; + struct skl_dfw_v4_module_pin out_pin[MAX_OUT_QUEUE]; + struct skl_dfw_v4_module_caps caps; +} __packed; + #endif diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 986b8b2f90fb..d66b2e5ccd67 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2293,8 +2293,11 @@ static int manifest_new_ver(struct soc_tplg *tplg, *manifest = NULL; if (src->size != sizeof(*src_v4)) { - dev_err(tplg->dev, "ASoC: invalid manifest size\n"); - return -EINVAL; + dev_warn(tplg->dev, "ASoC: invalid manifest size %d\n", + src->size); + if (src->size) + return -EINVAL; + src->size = sizeof(*src_v4); } dev_warn(tplg->dev, "ASoC: old version of manifest\n");