ASoC: wm_adsp: Couple of updates
Subsystems (3)
cover ASoC: wm_adsp: Couple of updates
Patch-set generated against sound/for-next this time.
Dimitris Papastamos (5):
ASoC: wm_adsp: Print error when regmap reads/writes fail
ASoC: wm_adsp: Release firmware on memory allocation failure
ASoC: wm_adsp: Add debug info on get()/put() transfers
ASoC: wm_adsp: Remove and free algorithm regions for ADSP1
ASoC: wm_adsp: Print out the firmware version
Nariman Poushin (1):
ASoC: wm_adsp: Interpret ADSP memory region lengths as 32 bit words
sound/soc/codecs/wm_adsp.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.4.2
PATCH 1/6 ASoC: wm_adsp: Print error when regmap reads/writes fail
--- sound/soc/codecs/wm_adsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/wm_adsp.c +6 -6
@@ -396,8 +396,8 @@ static int wm_coeff_write_control(struct snd_kcontrol *kcontrol, ret =regmap_raw_write (adsp->regmap, reg, scratch, ctl->len);if (ret) { -adsp_err (adsp,"Failed to write %zu bytes to %x\n" , - ctl->len, reg); +adsp_err (adsp,"Failed to write %zu bytes to %x: %d\n" , + ctl->len, reg, ret);kfree (scratch);return ret; }
@@ -450,8 +450,8 @@ static int wm_coeff_read_control(struct snd_kcontrol *kcontrol, ret =regmap_raw_read (adsp->regmap, reg, scratch, ctl->len);if (ret) { -adsp_err (adsp,"Failed to read %zu bytes from %x\n" , - ctl->len, reg); +adsp_err (adsp,"Failed to read %zu bytes from %x: %d\n" , + ctl->len, reg, ret);kfree (scratch);return ret; }
@@ -1313,8 +1313,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) le32_to_cpu(blk->len));if (ret !=0 ) {adsp_err (dsp, -"%s.%d: Failed to write to %x in %s\n" , - file, blocks, reg, region_name); +"%s.%d: Failed to write to %x in %s: %d\n" , + file, blocks, reg, region_name, ret); } }
Signature · 1 line
1.8.4.2
Re: [PATCH 1/6] ASoC: wm_adsp: Print error when regmap reads/writes fail
Quoted 1 line · Dimitris Papastamos
Signed-off-by Dimitris Papastamos <[email protected]>
Applied, thanks.
PATCH 2/6 ASoC: wm_adsp: Release firmware on memory allocation failure
In reply to Dimitris Papastamos--- sound/soc/codecs/wm_adsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +2 -1
@@ -689,7 +689,8 @@ static int wm_adsp_load(struct wm_adsp *dsp) &buf_list);if (!buf) {adsp_err (dsp,"Out of memory\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto out_fw; } ret = regmap_raw_write_async(regmap, reg, buf->buf,
Signature · 1 line
1.8.4.2
Re: [PATCH 2/6] ASoC: wm_adsp: Release firmware on memory allocation failure
Quoted 1 line · Dimitris Papastamos
Signed-off-by Dimitris Papastamos <[email protected]>
Applied, thanks.
PATCH 3/6 ASoC: wm_adsp: Interpret ADSP memory region lengths as 32 bit words
In reply to Dimitris PapastamosFrom: Nariman Poushin <[email protected]>
Pad the ADSP word (3 bytes) to 4 bytes in the kernel and calculate lengths based on padded ADSP words instead of treating them as bytes
--- sound/soc/codecs/wm_adsp.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/wm_adsp.c +5 -0
@@ -1063,6 +1063,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)if (i +1 < algs) { region->len =be32_to_cpu (adsp1_alg[i +1 ].dm); region->len -=be32_to_cpu (adsp1_alg[i].dm); + region->len *=4 ;wm_adsp_create_control (dsp, region); }else { adsp_warn(dsp, "Missing length info for region DM with ID %x\n",
@@ -1080,6 +1081,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)if (i +1 < algs) { region->len =be32_to_cpu (adsp1_alg[i +1 ].zm); region->len -=be32_to_cpu (adsp1_alg[i].zm); + region->len *=4 ;wm_adsp_create_control (dsp, region); }else { adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
@@ -1109,6 +1111,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)if (i +1 < algs) { region->len =be32_to_cpu (adsp2_alg[i +1 ].xm); region->len -=be32_to_cpu (adsp2_alg[i].xm); + region->len *=4 ;wm_adsp_create_control (dsp, region); }else { adsp_warn(dsp, "Missing length info for region XM with ID %x\n",
@@ -1126,6 +1129,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)if (i +1 < algs) { region->len =be32_to_cpu (adsp2_alg[i +1 ].ym); region->len -=be32_to_cpu (adsp2_alg[i].ym); + region->len *=4 ;wm_adsp_create_control (dsp, region); }else { adsp_warn(dsp, "Missing length info for region YM with ID %x\n",
@@ -1143,6 +1147,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)if (i +1 < algs) { region->len =be32_to_cpu (adsp2_alg[i +1 ].zm); region->len -=be32_to_cpu (adsp2_alg[i].zm); + region->len *=4 ;wm_adsp_create_control (dsp, region); }else { adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
Signature · 1 line
1.8.4.2
Mark Brown
maintainerRe: [PATCH 3/6] ASoC: wm_adsp: Interpret ADSP memory region lengths as 32 bit words
Quoted 7 lines · Dimitris Papastamos
From: Nariman Poushin <[email protected]>
Pad the ADSP word (3 bytes) to 4 bytes in the kernel and calculate lengths based on padded ADSP words instead of treating them as bytes
Signed-off-by Nariman Poushin <[email protected]>---
If you're forwarding someone else's patch you need to add your own signoff as well.
PATCH 4/6 ASoC: wm_adsp: Add debug info on get()/put() transfers
In reply to Dimitris Papastamos--- sound/soc/codecs/wm_adsp.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/wm_adsp.c +2 -0
@@ -401,6 +401,7 @@ static int wm_coeff_write_control(struct snd_kcontrol *kcontrol,kfree (scratch);return ret; } +adsp_dbg (adsp,"Wrote %zu bytes to %x\n" , ctl->len, reg);kfree (scratch);
@@ -455,6 +456,7 @@ static int wm_coeff_read_control(struct snd_kcontrol *kcontrol,kfree (scratch);return ret; } +adsp_dbg (adsp,"Read %zu bytes from %x\n" , ctl->len, reg);memcpy (buf, scratch, ctl->len);kfree (scratch);
Signature · 1 line
1.8.4.2
Re: [PATCH 4/6] ASoC: wm_adsp: Add debug info on get()/put() transfers
Quoted 1 line · Dimitris Papastamos
Signed-off-by Dimitris Papastamos <[email protected]>
Applied, thanks.
PATCH 5/6 ASoC: wm_adsp: Remove and free algorithm regions for ADSP1
In reply to Dimitris PapastamosDo it in a similar fashion as we do for ADSP2.
--- sound/soc/codecs/wm_adsp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/codecs/wm_adsp.c +9 -0
@@ -1366,6 +1366,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,struct snd_soc_codec *codec = w->codec;struct wm_adsp *dsps =snd_soc_codec_get_drvdata (codec);struct wm_adsp *dsp = &dsps[w->shift]; +struct wm_adsp_alg_region *alg_region;struct wm_coeff_ctl *ctl;int ret;int val;
@@ -1443,6 +1444,14 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,list_for_each_entry (ctl, &dsp->ctl_list, list) ctl->enabled =0 ; + +while (!list_empty (&dsp->alg_regions)) { + alg_region =list_first_entry (&dsp->alg_regions, + struct wm_adsp_alg_region, + list); +list_del (&alg_region->list); +kfree (alg_region); + }break ;default :
Signature · 1 line
1.8.4.2
Re: [PATCH 5/6] ASoC: wm_adsp: Remove and free algorithm regions for ADSP1
Quoted 1 line · Dimitris Papastamos
Do it in a similar fashion as we do for ADSP2.
Applied, thanks.
PATCH 6/6 ASoC: wm_adsp: Print out the firmware version
In reply to Dimitris Papastamos--- sound/soc/codecs/wm_adsp.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm_adsp.c +1 -0
@@ -570,6 +570,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) file, header->ver); goto out_fw; } +adsp_info (dsp,"Firmware version: %d\n" , header->ver);if (header->core != dsp->type) { adsp_err(dsp, "%s: invalid core %d != %d\n",
Signature · 1 line
1.8.4.2
Re: [PATCH 6/6] ASoC: wm_adsp: Print out the firmware version
Quoted 1 line · Dimitris Papastamos
Signed-off-by Dimitris Papastamos <[email protected]>
Applied, thanks.