ASoC: wm_adsp: Add a handler for the compressed IRQ
[linux-2.6-microblaze.git] / sound / soc / codecs / wm_adsp.c
index 0bb415a..49ef0bb 100644 (file)
@@ -201,27 +201,193 @@ static void wm_adsp_buf_free(struct list_head *list)
        }
 }
 
-#define WM_ADSP_NUM_FW 4
-
-#define WM_ADSP_FW_MBC_VSS 0
-#define WM_ADSP_FW_TX      1
-#define WM_ADSP_FW_TX_SPK  2
-#define WM_ADSP_FW_RX_ANC  3
+#define WM_ADSP_FW_MBC_VSS  0
+#define WM_ADSP_FW_HIFI     1
+#define WM_ADSP_FW_TX       2
+#define WM_ADSP_FW_TX_SPK   3
+#define WM_ADSP_FW_RX       4
+#define WM_ADSP_FW_RX_ANC   5
+#define WM_ADSP_FW_CTRL     6
+#define WM_ADSP_FW_ASR      7
+#define WM_ADSP_FW_TRACE    8
+#define WM_ADSP_FW_SPK_PROT 9
+#define WM_ADSP_FW_MISC     10
+
+#define WM_ADSP_NUM_FW      11
 
 static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
-       [WM_ADSP_FW_MBC_VSS] = "MBC/VSS",
-       [WM_ADSP_FW_TX] =      "Tx",
-       [WM_ADSP_FW_TX_SPK] =  "Tx Speaker",
-       [WM_ADSP_FW_RX_ANC] =  "Rx ANC",
+       [WM_ADSP_FW_MBC_VSS] =  "MBC/VSS",
+       [WM_ADSP_FW_HIFI] =     "MasterHiFi",
+       [WM_ADSP_FW_TX] =       "Tx",
+       [WM_ADSP_FW_TX_SPK] =   "Tx Speaker",
+       [WM_ADSP_FW_RX] =       "Rx",
+       [WM_ADSP_FW_RX_ANC] =   "Rx ANC",
+       [WM_ADSP_FW_CTRL] =     "Voice Ctrl",
+       [WM_ADSP_FW_ASR] =      "ASR Assist",
+       [WM_ADSP_FW_TRACE] =    "Dbg Trace",
+       [WM_ADSP_FW_SPK_PROT] = "Protection",
+       [WM_ADSP_FW_MISC] =     "Misc",
+};
+
+struct wm_adsp_system_config_xm_hdr {
+       __be32 sys_enable;
+       __be32 fw_id;
+       __be32 fw_rev;
+       __be32 boot_status;
+       __be32 watchdog;
+       __be32 dma_buffer_size;
+       __be32 rdma[6];
+       __be32 wdma[8];
+       __be32 build_job_name[3];
+       __be32 build_job_number;
+};
+
+struct wm_adsp_alg_xm_struct {
+       __be32 magic;
+       __be32 smoothing;
+       __be32 threshold;
+       __be32 host_buf_ptr;
+       __be32 start_seq;
+       __be32 high_water_mark;
+       __be32 low_water_mark;
+       __be64 smoothed_power;
+};
+
+struct wm_adsp_buffer {
+       __be32 X_buf_base;              /* XM base addr of first X area */
+       __be32 X_buf_size;              /* Size of 1st X area in words */
+       __be32 X_buf_base2;             /* XM base addr of 2nd X area */
+       __be32 X_buf_brk;               /* Total X size in words */
+       __be32 Y_buf_base;              /* YM base addr of Y area */
+       __be32 wrap;                    /* Total size X and Y in words */
+       __be32 high_water_mark;         /* Point at which IRQ is asserted */
+       __be32 irq_count;               /* bits 1-31 count IRQ assertions */
+       __be32 irq_ack;                 /* acked IRQ count, bit 0 enables IRQ */
+       __be32 next_write_index;        /* word index of next write */
+       __be32 next_read_index;         /* word index of next read */
+       __be32 error;                   /* error if any */
+       __be32 oldest_block_index;      /* word index of oldest surviving */
+       __be32 requested_rewind;        /* how many blocks rewind was done */
+       __be32 reserved_space;          /* internal */
+       __be32 min_free;                /* min free space since stream start */
+       __be32 blocks_written[2];       /* total blocks written (64 bit) */
+       __be32 words_written[2];        /* total words written (64 bit) */
+};
+
+struct wm_adsp_compr_buf {
+       struct wm_adsp *dsp;
+
+       struct wm_adsp_buffer_region *regions;
+       u32 host_buf_ptr;
+
+       u32 error;
+       u32 irq_count;
+       int read_index;
+       int avail;
+};
+
+struct wm_adsp_compr {
+       struct wm_adsp *dsp;
+       struct wm_adsp_compr_buf *buf;
+
+       struct snd_compr_stream *stream;
+       struct snd_compressed_buffer size;
+
+       unsigned int copied_total;
+};
+
+#define WM_ADSP_DATA_WORD_SIZE         3
+
+#define WM_ADSP_MIN_FRAGMENTS          1
+#define WM_ADSP_MAX_FRAGMENTS          256
+#define WM_ADSP_MIN_FRAGMENT_SIZE      (64 * WM_ADSP_DATA_WORD_SIZE)
+#define WM_ADSP_MAX_FRAGMENT_SIZE      (4096 * WM_ADSP_DATA_WORD_SIZE)
+
+#define WM_ADSP_ALG_XM_STRUCT_MAGIC    0x49aec7
+
+#define HOST_BUFFER_FIELD(field) \
+       (offsetof(struct wm_adsp_buffer, field) / sizeof(__be32))
+
+#define ALG_XM_FIELD(field) \
+       (offsetof(struct wm_adsp_alg_xm_struct, field) / sizeof(__be32))
+
+static int wm_adsp_buffer_init(struct wm_adsp *dsp);
+static int wm_adsp_buffer_free(struct wm_adsp *dsp);
+
+struct wm_adsp_buffer_region {
+       unsigned int offset;
+       unsigned int cumulative_size;
+       unsigned int mem_type;
+       unsigned int base_addr;
+};
+
+struct wm_adsp_buffer_region_def {
+       unsigned int mem_type;
+       unsigned int base_offset;
+       unsigned int size_offset;
+};
+
+static struct wm_adsp_buffer_region_def ez2control_regions[] = {
+       {
+               .mem_type = WMFW_ADSP2_XM,
+               .base_offset = HOST_BUFFER_FIELD(X_buf_base),
+               .size_offset = HOST_BUFFER_FIELD(X_buf_size),
+       },
+       {
+               .mem_type = WMFW_ADSP2_XM,
+               .base_offset = HOST_BUFFER_FIELD(X_buf_base2),
+               .size_offset = HOST_BUFFER_FIELD(X_buf_brk),
+       },
+       {
+               .mem_type = WMFW_ADSP2_YM,
+               .base_offset = HOST_BUFFER_FIELD(Y_buf_base),
+               .size_offset = HOST_BUFFER_FIELD(wrap),
+       },
+};
+
+struct wm_adsp_fw_caps {
+       u32 id;
+       struct snd_codec_desc desc;
+       int num_regions;
+       struct wm_adsp_buffer_region_def *region_defs;
 };
 
-static struct {
+static const struct wm_adsp_fw_caps ez2control_caps[] = {
+       {
+               .id = SND_AUDIOCODEC_BESPOKE,
+               .desc = {
+                       .max_ch = 1,
+                       .sample_rates = { 16000 },
+                       .num_sample_rates = 1,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+               },
+               .num_regions = ARRAY_SIZE(ez2control_regions),
+               .region_defs = ez2control_regions,
+       },
+};
+
+static const struct {
        const char *file;
+       int compr_direction;
+       int num_caps;
+       const struct wm_adsp_fw_caps *caps;
 } wm_adsp_fw[WM_ADSP_NUM_FW] = {
-       [WM_ADSP_FW_MBC_VSS] = { .file = "mbc-vss" },
-       [WM_ADSP_FW_TX] =      { .file = "tx" },
-       [WM_ADSP_FW_TX_SPK] =  { .file = "tx-spk" },
-       [WM_ADSP_FW_RX_ANC] =  { .file = "rx-anc" },
+       [WM_ADSP_FW_MBC_VSS] =  { .file = "mbc-vss" },
+       [WM_ADSP_FW_HIFI] =     { .file = "hifi" },
+       [WM_ADSP_FW_TX] =       { .file = "tx" },
+       [WM_ADSP_FW_TX_SPK] =   { .file = "tx-spk" },
+       [WM_ADSP_FW_RX] =       { .file = "rx" },
+       [WM_ADSP_FW_RX_ANC] =   { .file = "rx-anc" },
+       [WM_ADSP_FW_CTRL] =     {
+               .file = "ctrl",
+               .compr_direction = SND_COMPRESS_CAPTURE,
+               .num_caps = ARRAY_SIZE(ez2control_caps),
+               .caps = ez2control_caps,
+       },
+       [WM_ADSP_FW_ASR] =      { .file = "asr" },
+       [WM_ADSP_FW_TRACE] =    { .file = "trace" },
+       [WM_ADSP_FW_SPK_PROT] = { .file = "spk-prot" },
+       [WM_ADSP_FW_MISC] =     { .file = "misc" },
 };
 
 struct wm_coeff_ctl_ops {
@@ -254,30 +420,24 @@ static void wm_adsp_debugfs_save_wmfwname(struct wm_adsp *dsp, const char *s)
 {
        char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
 
-       mutex_lock(&dsp->debugfs_lock);
        kfree(dsp->wmfw_file_name);
        dsp->wmfw_file_name = tmp;
-       mutex_unlock(&dsp->debugfs_lock);
 }
 
 static void wm_adsp_debugfs_save_binname(struct wm_adsp *dsp, const char *s)
 {
        char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
 
-       mutex_lock(&dsp->debugfs_lock);
        kfree(dsp->bin_file_name);
        dsp->bin_file_name = tmp;
-       mutex_unlock(&dsp->debugfs_lock);
 }
 
 static void wm_adsp_debugfs_clear(struct wm_adsp *dsp)
 {
-       mutex_lock(&dsp->debugfs_lock);
        kfree(dsp->wmfw_file_name);
        kfree(dsp->bin_file_name);
        dsp->wmfw_file_name = NULL;
        dsp->bin_file_name = NULL;
-       mutex_unlock(&dsp->debugfs_lock);
 }
 
 static ssize_t wm_adsp_debugfs_wmfw_read(struct file *file,
@@ -287,7 +447,7 @@ static ssize_t wm_adsp_debugfs_wmfw_read(struct file *file,
        struct wm_adsp *dsp = file->private_data;
        ssize_t ret;
 
-       mutex_lock(&dsp->debugfs_lock);
+       mutex_lock(&dsp->pwr_lock);
 
        if (!dsp->wmfw_file_name || !dsp->running)
                ret = 0;
@@ -296,7 +456,7 @@ static ssize_t wm_adsp_debugfs_wmfw_read(struct file *file,
                                              dsp->wmfw_file_name,
                                              strlen(dsp->wmfw_file_name));
 
-       mutex_unlock(&dsp->debugfs_lock);
+       mutex_unlock(&dsp->pwr_lock);
        return ret;
 }
 
@@ -307,7 +467,7 @@ static ssize_t wm_adsp_debugfs_bin_read(struct file *file,
        struct wm_adsp *dsp = file->private_data;
        ssize_t ret;
 
-       mutex_lock(&dsp->debugfs_lock);
+       mutex_lock(&dsp->pwr_lock);
 
        if (!dsp->bin_file_name || !dsp->running)
                ret = 0;
@@ -316,7 +476,7 @@ static ssize_t wm_adsp_debugfs_bin_read(struct file *file,
                                              dsp->bin_file_name,
                                              strlen(dsp->bin_file_name));
 
-       mutex_unlock(&dsp->debugfs_lock);
+       mutex_unlock(&dsp->pwr_lock);
        return ret;
 }
 
@@ -436,6 +596,7 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);
+       int ret = 0;
 
        if (ucontrol->value.integer.value[0] == dsp[e->shift_l].fw)
                return 0;
@@ -443,12 +604,16 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
        if (ucontrol->value.integer.value[0] >= WM_ADSP_NUM_FW)
                return -EINVAL;
 
-       if (dsp[e->shift_l].running)
-               return -EBUSY;
+       mutex_lock(&dsp[e->shift_l].pwr_lock);
+
+       if (dsp[e->shift_l].running || dsp[e->shift_l].compr)
+               ret = -EBUSY;
+       else
+               dsp[e->shift_l].fw = ucontrol->value.integer.value[0];
 
-       dsp[e->shift_l].fw = ucontrol->value.integer.value[0];
+       mutex_unlock(&dsp[e->shift_l].pwr_lock);
 
-       return 0;
+       return ret;
 }
 
 static const struct soc_enum wm_adsp_fw_enum[] = {
@@ -523,10 +688,10 @@ static void wm_adsp2_show_fw_status(struct wm_adsp *dsp)
                 be16_to_cpu(scratch[3]));
 }
 
