Commit 6dd78b31 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown

ASoC: SOF: ipc: use timeout configured at probe

Do not hardcode IPC timeout value in ipc.c, but rather use the timeout
value configured during device probe. For platforms that do not override
the IPC timeout, default value TIMEOUT_DEFAULT_IPC_MS has already been
defined in core.c.
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-5-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a49b6871
...@@ -17,12 +17,6 @@ ...@@ -17,12 +17,6 @@
#include "sof-priv.h" #include "sof-priv.h"
#include "ops.h" #include "ops.h"
/*
* IPC message default size and timeout (ms).
* TODO: allow platforms to set size and timeout.
*/
#define IPC_TIMEOUT_MS 300
static void ipc_trace_message(struct snd_sof_dev *sdev, u32 msg_id); static void ipc_trace_message(struct snd_sof_dev *sdev, u32 msg_id);
static void ipc_stream_message(struct snd_sof_dev *sdev, u32 msg_cmd); static void ipc_stream_message(struct snd_sof_dev *sdev, u32 msg_cmd);
...@@ -211,7 +205,7 @@ static int tx_wait_done(struct snd_sof_ipc *ipc, struct snd_sof_ipc_msg *msg, ...@@ -211,7 +205,7 @@ static int tx_wait_done(struct snd_sof_ipc *ipc, struct snd_sof_ipc_msg *msg,
/* wait for DSP IPC completion */ /* wait for DSP IPC completion */
ret = wait_event_timeout(msg->waitq, msg->ipc_complete, ret = wait_event_timeout(msg->waitq, msg->ipc_complete,
msecs_to_jiffies(IPC_TIMEOUT_MS)); msecs_to_jiffies(sdev->ipc_timeout));
if (ret == 0) { if (ret == 0) {
dev_err(sdev->dev, "error: ipc timed out for 0x%x size %d\n", dev_err(sdev->dev, "error: ipc timed out for 0x%x size %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment