asoc: lsm: hold wakelock when keyword is detected
hold wakelock when keyword is detected Change-Id: Id25d4e3094a0cb430696aaeaf06dd176276d4e46 Signed-off-by: Meng Wang <mengw@codeaurora.org>
Este cometimento está contido em:

cometido por
Gerrit - the friendly Code Review server

ascendente
e000435f75
cometimento
b8348e7cb7
@@ -33,6 +33,8 @@
|
||||
#define CAPTURE_MIN_PERIOD_SIZE 320
|
||||
#define LISTEN_MAX_STATUS_PAYLOAD_SIZE 256
|
||||
|
||||
#define WAKELOCK_TIMEOUT 2000
|
||||
|
||||
#define LAB_BUFFER_ALLOC 1
|
||||
#define LAB_BUFFER_DEALLOC 0
|
||||
|
||||
@@ -90,6 +92,7 @@ struct lsm_priv {
|
||||
int xrun_count;
|
||||
int xrun_index;
|
||||
spinlock_t xrun_lock;
|
||||
struct wakeup_source *ws;
|
||||
};
|
||||
|
||||
enum { /* lsm session states */
|
||||
@@ -217,6 +220,8 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
}
|
||||
rtd = substream->private_data;
|
||||
|
||||
pm_wakeup_ws_event(prtd->ws, WAKELOCK_TIMEOUT, true);
|
||||
dev_dbg(rtd->dev, "%s: opcode %x\n", __func__, opcode);
|
||||
switch (opcode) {
|
||||
case LSM_DATA_EVENT_READ_DONE: {
|
||||
int rc;
|
||||
@@ -230,11 +235,13 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
"%s: EVENT_READ_DONE invalid callback, session %d callback %d payload %pK",
|
||||
__func__, prtd->lsm_client->session,
|
||||
token, read_done);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
if (atomic_read(&prtd->read_abort)) {
|
||||
dev_dbg(rtd->dev,
|
||||
"%s: read abort set skip data\n", __func__);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
if (!lsm_lab_buffer_sanity(prtd, read_done, &buf_index)) {
|
||||
@@ -247,6 +254,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
"%s: Invalid index %d buf_index max cnt %d\n",
|
||||
__func__, buf_index,
|
||||
prtd->lsm_client->out_hw_params.period_count);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
spin_lock_irqsave(&prtd->xrun_lock, flags);
|
||||
@@ -284,6 +292,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
dev_err(rtd->dev,
|
||||
"%s: client_size has invalid size[%d]\n",
|
||||
__func__, client_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
status = (uint16_t)((uint8_t *)payload)[0];
|
||||
@@ -299,13 +308,14 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
dev_err(rtd->dev,
|
||||
"%s: client_size has invalid size[%d]\n",
|
||||
__func__, client_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
status = (uint16_t)((uint8_t *)payload)[0];
|
||||
payload_size = (uint16_t)((uint8_t *)payload)[1];
|
||||
index = 2;
|
||||
dev_dbg(rtd->dev,
|
||||
"%s: event detect status = %d payload size = %d\n",
|
||||
"%s: event detect status_v2 = %d payload size = %d\n",
|
||||
__func__, status, payload_size);
|
||||
break;
|
||||
|
||||
@@ -314,6 +324,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
dev_err(rtd->dev,
|
||||
"%s: client_size has invalid size[%d]\n",
|
||||
__func__, client_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
event_ts_lsw = ((uint32_t *)payload)[0];
|
||||
@@ -333,6 +344,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
dev_err(rtd->dev,
|
||||
"%s: client_size has invalid size[%d]\n",
|
||||
__func__, client_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -352,6 +364,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
"LSM_SESSION_DETECTION_ENGINE_GENERIC_EVENT",
|
||||
sizeof(struct snd_lsm_event_status) +
|
||||
payload_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -366,6 +379,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
dev_err(rtd->dev,
|
||||
"%s: Failed to copy memory with invalid size = %d\n",
|
||||
__func__, payload_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
prtd->event_avail = 1;
|
||||
@@ -390,12 +404,14 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
opcode == LSM_SESSION_EVENT_DETECTION_STATUS_V2 ||
|
||||
opcode == LSM_SESSION_EVENT_DETECTION_STATUS_V3) {
|
||||
spin_lock_irqsave(&prtd->event_lock, flags);
|
||||
dev_dbg(rtd->dev, "%s: detection status\n", __func__);
|
||||
temp = krealloc(prtd->event_status,
|
||||
sizeof(struct snd_lsm_event_status_v3) +
|
||||
payload_size, GFP_ATOMIC);
|
||||
if (!temp) {
|
||||
dev_err(rtd->dev, "%s: no memory for event status\n",
|
||||
__func__);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
@@ -415,12 +431,14 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
payload_size);
|
||||
prtd->event_avail = 1;
|
||||
spin_unlock_irqrestore(&prtd->event_lock, flags);
|
||||
dev_dbg(rtd->dev, "%s: wakeup event_wait\n", __func__);
|
||||
wake_up(&prtd->event_wait);
|
||||
} else {
|
||||
spin_unlock_irqrestore(&prtd->event_lock, flags);
|
||||
dev_err(rtd->dev,
|
||||
"%s: Failed to copy memory with invalid size = %d\n",
|
||||
__func__, payload_size);
|
||||
__pm_relax(prtd->ws);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
@@ -432,6 +450,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
|
||||
if (substream->timer_running)
|
||||
snd_timer_interrupt(substream->timer, 1);
|
||||
}
|
||||
dev_dbg(rtd->dev, "%s: leave\n", __func__);
|
||||
}
|
||||
|
||||
static int msm_lsm_lab_buffer_alloc(struct lsm_priv *lsm, int alloc)
|
||||
@@ -1071,6 +1090,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
prtd = runtime->private_data;
|
||||
rtd = substream->private_data;
|
||||
|
||||
dev_dbg(rtd->dev, "%s: enter, cmd %x\n", __func__, cmd);
|
||||
switch (cmd) {
|
||||
case SNDRV_LSM_SET_SESSION_DATA:
|
||||
case SNDRV_LSM_SET_SESSION_DATA_V2:
|
||||
@@ -1136,6 +1156,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
dev_err(rtd->dev,
|
||||
"%s: lsm open failed, %d\n",
|
||||
__func__, ret);
|
||||
__pm_relax(prtd->ws);
|
||||
return ret;
|
||||
}
|
||||
prtd->lsm_client->opened = true;
|
||||
@@ -1271,7 +1292,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
uint32_t ts_lsw, ts_msw;
|
||||
uint16_t status = 0, payload_size = 0;
|
||||
|
||||
dev_dbg(rtd->dev, "%s: Get event status\n", __func__);
|
||||
dev_dbg(rtd->dev, "%s: Get event status cmd %xx\n", __func__, cmd);
|
||||
atomic_set(&prtd->event_wait_stop, 0);
|
||||
|
||||
/*
|
||||
@@ -1284,6 +1305,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
(cmpxchg(&prtd->event_avail, 1, 0) ||
|
||||
(xchg = atomic_cmpxchg(&prtd->event_wait_stop,
|
||||
1, 0))));
|
||||
dev_dbg(rtd->dev, "%s: wait event is done\n", __func__);
|
||||
mutex_lock(&prtd->lsm_api_lock);
|
||||
dev_dbg(rtd->dev, "%s: wait_event_freezable %d event_wait_stop %d\n",
|
||||
__func__, rc, xchg);
|
||||
@@ -1482,12 +1504,14 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
if (prtd->lsm_client->num_stages > 1) {
|
||||
dev_err(rtd->dev, "%s: %s: not supported for multi stage session\n",
|
||||
__func__, "LSM_LAB_CONTROL");
|
||||
__pm_relax(prtd->ws);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (copy_from_user(&enable, arg, sizeof(enable))) {
|
||||
dev_err(rtd->dev, "%s: %s: copy_frm_user failed\n",
|
||||
__func__, "LSM_LAB_CONTROL");
|
||||
__pm_relax(prtd->ws);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
@@ -1542,6 +1566,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
if (copy_from_user(&mode, arg, sizeof(mode))) {
|
||||
dev_err(rtd->dev, "%s: %s: copy_frm_user failed\n",
|
||||
__func__, "LSM_SET_FWK_MODE_CONFIG");
|
||||
__pm_relax(prtd->ws);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
@@ -1572,6 +1597,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
if (copy_from_user(¶ms, arg, sizeof(params))) {
|
||||
dev_err(rtd->dev, "%s: %s: copy_from_user failed\n",
|
||||
__func__, "LSM_SET_INPUT_HW_PARAMS");
|
||||
__pm_relax(prtd->ws);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
@@ -1598,6 +1624,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream,
|
||||
dev_err(rtd->dev, "%s: cmd 0x%x failed %d\n",
|
||||
__func__, cmd, rc);
|
||||
|
||||
__pm_relax(prtd->ws);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -2504,6 +2531,8 @@ static int msm_lsm_open(struct snd_pcm_substream *substream)
|
||||
prtd->lsm_client->fe_id = rtd->dai_link->id;
|
||||
prtd->lsm_client->unprocessed_data = 0;
|
||||
|
||||
prtd->ws = wakeup_source_register(rtd->dev, "lsm-client");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2748,6 +2777,7 @@ static int msm_lsm_close(struct snd_pcm_substream *substream)
|
||||
|
||||
q6lsm_client_free(prtd->lsm_client);
|
||||
|
||||
wakeup_source_unregister(prtd->ws);
|
||||
spin_lock_irqsave(&prtd->event_lock, flags);
|
||||
kfree(prtd->event_status);
|
||||
prtd->event_status = NULL;
|
||||
|
Criar uma nova questão referindo esta
Bloquear um utilizador