mirror of https://gitee.com/openkylin/linux.git
ASoC: Intel: Skylake: Update FW purge for Broxton
Broxton needs to send Purge firmware IPC to DSP before downloading the firmware. The DMA id needs to be updated for that. While at it also update Broxton boot sequence to send purge request after power up and before yanking off reset. 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:
parent
1665c177ab
commit
2023576dd7
sound/soc/intel/skylake
|
@ -58,13 +58,19 @@ static int sst_bxt_prepare_fw(struct sst_dsp *ctx,
|
||||||
ctx->dsp_ops.stream_tag = stream_tag;
|
ctx->dsp_ops.stream_tag = stream_tag;
|
||||||
memcpy(ctx->dmab.area, fwdata, fwsize);
|
memcpy(ctx->dmab.area, fwdata, fwsize);
|
||||||
|
|
||||||
/* Purge FW request */
|
ret = skl_dsp_core_power_up(ctx);
|
||||||
sst_dsp_shim_write(ctx, SKL_ADSP_REG_HIPCI, SKL_ADSP_REG_HIPCI_BUSY |
|
|
||||||
BXT_IPC_PURGE_FW | (stream_tag - 1));
|
|
||||||
|
|
||||||
ret = skl_dsp_enable_core(ctx);
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
|
dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
|
||||||
|
goto base_fw_load_failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Purge FW request */
|
||||||
|
sst_dsp_shim_write(ctx, SKL_ADSP_REG_HIPCI, SKL_ADSP_REG_HIPCI_BUSY |
|
||||||
|
(BXT_IPC_PURGE_FW | ((stream_tag - 1) << 9)));
|
||||||
|
|
||||||
|
ret = skl_dsp_start_core(ctx);
|
||||||
|
if (ret < 0) {
|
||||||
|
dev_err(ctx->dev, "Start dsp core failed ret: %d\n", ret);
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto base_fw_load_failed;
|
goto base_fw_load_failed;
|
||||||
}
|
}
|
||||||
|
@ -161,6 +167,10 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
ret = sst_bxt_prepare_fw(ctx, stripped_fw.data, stripped_fw.size);
|
ret = sst_bxt_prepare_fw(ctx, stripped_fw.data, stripped_fw.size);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n",
|
||||||
|
sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE),
|
||||||
|
sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS));
|
||||||
|
|
||||||
dev_err(ctx->dev, "Core En/ROM load fail:%d\n", ret);
|
dev_err(ctx->dev, "Core En/ROM load fail:%d\n", ret);
|
||||||
goto sst_load_base_firmware_failed;
|
goto sst_load_base_firmware_failed;
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,7 +114,7 @@ static int skl_dsp_reset_core(struct sst_dsp *ctx)
|
||||||
return skl_dsp_core_set_reset_state(ctx);
|
return skl_dsp_core_set_reset_state(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int skl_dsp_start_core(struct sst_dsp *ctx)
|
int skl_dsp_start_core(struct sst_dsp *ctx)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ static int skl_dsp_start_core(struct sst_dsp *ctx)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int skl_dsp_core_power_up(struct sst_dsp *ctx)
|
int skl_dsp_core_power_up(struct sst_dsp *ctx)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -182,5 +182,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset);
|
||||||
void skl_freeup_uuid_list(struct skl_sst *ctx);
|
void skl_freeup_uuid_list(struct skl_sst *ctx);
|
||||||
|
|
||||||
int skl_dsp_strip_extended_manifest(struct firmware *fw);
|
int skl_dsp_strip_extended_manifest(struct firmware *fw);
|
||||||
|
int skl_dsp_start_core(struct sst_dsp *ctx);
|
||||||
|
int skl_dsp_core_power_up(struct sst_dsp *ctx);
|
||||||
|
|
||||||
#endif /*__SKL_SST_DSP_H__*/
|
#endif /*__SKL_SST_DSP_H__*/
|
||||||
|
|
Loading…
Reference in New Issue