UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm_adsp: Separate concept of booted and running 

Currently the wm_adsp driver has a flag that indicates the DSP is
"running", this flag is used to gate access to the hardware.  However this
flag is actually set in the firmware download thread after the firmware has
been downloaded, but this is before the core is actually started running,
so really it currently indicates that the core has been booted and is
perhaps running.

This patch clearly separates out the concepts of booted (firmware is
downloaded) and running (code is executing on the DSP) within the wm_adsp
driver.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2016-09-20 13:52:32 +01:00 committed by Mark Brown
parent 0f72a8a39c
commit 28823ebad5
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sound/soc/codecs/wm_adsp.c
View File

@ -480,7 +480,7 @@ static ssize_t wm_adsp_debugfs_wmfw_read(struct file *file,
mutex_lock(&dsp->pwr_lock); mutex_lock(&dsp->pwr_lock);
if (!dsp->wmfw_file_name || !dsp->running) if (!dsp->wmfw_file_name || !dsp->booted)
ret = 0; ret = 0;
else else
ret = simple_read_from_buffer(user_buf, count, ppos, ret = simple_read_from_buffer(user_buf, count, ppos,
@ -500,7 +500,7 @@ static ssize_t wm_adsp_debugfs_bin_read(struct file *file,
mutex_lock(&dsp->pwr_lock); mutex_lock(&dsp->pwr_lock);
if (!dsp->bin_file_name || !dsp->running) if (!dsp->bin_file_name || !dsp->booted)
ret = 0; ret = 0;
else else
ret = simple_read_from_buffer(user_buf, count, ppos, ret = simple_read_from_buffer(user_buf, count, ppos,
@ -554,6 +554,9 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
if (!root) if (!root)
goto err; goto err;
if (!debugfs_create_bool("booted", S_IRUGO, root, &dsp->booted))
goto err;
if (!debugfs_create_bool("running", S_IRUGO, root, &dsp->running)) if (!debugfs_create_bool("running", S_IRUGO, root, &dsp->running))
goto err; goto err;
@ -637,7 +640,7 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
mutex_lock(&dsp[e->shift_l].pwr_lock); mutex_lock(&dsp[e->shift_l].pwr_lock);
if (dsp[e->shift_l].running || dsp[e->shift_l].compr) if (dsp[e->shift_l].booted || dsp[e->shift_l].compr)
ret = -EBUSY; ret = -EBUSY;
else else
dsp[e->shift_l].fw = ucontrol->value.enumerated.item[0]; dsp[e->shift_l].fw = ucontrol->value.enumerated.item[0];
@ -789,7 +792,7 @@ static int wm_coeff_put(struct snd_kcontrol *kctl,
memcpy(ctl->cache, p, ctl->len); memcpy(ctl->cache, p, ctl->len);
ctl->set = 1; ctl->set = 1;
if (ctl->enabled) if (ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_write_control(ctl, p, ctl->len); ret = wm_coeff_write_control(ctl, p, ctl->len);
mutex_unlock(&ctl->dsp->pwr_lock); mutex_unlock(&ctl->dsp->pwr_lock);
@ -811,7 +814,7 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl,
ret = -EFAULT; ret = -EFAULT;
} else { } else {
ctl->set = 1; ctl->set = 1;
if (ctl->enabled) if (ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_write_control(ctl, ctl->cache, size); ret = wm_coeff_write_control(ctl, ctl->cache, size);
} }
@ -871,12 +874,12 @@ static int wm_coeff_get(struct snd_kcontrol *kctl,
mutex_lock(&ctl->dsp->pwr_lock); mutex_lock(&ctl->dsp->pwr_lock);
if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) { if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {
if (ctl->enabled) if (ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_read_control(ctl, p, ctl->len); ret = wm_coeff_read_control(ctl, p, ctl->len);
else else
ret = -EPERM; ret = -EPERM;
} else { } else {
if (!ctl->flags && ctl->enabled) if (!ctl->flags && ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len); ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len);
memcpy(p, ctl->cache, ctl->len); memcpy(p, ctl->cache, ctl->len);
@ -898,12 +901,12 @@ static int wm_coeff_tlv_get(struct snd_kcontrol *kctl,
mutex_lock(&ctl->dsp->pwr_lock); mutex_lock(&ctl->dsp->pwr_lock);
if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) { if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {
if (ctl->enabled) if (ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_read_control(ctl, ctl->cache, size); ret = wm_coeff_read_control(ctl, ctl->cache, size);
else else
ret = -EPERM; ret = -EPERM;
} else { } else {
if (!ctl->flags && ctl->enabled) if (!ctl->flags && ctl->enabled && ctl->dsp->booted)
ret = wm_coeff_read_control(ctl, ctl->cache, size); ret = wm_coeff_read_control(ctl, ctl->cache, size);
} }
@ -2166,13 +2169,20 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
if (ret != 0) if (ret != 0)
goto err_ena; goto err_ena;
dsp->booted = true;
/* Start the core running */ /* Start the core running */
regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30, regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
ADSP1_CORE_ENA | ADSP1_START, ADSP1_CORE_ENA | ADSP1_START,
ADSP1_CORE_ENA | ADSP1_START); ADSP1_CORE_ENA | ADSP1_START);
dsp->running = true;
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
dsp->running = false;
dsp->booted = false;
/* Halt the core */ /* Halt the core */
regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30, regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
ADSP1_CORE_ENA | ADSP1_START, 0); ADSP1_CORE_ENA | ADSP1_START, 0);
@ -2275,7 +2285,7 @@ static void wm_adsp2_boot_work(struct work_struct *work)
if (ret != 0) if (ret != 0)
goto err_ena; goto err_ena;
dsp->running = true; dsp->booted = true;
mutex_unlock(&dsp->pwr_lock); mutex_unlock(&dsp->pwr_lock);
@ -2336,7 +2346,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
flush_work(&dsp->boot_work); flush_work(&dsp->boot_work);
if (!dsp->running) if (!dsp->booted)
return -EIO; return -EIO;
ret = regmap_update_bits(dsp->regmap, ret = regmap_update_bits(dsp->regmap,
@ -2346,6 +2356,8 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
if (ret != 0) if (ret != 0)
goto err; goto err;
dsp->running = true;
mutex_lock(&dsp->pwr_lock); mutex_lock(&dsp->pwr_lock);
if (wm_adsp_fw[dsp->fw].num_caps != 0) if (wm_adsp_fw[dsp->fw].num_caps != 0)
@ -2365,7 +2377,9 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
dsp->fw_id = 0; dsp->fw_id = 0;
dsp->fw_id_version = 0; dsp->fw_id_version = 0;
dsp->running = false; dsp->running = false;
dsp->booted = false;
regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
ADSP2_CORE_ENA | ADSP2_START, 0); ADSP2_CORE_ENA | ADSP2_START, 0);

2
sound/soc/codecs/wm_adsp.h
View File

@ -61,6 +61,8 @@ struct wm_adsp {
int fw; int fw;
int fw_ver; int fw_ver;
bool booted;
bool running; bool running;
struct list_head ctl_list; struct list_head ctl_list;