ASoC: Intel: Skylake: Fixes for skl_get_ssp_clks()
Subsystems (3)
Peter Ujfalusi
maintainerv2 cover ASoC: Intel: Skylake: Fixes for skl_get_ssp_clks()
Hi,
Changes since v1:
- drop reference to a might never happening patch from the commit message of patch 2.
Cover letter:
while looking at long standing sparse reports regarding to arrays of flexible structures (arrays of flexible arrays of flexible structures, really).
I came across these which did not looked right.
The skl_get_ssp_clks() as some issues and can work under only strict single condition.
Regards,
Peter
---
Peter Ujfalusi (2):
ASoC: Intel: Skylake: Correct the ssp rate discovery in
skl_get_ssp_clks()
ASoC: Intel: Skylake: Correct the handling of fmt_config flexible
array
sound/soc/intel/skylake/skl-nhlt.c | 40 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-)
Signature · 1 line
2.37.0
Peter Ujfalusi
maintainerPATCH v2 1/2 ASoC: Intel: Skylake: Correct the ssp rate discovery in skl_get_ssp_clks()
The present flag is only set once when one rate has been found to be saved. This will effectively going to ignore any rate discovered at later time and based on the code, this is not the intention.
--- sound/soc/intel/skylake/skl-nhlt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl-nhlt.c +2 -1
@@ -99,7 +99,6 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,struct nhlt_fmt_cfg *fmt_cfg;struct wav_fmt_ext *wav_fmt;unsigned long rate; -bool present = false;int rate_index =0 ;u16 channels, bps;u8 clk_src;
@@ -113,6 +112,8 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,return ;for (i =0 ; i < fmt->fmt_count; i++) { +bool present = false; + fmt_cfg = &fmt->fmt_config[i]; wav_fmt = &fmt_cfg->fmt_ext;
Signature · 1 line
2.37.0
Peter Ujfalusi
maintainerPATCH v2 2/2 ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array
In reply to Peter UjfalusiThe struct nhlt_format's fmt_config is a flexible array, it must not be used as normal array.
When moving to the next nhlt_fmt_cfg we need to take into account the data behind the ->config.caps (indicated by ->config.size).
The logic of the code also changed: it is no longer saves the _last_ fmt_cfg for all found rates.
--- sound/soc/intel/skylake/skl-nhlt.c | 37 ++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 12 deletions(-)
sound/soc/intel/skylake/skl-nhlt.c +25 -12
@@ -111,11 +111,12 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,if (fmt->fmt_count ==0 )return ; + fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config;for (i =0 ; i < fmt->fmt_count; i++) { +struct nhlt_fmt_cfg *saved_fmt_cfg = fmt_cfg;bool present = false; - fmt_cfg = &fmt->fmt_config[i]; - wav_fmt = &fmt_cfg->fmt_ext; + wav_fmt = &saved_fmt_cfg->fmt_ext; channels = wav_fmt->fmt.channels; bps = wav_fmt->fmt.bits_per_sample;
@@ -133,12 +134,18 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,* derive the rate. */ for (j = i; j < fmt->fmt_count; j++) { - fmt_cfg = &fmt->fmt_config[j]; - wav_fmt = &fmt_cfg->fmt_ext; +struct nhlt_fmt_cfg *tmp_fmt_cfg = fmt_cfg; + + wav_fmt = &tmp_fmt_cfg->fmt_ext;if ((fs == wav_fmt->fmt.samples_per_sec) && - (bps == wav_fmt->fmt.bits_per_sample)) + (bps == wav_fmt->fmt.bits_per_sample)) { channels =max_t (u16, channels, wav_fmt->fmt.channels); + saved_fmt_cfg = tmp_fmt_cfg; + } +/* Move to the next nhlt_fmt_cfg */ + tmp_fmt_cfg = (struct nhlt_fmt_cfg *)(tmp_fmt_cfg->config.caps + + tmp_fmt_cfg->config.size); } rate = channels * bps * fs;
@@ -154,8 +161,11 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,/* Fill rate and parent for sclk/sclkfs */ if (!present) { +struct nhlt_fmt_cfg *first_fmt_cfg; + + first_fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config; i2s_config_ext = (struct skl_i2s_config_blob_ext *) - fmt->fmt_config[0 ].config.caps; + first_fmt_cfg->config.caps;/* MCLK Divider Source Select */ if (is_legacy_blob (i2s_config_ext->hdr.sig)) {
@@ -169,6 +179,9 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, parent =skl_get_parent_clk (clk_src); +/* Move to the next nhlt_fmt_cfg */ + fmt_cfg = (struct nhlt_fmt_cfg *)(fmt_cfg->config.caps + + fmt_cfg->config.size);/* * Do not copy the config data if there is no parent * clock available for this clock source select
@@ -177,9 +190,9 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks,continue ; sclk[id].rate_cfg[rate_index].rate = rate; - sclk[id].rate_cfg[rate_index].config = fmt_cfg; + sclk[id].rate_cfg[rate_index].config = saved_fmt_cfg; sclkfs[id].rate_cfg[rate_index].rate = rate; - sclkfs[id].rate_cfg[rate_index].config = fmt_cfg; + sclkfs[id].rate_cfg[rate_index].config = saved_fmt_cfg; sclk[id].parent_name = parent->name; sclkfs[id].parent_name = parent->name;
@@ -193,13 +206,13 @@ static void skl_get_mclk(struct skl_dev *skl, struct skl_ssp_clk *mclk, {struct skl_i2s_config_blob_ext *i2s_config_ext;struct skl_i2s_config_blob_legacy *i2s_config; -struct nhlt_specific_cfg *fmt_cfg; +struct nhlt_fmt_cfg *fmt_cfg;struct skl_clk_parent_src *parent;u32 clkdiv, div_ratio;u8 clk_src; - fmt_cfg = &fmt->fmt_config[0 ].config; - i2s_config_ext = (struct skl_i2s_config_blob_ext *)fmt_cfg->caps; + fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config; + i2s_config_ext = (struct skl_i2s_config_blob_ext *)fmt_cfg->config.caps;/* MCLK Divider Source Select and divider */ if (is_legacy_blob (i2s_config_ext->hdr.sig)) {
@@ -228,7 +241,7 @@ static void skl_get_mclk(struct skl_dev *skl, struct skl_ssp_clk *mclk,return ; mclk[id].rate_cfg[0 ].rate = parent->rate/div_ratio; - mclk[id].rate_cfg[0 ].config = &fmt->fmt_config[0 ]; + mclk[id].rate_cfg[0 ].config = fmt_cfg; mclk[id].parent_name = parent->name; }
Signature · 1 line
2.37.0
Quoted 6 lines · Peter Ujfalusi
Hi,
Changes since v1:
- drop reference to a might never happening patch from the commit message of patch 2.
Quoted 7 lines
Cover letter:
while looking at long standing sparse reports regarding to arrays of flexible structures (arrays of flexible arrays of flexible structures, really).I came across these which did not looked right.
Theskl_get_ssp_clks()as some issues and can work under only strict single condition.
Thanks for addressing this issue. I reviewed the code and see no problems with it, so:
Regards,
Czarek
Mark Brown
maintainerQuoted 9 lines · Peter Ujfalusi
Changes since v1:
- drop reference to a might never happening patch from the commit message of patch 2.Cover letter:
while looking at long standing sparse reports regarding to arrays of flexible structures (arrays of flexible arrays of flexible structures, really).[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: Skylake: Correct the ssp rate discovery in skl_get_ssp_clks()
commit: 35981d51fe5a3310a8c895cf0daf1809f143b8ac
[2/2] ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array
commit: 564025b9fe472a7a62895c55a66edd2abeea88a1All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark