ASoC: wm_adsp: Remove len field from wm_adsp_alg_region

The algorithm region information in the firmware doesn't contain a
length field, explicitly pass this to the create_control function rather
than bundling into wm_adsp_alg_region.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 4201e1fffaa75c49c251ef1ce557fdb15240c8a4..3f6b49dc98c03ff15c035885db8a163ae32846db 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -780,7 +780,8 @@ static void wm_adsp_ctl_work(struct work_struct *work)
 }
 
 static int wm_adsp_create_control(struct wm_adsp *dsp,
-                                 const struct wm_adsp_alg_region *alg_region)
+                                 const struct wm_adsp_alg_region *alg_region,
+                                 unsigned int len)
 {
        struct wm_coeff_ctl *ctl;
        struct wmfw_ctl_work *ctl_work;
@@ -842,7 +843,12 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
        ctl->ops.xput = wm_coeff_put;
        ctl->dsp = dsp;
 
-       ctl->len = alg_region->len;
+       if (len > 512) {
+               adsp_warn(dsp, "Truncating control %s from %d\n",
+                         ctl->name, len);
+               len = 512;
+       }
+       ctl->len = len;
        ctl->cache = kzalloc(ctl->len, GFP_KERNEL);
        if (!ctl->cache) {
                ret = -ENOMEM;
@@ -991,13 +997,12 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                alg_region->type = WMFW_ADSP1_DM;
                alg_region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
                alg_region->base = be32_to_cpu(adsp1_alg[i].dm);
-               alg_region->len = 0;
                list_add_tail(&alg_region->list, &dsp->alg_regions);
                if (i + 1 < n_algs) {
-                       alg_region->len = be32_to_cpu(adsp1_alg[i + 1].dm);
-                       alg_region->len -= be32_to_cpu(adsp1_alg[i].dm);
-                       alg_region->len *= 4;
-                       wm_adsp_create_control(dsp, alg_region);
+                       len = be32_to_cpu(adsp1_alg[i + 1].dm);
+                       len -= be32_to_cpu(adsp1_alg[i].dm);
+                       len *= 4;
+                       wm_adsp_create_control(dsp, alg_region, len);
                } else {
                        adsp_warn(dsp, "Missing length info for region DM with ID %x\n",
                                  be32_to_cpu(adsp1_alg[i].alg.id));
@@ -1011,13 +1016,12 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                alg_region->type = WMFW_ADSP1_ZM;
                alg_region->alg = be32_to_cpu(adsp1_alg[i].alg.id);
                alg_region->base = be32_to_cpu(adsp1_alg[i].zm);
-               alg_region->len = 0;
                list_add_tail(&alg_region->list, &dsp->alg_regions);
                if (i + 1 < n_algs) {
-                       alg_region->len = be32_to_cpu(adsp1_alg[i + 1].zm);
-                       alg_region->len -= be32_to_cpu(adsp1_alg[i].zm);
-                       alg_region->len *= 4;
-                       wm_adsp_create_control(dsp, alg_region);
+                       len = be32_to_cpu(adsp1_alg[i + 1].zm);
+                       len -= be32_to_cpu(adsp1_alg[i].zm);
+                       len *= 4;
+                       wm_adsp_create_control(dsp, alg_region, len);
                } else {
                        adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                  be32_to_cpu(adsp1_alg[i].alg.id));
@@ -1110,13 +1114,12 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                alg_region->type = WMFW_ADSP2_XM;
                alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
                alg_region->base = be32_to_cpu(adsp2_alg[i].xm);
-               alg_region->len = 0;
                list_add_tail(&alg_region->list, &dsp->alg_regions);
                if (i + 1 < n_algs) {
-                       alg_region->len = be32_to_cpu(adsp2_alg[i + 1].xm);
-                       alg_region->len -= be32_to_cpu(adsp2_alg[i].xm);
-                       alg_region->len *= 4;
-                       wm_adsp_create_control(dsp, alg_region);
+                       len = be32_to_cpu(adsp2_alg[i + 1].xm);
+                       len -= be32_to_cpu(adsp2_alg[i].xm);
+                       len *= 4;
+                       wm_adsp_create_control(dsp, alg_region, len);
                } else {
                        adsp_warn(dsp, "Missing length info for region XM with ID %x\n",
                                  be32_to_cpu(adsp2_alg[i].alg.id));
@@ -1130,13 +1133,12 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                alg_region->type = WMFW_ADSP2_YM;
                alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
                alg_region->base = be32_to_cpu(adsp2_alg[i].ym);
-               alg_region->len = 0;
                list_add_tail(&alg_region->list, &dsp->alg_regions);
                if (i + 1 < n_algs) {
-                       alg_region->len = be32_to_cpu(adsp2_alg[i + 1].ym);
-                       alg_region->len -= be32_to_cpu(adsp2_alg[i].ym);
-                       alg_region->len *= 4;
-                       wm_adsp_create_control(dsp, alg_region);
+                       len = be32_to_cpu(adsp2_alg[i + 1].ym);
+                       len -= be32_to_cpu(adsp2_alg[i].ym);
+                       len *= 4;
+                       wm_adsp_create_control(dsp, alg_region, len);
                } else {
                        adsp_warn(dsp, "Missing length info for region YM with ID %x\n",
                                  be32_to_cpu(adsp2_alg[i].alg.id));
@@ -1150,13 +1152,12 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                alg_region->type = WMFW_ADSP2_ZM;
                alg_region->alg = be32_to_cpu(adsp2_alg[i].alg.id);
                alg_region->base = be32_to_cpu(adsp2_alg[i].zm);
-               alg_region->len = 0;
                list_add_tail(&alg_region->list, &dsp->alg_regions);
                if (i + 1 < n_algs) {
-                       alg_region->len = be32_to_cpu(adsp2_alg[i + 1].zm);
-                       alg_region->len -= be32_to_cpu(adsp2_alg[i].zm);
-                       alg_region->len *= 4;
-                       wm_adsp_create_control(dsp, alg_region);
+                       len = be32_to_cpu(adsp2_alg[i + 1].zm);
+                       len -= be32_to_cpu(adsp2_alg[i].zm);
+                       len *= 4;
+                       wm_adsp_create_control(dsp, alg_region, len);
                } else {
                        adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                  be32_to_cpu(adsp2_alg[i].alg.id));

diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index fc75a24242b0f7e079049f6dbd0ed3a4925ee8fb..0ad14e04196bed68bebda6fe090db9bf3b6bb887 100644 (file)
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -30,7 +30,6 @@ struct wm_adsp_alg_region {
        unsigned int alg;
        int type;
        unsigned int base;
-       size_t len;
 };
 
 struct wm_adsp {