-static int wm_coeff_info(struct snd_kcontrol *kcontrol,
+static int wm_coeff_info(struct snd_kcontrol *kctl,
                         struct snd_ctl_elem_info *uinfo)
 {
-       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;
+       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;
 
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
        uinfo->count = ctl->len;
@@ -572,19 +737,24 @@ static int wm_coeff_write_control(struct wm_coeff_ctl *ctl,
        return 0;
 }
 
-static int wm_coeff_put(struct snd_kcontrol *kcontrol,
+static int wm_coeff_put(struct snd_kcontrol *kctl,
                        struct snd_ctl_elem_value *ucontrol)
 {
-       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;
+       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;
        char *p = ucontrol->value.bytes.data;
+       int ret = 0;
+
+       mutex_lock(&ctl->dsp->pwr_lock);
 
        memcpy(ctl->cache, p, ctl->len);
 
        ctl->set = 1;
-       if (!ctl->enabled)
-               return 0;
+       if (ctl->enabled)
+               ret = wm_coeff_write_control(ctl, p, ctl->len);
 
-       return wm_coeff_write_control(ctl, p, ctl->len);
+       mutex_unlock(&ctl->dsp->pwr_lock);
+
+       return ret;
 }
 
 static int wm_coeff_read_control(struct wm_coeff_ctl *ctl,
@@ -626,22 +796,30 @@ static int wm_coeff_read_control(struct wm_coeff_ctl *ctl,
        return 0;
 }
 
-static int wm_coeff_get(struct snd_kcontrol *kcontrol,
+static int wm_coeff_get(struct snd_kcontrol *kctl,
                        struct snd_ctl_elem_value *ucontrol)
 {
-       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;
+       struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;
        char *p = ucontrol->value.bytes.data;
+       int ret = 0;
+
+       mutex_lock(&ctl->dsp->pwr_lock);
 
        if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {
                if (ctl->enabled)
-                       return wm_coeff_read_control(ctl, p, ctl->len);
+                       ret = wm_coeff_read_control(ctl, p, ctl->len);
                else
-                       return -EPERM;
+                       ret = -EPERM;
+       } else {
+               if (!ctl->flags && ctl->enabled)
+                       ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len);
+
+               memcpy(p, ctl->cache, ctl->len);
        }
 
-       memcpy(p, ctl->cache, ctl->len);
+       mutex_unlock(&ctl->dsp->pwr_lock);
 
-       return 0;
+       return ret;
 }
 
 struct wmfw_ctl_work {
@@ -808,8 +986,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
                break;
        }
 
-       list_for_each_entry(ctl, &dsp->ctl_list,
-                           list) {
+       list_for_each_entry(ctl, &dsp->ctl_list, list) {
                if (!strcmp(ctl->name, name)) {
                        if (!ctl->enabled)
                                ctl->enabled = 1;
@@ -1088,7 +1265,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                goto out_fw;
        }
 
-       header = (void*)&firmware->data[0];
+       header = (void *)&firmware->data[0];
 
        if (memcmp(&header->magic[0], "WMFW", 4) != 0) {
                adsp_err(dsp, "%s: invalid magic\n", file);
@@ -1168,7 +1345,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                offset = le32_to_cpu(region->offset) & 0xffffff;
                type = be32_to_cpu(region->type) & 0xff;
                mem = wm_adsp_find_region(dsp, type);
-               
+
                switch (type) {
                case WMFW_NAME_TEXT:
                        region_name = "Firmware name";
@@ -1333,6 +1510,19 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
        return alg;
 }
 
+static struct wm_adsp_alg_region *
+       wm_adsp_find_alg_region(struct wm_adsp *dsp, int type, unsigned int id)
+{
+       struct wm_adsp_alg_region *alg_region;
+
+       list_for_each_entry(alg_region, &dsp->alg_regions, list) {
+               if (id == alg_region->alg && type == alg_region->type)
+                       return alg_region;
+       }
+
+       return NULL;
+}
+
 static struct wm_adsp_alg_region *wm_adsp_create_region(struct wm_adsp *dsp,
                                                        int type, __be32 id,
                                                        __be32 base)
@@ -1625,7 +1815,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                goto out_fw;
        }
 
-       hdr = (void*)&firmware->data[0];
+       hdr = (void *)&firmware->data[0];
        if (memcmp(hdr->magic, "WMDR", 4) != 0) {
                adsp_err(dsp, "%s: invalid magic\n", file);
                goto out_fw;
@@ -1651,7 +1841,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
        blocks = 0;
        while (pos < firmware->size &&
               pos - firmware->size > sizeof(*blk)) {
-               blk = (void*)(&firmware->data[pos]);
+               blk = (void *)(&firmware->data[pos]);
 
                type = le16_to_cpu(blk->type);
                offset = le16_to_cpu(blk->offset);
@@ -1705,22 +1895,16 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                                break;
                        }
 
-                       reg = 0;
-                       list_for_each_entry(alg_region,
-                                           &dsp->alg_regions, list) {
-                               if (le32_to_cpu(blk->id) == alg_region->alg &&
-                                   type == alg_region->type) {
-                                       reg = alg_region->base;
-                                       reg = wm_adsp_region_to_reg(mem,
-                                                                   reg);
-                                       reg += offset;
-                                       break;
-                               }
-                       }
-
-                       if (reg == 0)
+                       alg_region = wm_adsp_find_alg_region(dsp, type,
+                                               le32_to_cpu(blk->id));
+                       if (alg_region) {
+                               reg = alg_region->base;
+                               reg = wm_adsp_region_to_reg(mem, reg);
+                               reg += offset;
+                       } else {
                                adsp_err(dsp, "No %x for algorithm %x\n",
                                         type, le32_to_cpu(blk->id));
+                       }
                        break;
 
                default:
@@ -1778,9 +1962,8 @@ int wm_adsp1_init(struct wm_adsp *dsp)
 {
        INIT_LIST_HEAD(&dsp->alg_regions);
 
-#ifdef CONFIG_DEBUG_FS
-       mutex_init(&dsp->debugfs_lock);
-#endif
+       mutex_init(&dsp->pwr_lock);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(wm_adsp1_init);
@@ -1795,10 +1978,12 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
        struct wm_adsp_alg_region *alg_region;
        struct wm_coeff_ctl *ctl;
        int ret;
-       int val;
+       unsigned int val;
 
        dsp->card = codec->component.card;
 
+       mutex_lock(&dsp->pwr_lock);
+
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
@@ -1808,12 +1993,12 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                 * For simplicity set the DSP clock rate to be the
                 * SYSCLK rate rather than making it configurable.
                 */
-               if(dsp->sysclk_reg) {
+               if (dsp->sysclk_reg) {
                        ret = regmap_read(dsp->regmap, dsp->sysclk_reg, &val);
                        if (ret != 0) {
                                adsp_err(dsp, "Failed to read SYSCLK state: %d\n",
                                ret);
-                               return ret;
+                               goto err_mutex;
                        }
 
                        val = (val & dsp->sysclk_mask)
@@ -1825,31 +2010,31 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                        if (ret != 0) {
                                adsp_err(dsp, "Failed to set clock rate: %d\n",
                                         ret);
-                               return ret;
+                               goto err_mutex;
                        }
                }
 
                ret = wm_adsp_load(dsp);
                if (ret != 0)
-                       goto err;
+                       goto err_ena;
 
                ret = wm_adsp1_setup_algs(dsp);
                if (ret != 0)
-                       goto err;
+                       goto err_ena;
 
                ret = wm_adsp_load_coeff(dsp);
                if (ret != 0)
-                       goto err;
+                       goto err_ena;
 
                /* Initialize caches for enabled and unset controls */
                ret = wm_coeff_init_control_caches(dsp);
                if (ret != 0)
-                       goto err;
+                       goto err_ena;
 
                /* Sync set controls */
                ret = wm_coeff_sync_controls(dsp);
                if (ret != 0)
-                       goto err;
+                       goto err_ena;
 
                /* Start the core running */
                regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
@@ -1884,11 +2069,16 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                break;
        }
 
+       mutex_unlock(&dsp->pwr_lock);
+
        return 0;
 
-err:
+err_ena:
        regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
                           ADSP1_SYS_ENA, 0);
+err_mutex:
+       mutex_unlock(&dsp->pwr_lock);
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(wm_adsp1_event);
@@ -1934,6 +2124,8 @@ static void wm_adsp2_boot_work(struct work_struct *work)
        int ret;
        unsigned int val;
 
+       mutex_lock(&dsp->pwr_lock);
+
        /*
         * For simplicity set the DSP clock rate to be the
         * SYSCLK rate rather than making it configurable.
@@ -1941,7 +2133,7 @@ static void wm_adsp2_boot_work(struct work_struct *work)
        ret = regmap_read(dsp->regmap, ARIZONA_SYSTEM_CLOCK_1, &val);
        if (ret != 0) {
                adsp_err(dsp, "Failed to read SYSCLK state: %d\n", ret);
-               return;
+               goto err_mutex;
        }
        val = (val & ARIZONA_SYSCLK_FREQ_MASK)
                >> ARIZONA_SYSCLK_FREQ_SHIFT;
@@ -1951,42 +2143,46 @@ static void wm_adsp2_boot_work(struct work_struct *work)
                                       ADSP2_CLK_SEL_MASK, val);
        if (ret != 0) {
                adsp_err(dsp, "Failed to set clock rate: %d\n", ret);
-               return;
+               goto err_mutex;
        }
 
        ret = wm_adsp2_ena(dsp);
        if (ret != 0)
-               return;
+               goto err_mutex;
 
        ret = wm_adsp_load(dsp);
        if (ret != 0)
-               goto err;
+               goto err_ena;
 
        ret = wm_adsp2_setup_algs(dsp);
        if (ret != 0)
-               goto err;
+               goto err_ena;
 
        ret = wm_adsp_load_coeff(dsp);
        if (ret != 0)
-               goto err;
+               goto err_ena;
 
        /* Initialize caches for enabled and unset controls */
        ret = wm_coeff_init_control_caches(dsp);
        if (ret != 0)
-               goto err;
+               goto err_ena;
 
        /* Sync set controls */
        ret = wm_coeff_sync_controls(dsp);
        if (ret != 0)
-               goto err;
+               goto err_ena;
 
        dsp->running = true;
 
+       mutex_unlock(&dsp->pwr_lock);
+
        return;
 
-err:
+err_ena:
        regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
                           ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
+err_mutex:
+       mutex_unlock(&dsp->pwr_lock);
 }
 
 int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
@@ -2033,12 +2229,18 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                                         ADSP2_CORE_ENA | ADSP2_START);
                if (ret != 0)
                        goto err;
+
+               if (wm_adsp_fw[dsp->fw].num_caps != 0)
+                       ret = wm_adsp_buffer_init(dsp);
+
                break;
 
        case SND_SOC_DAPM_PRE_PMD:
                /* Log firmware state, it can be useful for analysis */
                wm_adsp2_show_fw_status(dsp);
 
+               mutex_lock(&dsp->pwr_lock);
+
                wm_adsp_debugfs_clear(dsp);
 
                dsp->fw_id = 0;
@@ -2065,6 +2267,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                        kfree(alg_region);
                }
 
+               if (wm_adsp_fw[dsp->fw].num_caps != 0)
+                       wm_adsp_buffer_free(dsp);
+
+               mutex_unlock(&dsp->pwr_lock);
+
                adsp_dbg(dsp, "Shutdown complete\n");
                break;
 
@@ -2117,11 +2324,587 @@ int wm_adsp2_init(struct wm_adsp *dsp)
        INIT_LIST_HEAD(&dsp->ctl_list);
        INIT_WORK(&dsp->boot_work, wm_adsp2_boot_work);
 
-#ifdef CONFIG_DEBUG_FS
-       mutex_init(&dsp->debugfs_lock);
-#endif
+       mutex_init(&dsp->pwr_lock);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(wm_adsp2_init);
 
+int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)
+{
+       struct wm_adsp_compr *compr;
+       int ret = 0;
+
+       mutex_lock(&dsp->pwr_lock);
+
+       if (wm_adsp_fw[dsp->fw].num_caps == 0) {
+               adsp_err(dsp, "Firmware does not support compressed API\n");
+               ret = -ENXIO;
+               goto out;
+       }
+
+       if (wm_adsp_fw[dsp->fw].compr_direction != stream->direction) {
+               adsp_err(dsp, "Firmware does not support stream direction\n");
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (dsp->compr) {
+               /* It is expect this limitation will be removed in future */
+               adsp_err(dsp, "Only a single stream supported per DSP\n");
+               ret = -EBUSY;
+               goto out;
+       }
+
+       compr = kzalloc(sizeof(*compr), GFP_KERNEL);
+       if (!compr) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       compr->dsp = dsp;
+       compr->stream = stream;
+
+       dsp->compr = compr;
+
+       stream->runtime->private_data = compr;
+
+out:
+       mutex_unlock(&dsp->pwr_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_open);
+
+int wm_adsp_compr_free(struct snd_compr_stream *stream)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       struct wm_adsp *dsp = compr->dsp;
+
+       mutex_lock(&dsp->pwr_lock);
+
+       dsp->compr = NULL;
+
+       kfree(compr);
+
+       mutex_unlock(&dsp->pwr_lock);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_free);
+
+static int wm_adsp_compr_check_params(struct snd_compr_stream *stream,
+                                     struct snd_compr_params *params)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       struct wm_adsp *dsp = compr->dsp;
+       const struct wm_adsp_fw_caps *caps;
+       const struct snd_codec_desc *desc;
+       int i, j;
+
+       if (params->buffer.fragment_size < WM_ADSP_MIN_FRAGMENT_SIZE ||
+           params->buffer.fragment_size > WM_ADSP_MAX_FRAGMENT_SIZE ||
+           params->buffer.fragments < WM_ADSP_MIN_FRAGMENTS ||
+           params->buffer.fragments > WM_ADSP_MAX_FRAGMENTS ||
+           params->buffer.fragment_size % WM_ADSP_DATA_WORD_SIZE) {
+               adsp_err(dsp, "Invalid buffer fragsize=%d fragments=%d\n",
+                        params->buffer.fragment_size,
+                        params->buffer.fragments);
+
+               return -EINVAL;
+       }
+
+       for (i = 0; i < wm_adsp_fw[dsp->fw].num_caps; i++) {
+               caps = &wm_adsp_fw[dsp->fw].caps[i];
+               desc = &caps->desc;
+
+               if (caps->id != params->codec.id)
+                       continue;
+
+               if (stream->direction == SND_COMPRESS_PLAYBACK) {
+                       if (desc->max_ch < params->codec.ch_out)
+                               continue;
+               } else {
+                       if (desc->max_ch < params->codec.ch_in)
+                               continue;
+               }
+
+               if (!(desc->formats & (1 << params->codec.format)))
+                       continue;
+
+               for (j = 0; j < desc->num_sample_rates; ++j)
+                       if (desc->sample_rates[j] == params->codec.sample_rate)
+                               return 0;
+       }
+
+       adsp_err(dsp, "Invalid params id=%u ch=%u,%u rate=%u fmt=%u\n",
+                params->codec.id, params->codec.ch_in, params->codec.ch_out,
+                params->codec.sample_rate, params->codec.format);
+       return -EINVAL;
+}
+
+static inline unsigned int wm_adsp_compr_frag_words(struct wm_adsp_compr *compr)
+{
+       return compr->size.fragment_size / WM_ADSP_DATA_WORD_SIZE;
+}
+
+int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
+                            struct snd_compr_params *params)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       int ret;
+
+       ret = wm_adsp_compr_check_params(stream, params);
+       if (ret)
+               return ret;
+
+       compr->size = params->buffer;
+
+       adsp_dbg(compr->dsp, "fragment_size=%d fragments=%d\n",
+                compr->size.fragment_size, compr->size.fragments);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_set_params);
+
+int wm_adsp_compr_get_caps(struct snd_compr_stream *stream,
+                          struct snd_compr_caps *caps)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       int fw = compr->dsp->fw;
+       int i;
+
+       if (wm_adsp_fw[fw].caps) {
+               for (i = 0; i < wm_adsp_fw[fw].num_caps; i++)
+                       caps->codecs[i] = wm_adsp_fw[fw].caps[i].id;
+
+               caps->num_codecs = i;
+               caps->direction = wm_adsp_fw[fw].compr_direction;
+
+               caps->min_fragment_size = WM_ADSP_MIN_FRAGMENT_SIZE;
+               caps->max_fragment_size = WM_ADSP_MAX_FRAGMENT_SIZE;
+               caps->min_fragments = WM_ADSP_MIN_FRAGMENTS;
+               caps->max_fragments = WM_ADSP_MAX_FRAGMENTS;
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_get_caps);
+
+static int wm_adsp_read_data_block(struct wm_adsp *dsp, int mem_type,
+                                  unsigned int mem_addr,
+                                  unsigned int num_words, u32 *data)
+{
+       struct wm_adsp_region const *mem = wm_adsp_find_region(dsp, mem_type);
+       unsigned int i, reg;
+       int ret;
+
+       if (!mem)
+               return -EINVAL;
+
+       reg = wm_adsp_region_to_reg(mem, mem_addr);
+
+       ret = regmap_raw_read(dsp->regmap, reg, data,
+                             sizeof(*data) * num_words);
+       if (ret < 0)
+               return ret;
+
+       for (i = 0; i < num_words; ++i)
+               data[i] = be32_to_cpu(data[i]) & 0x00ffffffu;
+
+       return 0;
+}
+
+static inline int wm_adsp_read_data_word(struct wm_adsp *dsp, int mem_type,
+                                        unsigned int mem_addr, u32 *data)
+{
+       return wm_adsp_read_data_block(dsp, mem_type, mem_addr, 1, data);
+}
+
+static int wm_adsp_write_data_word(struct wm_adsp *dsp, int mem_type,
+                                  unsigned int mem_addr, u32 data)
+{
+       struct wm_adsp_region const *mem = wm_adsp_find_region(dsp, mem_type);
+       unsigned int reg;
+
+       if (!mem)
+               return -EINVAL;
+
+       reg = wm_adsp_region_to_reg(mem, mem_addr);
+
+       data = cpu_to_be32(data & 0x00ffffffu);
+
+       return regmap_raw_write(dsp->regmap, reg, &data, sizeof(data));
+}
+
+static inline int wm_adsp_buffer_read(struct wm_adsp_compr_buf *buf,
+                                     unsigned int field_offset, u32 *data)
+{
+       return wm_adsp_read_data_word(buf->dsp, WMFW_ADSP2_XM,
+                                     buf->host_buf_ptr + field_offset, data);
+}
+
+static inline int wm_adsp_buffer_write(struct wm_adsp_compr_buf *buf,
+                                      unsigned int field_offset, u32 data)
+{
+       return wm_adsp_write_data_word(buf->dsp, WMFW_ADSP2_XM,
+                                      buf->host_buf_ptr + field_offset, data);
+}
+
+static int wm_adsp_buffer_locate(struct wm_adsp_compr_buf *buf)
+{
+       struct wm_adsp_alg_region *alg_region;
+       struct wm_adsp *dsp = buf->dsp;
+       u32 xmalg, addr, magic;
+       int i, ret;
+
+       alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id);
+       xmalg = sizeof(struct wm_adsp_system_config_xm_hdr) / sizeof(__be32);
+
+       addr = alg_region->base + xmalg + ALG_XM_FIELD(magic);
+       ret = wm_adsp_read_data_word(dsp, WMFW_ADSP2_XM, addr, &magic);
+       if (ret < 0)
+               return ret;
+
+       if (magic != WM_ADSP_ALG_XM_STRUCT_MAGIC)
+               return -EINVAL;
+
+       addr = alg_region->base + xmalg + ALG_XM_FIELD(host_buf_ptr);
+       for (i = 0; i < 5; ++i) {
+               ret = wm_adsp_read_data_word(dsp, WMFW_ADSP2_XM, addr,
+                                            &buf->host_buf_ptr);
+               if (ret < 0)
+                       return ret;
+
+               if (buf->host_buf_ptr)
+                       break;
+
+               usleep_range(1000, 2000);
+       }
+
+       if (!buf->host_buf_ptr)
+               return -EIO;
+
+       adsp_dbg(dsp, "host_buf_ptr=%x\n", buf->host_buf_ptr);
+
+       return 0;
+}
+
+static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
+{
+       const struct wm_adsp_fw_caps *caps = wm_adsp_fw[buf->dsp->fw].caps;
+       struct wm_adsp_buffer_region *region;
+       u32 offset = 0;
+       int i, ret;
+
+       for (i = 0; i < caps->num_regions; ++i) {
+               region = &buf->regions[i];
+
+               region->offset = offset;
+               region->mem_type = caps->region_defs[i].mem_type;
+
+               ret = wm_adsp_buffer_read(buf, caps->region_defs[i].base_offset,
+                                         &region->base_addr);
+               if (ret < 0)
+                       return ret;
+
+               ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset,
+                                         &offset);
+               if (ret < 0)
+                       return ret;
+
+               region->cumulative_size = offset;
+
+               adsp_dbg(buf->dsp,
+                        "region=%d type=%d base=%04x off=%04x size=%04x\n",
+                        i, region->mem_type, region->base_addr,
+                        region->offset, region->cumulative_size);
+       }
+
+       return 0;
+}
+
+static int wm_adsp_buffer_init(struct wm_adsp *dsp)
+{
+       struct wm_adsp_compr_buf *buf;
+       int ret;
+
+       buf = kzalloc(sizeof(*buf), GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+
+       buf->dsp = dsp;
+       buf->read_index = -1;
+       buf->irq_count = 0xFFFFFFFF;
+
+       ret = wm_adsp_buffer_locate(buf);
+       if (ret < 0) {
+               adsp_err(dsp, "Failed to acquire host buffer: %d\n", ret);
+               goto err_buffer;
+       }
+
+       buf->regions = kcalloc(wm_adsp_fw[dsp->fw].caps->num_regions,
+                              sizeof(*buf->regions), GFP_KERNEL);
+       if (!buf->regions) {
+               ret = -ENOMEM;
+               goto err_buffer;
+       }
+
+       ret = wm_adsp_buffer_populate(buf);
+       if (ret < 0) {
+               adsp_err(dsp, "Failed to populate host buffer: %d\n", ret);
+               goto err_regions;
+       }
+
+       dsp->buffer = buf;
+
+       return 0;
+
+err_regions:
+       kfree(buf->regions);
+err_buffer:
+       kfree(buf);
+       return ret;
+}
+
+static int wm_adsp_buffer_free(struct wm_adsp *dsp)
+{
+       if (dsp->buffer) {
+               kfree(dsp->buffer->regions);
+               kfree(dsp->buffer);
+
+               dsp->buffer = NULL;
+       }
+
+       return 0;
+}
+
+static inline int wm_adsp_compr_attached(struct wm_adsp_compr *compr)
+{
+       return compr->buf != NULL;
+}
+
+static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)
+{
+       /*
+        * Note this will be more complex once each DSP can support multiple
+        * streams
+        */
+       if (!compr->dsp->buffer)
+               return -EINVAL;
+
+       compr->buf = compr->dsp->buffer;
+
+       return 0;
+}
+
+int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       struct wm_adsp *dsp = compr->dsp;
+       int ret = 0;
+
+       adsp_dbg(dsp, "Trigger: %d\n", cmd);
+
+       mutex_lock(&dsp->pwr_lock);
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+               if (wm_adsp_compr_attached(compr))
+                       break;
+
+               ret = wm_adsp_compr_attach(compr);
+               if (ret < 0) {
+                       adsp_err(dsp, "Failed to link buffer and stream: %d\n",
+                                ret);
+                       break;
+               }
+
+               /* Trigger the IRQ at one fragment of data */
+               ret = wm_adsp_buffer_write(compr->buf,
+                                          HOST_BUFFER_FIELD(high_water_mark),
+                                          wm_adsp_compr_frag_words(compr));
+               if (ret < 0) {
+                       adsp_err(dsp, "Failed to set high water mark: %d\n",
+                                ret);
+                       break;
+               }
+               break;
+       case SNDRV_PCM_TRIGGER_STOP:
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       mutex_unlock(&dsp->pwr_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_trigger);
+
+static inline int wm_adsp_buffer_size(struct wm_adsp_compr_buf *buf)
+{
+       int last_region = wm_adsp_fw[buf->dsp->fw].caps->num_regions - 1;
+
+       return buf->regions[last_region].cumulative_size;
+}
+
+static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf)
+{
+       u32 next_read_index, next_write_index;
+       int write_index, read_index, avail;
+       int ret;
+
+       /* Only sync read index if we haven't already read a valid index */
+       if (buf->read_index < 0) {
+               ret = wm_adsp_buffer_read(buf,
+                               HOST_BUFFER_FIELD(next_read_index),
+                               &next_read_index);
+               if (ret < 0)
+                       return ret;
+
+               read_index = sign_extend32(next_read_index, 23);
+
+               if (read_index < 0) {
+                       adsp_dbg(buf->dsp, "Avail check on unstarted stream\n");
+                       return 0;
+               }
+
+               buf->read_index = read_index;
+       }
+
+       ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(next_write_index),
+                       &next_write_index);
+       if (ret < 0)
+               return ret;
+
+       write_index = sign_extend32(next_write_index, 23);
+
+       avail = write_index - buf->read_index;
+       if (avail < 0)
+               avail += wm_adsp_buffer_size(buf);
+
+       adsp_dbg(buf->dsp, "readindex=0x%x, writeindex=0x%x, avail=%d\n",
+                buf->read_index, write_index, avail);
+
+       buf->avail = avail;
+
+       return 0;
+}
+
+int wm_adsp_compr_handle_irq(struct wm_adsp *dsp)
+{
+       struct wm_adsp_compr_buf *buf = dsp->buffer;
+       int ret = 0;
+
+       mutex_lock(&dsp->pwr_lock);
+
+       if (!buf) {
+               adsp_err(dsp, "Spurious buffer IRQ\n");
+               ret = -ENODEV;
+               goto out;
+       }
+
+       adsp_dbg(dsp, "Handling buffer IRQ\n");
+
+       ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(error), &buf->error);
+       if (ret < 0) {
+               adsp_err(dsp, "Failed to check buffer error: %d\n", ret);
+               goto out;
+       }
+       if (buf->error != 0) {
+               adsp_err(dsp, "Buffer error occurred: %d\n", buf->error);
+               ret = -EIO;
+               goto out;
+       }
+
+       ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(irq_count),
+                                 &buf->irq_count);
+       if (ret < 0) {
+               adsp_err(dsp, "Failed to get irq_count: %d\n", ret);
+               goto out;
+       }
+
+       ret = wm_adsp_buffer_update_avail(buf);
+       if (ret < 0) {
+               adsp_err(dsp, "Error reading avail: %d\n", ret);
+               goto out;
+       }
+
+out:
+       mutex_unlock(&dsp->pwr_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_handle_irq);
+
+static int wm_adsp_buffer_reenable_irq(struct wm_adsp_compr_buf *buf)
+{
+       if (buf->irq_count & 0x01)
+               return 0;
+
+       adsp_dbg(buf->dsp, "Enable IRQ(0x%x) for next fragment\n",
+                buf->irq_count);
+
+       buf->irq_count |= 0x01;
+
+       return wm_adsp_buffer_write(buf, HOST_BUFFER_FIELD(irq_ack),
+                                   buf->irq_count);
+}
+
+int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
+                         struct snd_compr_tstamp *tstamp)
+{
+       struct wm_adsp_compr *compr = stream->runtime->private_data;
+       struct wm_adsp_compr_buf *buf = compr->buf;
+       struct wm_adsp *dsp = compr->dsp;
+       int ret = 0;
+
+       adsp_dbg(dsp, "Pointer request\n");
+
+       mutex_lock(&dsp->pwr_lock);
+
+       if (!compr->buf) {
+               ret = -ENXIO;
+               goto out;
+       }
+
+       if (compr->buf->error) {
+               ret = -EIO;
+               goto out;
+       }
+
+       if (buf->avail < wm_adsp_compr_frag_words(compr)) {
+               ret = wm_adsp_buffer_update_avail(buf);
+               if (ret < 0) {
+                       adsp_err(dsp, "Error reading avail: %d\n", ret);
+                       goto out;
+               }
+
+               /*
+                * If we really have less than 1 fragment available tell the
+                * DSP to inform us once a whole fragment is available.
+                */
+               if (buf->avail < wm_adsp_compr_frag_words(compr)) {
+                       ret = wm_adsp_buffer_reenable_irq(buf);
+                       if (ret < 0) {
+                               adsp_err(dsp,
+                                        "Failed to re-enable buffer IRQ: %d\n",
+                                        ret);
+                               goto out;
+                       }
+               }
+       }
+
+       tstamp->copied_total = compr->copied_total;
+       tstamp->copied_total += buf->avail * WM_ADSP_DATA_WORD_SIZE;
+
+out:
+       mutex_unlock(&dsp->pwr_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(wm_adsp_compr_pointer);
+
 MODULE_LICENSE("GPL v2");