hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

This commit is contained in:
Mark Brown 2015-03-16 12:03:14 +00:00
parent 06e5801b8c 3fe0607a04
commit 016e81f202
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/intel/sst-haswell-dsp.c
View File

@ -207,9 +207,6 @@ static int hsw_parse_fw_image(struct sst_fw *sst_fw)
module = (void *)module + sizeof(*module) + module->mod_size; module = (void *)module + sizeof(*module) + module->mod_size;
} }
/* allocate scratch mem regions */
sst_block_alloc_scratch(dsp);
return 0; return 0;
} }

32
sound/soc/intel/sst-haswell-ipc.c
View File

@ -1732,6 +1732,7 @@ static void sst_hsw_drop_all(struct sst_hsw *hsw)
int sst_hsw_dsp_load(struct sst_hsw *hsw) int sst_hsw_dsp_load(struct sst_hsw *hsw)
{ {
struct sst_dsp *dsp = hsw->dsp; struct sst_dsp *dsp = hsw->dsp;
struct sst_fw *sst_fw, *t;
int ret; int ret;
dev_dbg(hsw->dev, "loading audio DSP...."); dev_dbg(hsw->dev, "loading audio DSP....");
@ -1748,12 +1749,17 @@ int sst_hsw_dsp_load(struct sst_hsw *hsw)
return ret; return ret;
} }
ret = sst_fw_reload(hsw->sst_fw); list_for_each_entry_safe_reverse(sst_fw, t, &dsp->fw_list, list) {
if (ret < 0) { ret = sst_fw_reload(sst_fw);
dev_err(hsw->dev, "error: SST FW reload failed\n"); if (ret < 0) {
sst_dsp_dma_put_channel(dsp); dev_err(hsw->dev, "error: SST FW reload failed\n");
return -ENOMEM; sst_dsp_dma_put_channel(dsp);
return -ENOMEM;
}
} }
ret = sst_block_alloc_scratch(hsw->dsp);
if (ret < 0)
return -EINVAL;
sst_dsp_dma_put_channel(dsp); sst_dsp_dma_put_channel(dsp);
return 0; return 0;
@ -1809,12 +1815,17 @@ int sst_hsw_dsp_runtime_suspend(struct sst_hsw *hsw)
int sst_hsw_dsp_runtime_sleep(struct sst_hsw *hsw) int sst_hsw_dsp_runtime_sleep(struct sst_hsw *hsw)
{ {
sst_fw_unload(hsw->sst_fw); struct sst_fw *sst_fw, *t;
sst_block_free_scratch(hsw->dsp); struct sst_dsp *dsp = hsw->dsp;
list_for_each_entry_safe(sst_fw, t, &dsp->fw_list, list) {
sst_fw_unload(sst_fw);
}
sst_block_free_scratch(dsp);
hsw->boot_complete = false; hsw->boot_complete = false;
sst_dsp_sleep(hsw->dsp); sst_dsp_sleep(dsp);
return 0; return 0;
} }
@ -1943,6 +1954,11 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
goto fw_err; goto fw_err;
} }
/* allocate scratch mem regions */
ret = sst_block_alloc_scratch(hsw->dsp);
if (ret < 0)
goto boot_err;
/* wait for DSP boot completion */ /* wait for DSP boot completion */
sst_dsp_boot(hsw->dsp); sst_dsp_boot(hsw->dsp);
ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete, ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete,