summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/bxt-sst.c
diff options
context:
space:
mode:
authorCezary Rojewski <cezary.rojewski@intel.com>2020-11-29 12:41:46 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-02 08:49:56 +0100
commitb2b05b04d44da4448eded3b9be33cbca1dfcd771 (patch)
treea31c8281d77ff6d58d68dbaef218a473e482aa18 /sound/soc/intel/skylake/bxt-sst.c
parenta28144d62ddc287a9d00102b4f36904ecd976258 (diff)
downloadlinux-stable-b2b05b04d44da4448eded3b9be33cbca1dfcd771.tar.gz
linux-stable-b2b05b04d44da4448eded3b9be33cbca1dfcd771.tar.bz2
linux-stable-b2b05b04d44da4448eded3b9be33cbca1dfcd771.zip
ASoC: Intel: Skylake: Await purge request ack on CNL
commit 7693cadac86548b30389a6e11d78c38db654f393 upstream. Each purge request is sent by driver after master core is powered up and unresetted but before it is unstalled. On unstall, ROM begins processing the request and initializing environment for FW load. Host should await ROM's ack before moving forward. Without doing so, ROM init poll may start too early and false timeouts can occur. Fixes: cb6a55284629 ("ASoC: Intel: cnl: Add sst library functions for cnl platform") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200305145314.32579-8-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Cc: <stable@vger.kernel.org> # 5.4.x Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/intel/skylake/bxt-sst.c')
-rw-r--r--sound/soc/intel/skylake/bxt-sst.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index cdafade8abd6..38b9d7494083 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -17,7 +17,6 @@
#include "skl.h"
#define BXT_BASEFW_TIMEOUT 3000
-#define BXT_INIT_TIMEOUT 300
#define BXT_ROM_INIT_TIMEOUT 70
#define BXT_IPC_PURGE_FW 0x01004000