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

ASoC: Intel: Skylake: Enable firmware reload in suspend 

Broxton DSP needs retains code loaded during runtime_pm cycles.
But it looses that on suspend cycle, so on resume we need to
download the firmware again.

This is done by adding a new flag and based on flag status, we
download the firmware.

Signed-off-by: Jayachandran B <jayachandran.b@intel.com>
Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jayachandran B 2016-06-13 17:59:01 +05:30 committed by Mark Brown
parent 316f135a4e
commit 1665c177ab
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/intel/skylake/bxt-sst.c
View File

@ -185,6 +185,7 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)
} else { } else {
skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING); skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING);
ret = 0; ret = 0;
skl->fw_loaded = true;
} }
} }
@ -200,6 +201,14 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx)
skl->boot_complete = false; skl->boot_complete = false;
if (skl->fw_loaded == false) {
dev_dbg(ctx->dev, "Re-loading fw\n");
ret = bxt_load_base_firmware(ctx);
if (ret < 0)
dev_err(ctx->dev, "reload fw failed: %d\n", ret);
return ret;
}
ret = skl_dsp_enable_core(ctx); ret = skl_dsp_enable_core(ctx);
if (ret < 0) { if (ret < 0) {
dev_err(ctx->dev, "enable dsp core failed ret: %d\n", ret); dev_err(ctx->dev, "enable dsp core failed ret: %d\n", ret);

3
sound/soc/intel/skylake/skl-sst-ipc.h
View File

@ -63,6 +63,9 @@ struct skl_sst {
/* Populate module information */ /* Populate module information */
struct list_head uuid_list; struct list_head uuid_list;
/* Is firmware loaded */
bool fw_loaded;
}; };
struct skl_ipc_init_instance_msg { struct skl_ipc_init_instance_msg {

1
sound/soc/intel/skylake/skl-sst.c
View File

@ -153,6 +153,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
dev_dbg(ctx->dev, "Download firmware successful%d\n", ret); dev_dbg(ctx->dev, "Download firmware successful%d\n", ret);
skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING); skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING);
skl->fw_loaded = true;
} }
return 0; return 0;
transfer_firmware_failed: transfer_firmware_failed:

1
sound/soc/intel/skylake/skl.c
View File

@ -248,6 +248,7 @@ static int skl_suspend(struct device *dev)
ret = _skl_suspend(ebus); ret = _skl_suspend(ebus);
if (ret < 0) if (ret < 0)
return ret; return ret;
skl->skl_sst->fw_loaded = false;
} }
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) { if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {