Merge "asoc: wcd-dsp-mgr: reinit ssr ready flag for adsp/wdsp ssr"
diff --git a/asoc/codecs/wcd9335.c b/asoc/codecs/wcd9335.c
index ffe52e5..d8c4ca0 100644
--- a/asoc/codecs/wcd9335.c
+++ b/asoc/codecs/wcd9335.c
@@ -2372,9 +2372,9 @@
mutex_lock(&tasha_p->codec_mutex);
if (tasha_p->intf_type == WCD9XXX_INTERFACE_TYPE_SLIMBUS) {
- if (dai_id != AIF1_CAP) {
- dev_err(codec->dev, "%s: invalid AIF for Slimbus mode\n",
- __func__);
+ if (dai_id >= ARRAY_SIZE(vport_slim_check_table)) {
+ dev_err(codec->dev, "%s: dai_id: %d, out of bounds\n",
+ __func__, dai_id);
mutex_unlock(&tasha_p->codec_mutex);
return -EINVAL;
}
diff --git a/dsp/q6asm.c b/dsp/q6asm.c
index 2539564..2553ec9 100644
--- a/dsp/q6asm.c
+++ b/dsp/q6asm.c
@@ -95,6 +95,7 @@
struct audio_session {
struct audio_client *ac;
spinlock_t session_lock;
+ struct mutex mutex_lock_per_session;
};
/* session id: 0 reserved */
static struct audio_session session[ASM_ACTIVE_STREAMS_ALLOWED + 1];
@@ -562,6 +563,8 @@
if (session[n].ac == ac)
return n;
}
+ pr_debug("%s: cannot find matching audio client. ac = %pK\n",
+ __func__, ac);
return 0;
}
@@ -577,6 +580,7 @@
pr_debug("%s: sessionid[%d]\n", __func__, ac->session);
session_id = ac->session;
+ mutex_lock(&session[session_id].mutex_lock_per_session);
rtac_remove_popp_from_adm_devices(ac->session);
spin_lock_irqsave(&(session[session_id].session_lock), flags);
session[ac->session].ac = NULL;
@@ -588,6 +592,7 @@
kfree(ac);
ac = NULL;
spin_unlock_irqrestore(&(session[session_id].session_lock), flags);
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
}
static uint32_t q6asm_get_next_buf(struct audio_client *ac,
@@ -1193,7 +1198,7 @@
{
char *asm_params = NULL;
struct apr_hdr hdr;
- int rc;
+ int rc, session_id = 0;
uint32_t sz = 0;
uint64_t actual_sz = 0;
@@ -1204,6 +1209,12 @@
goto done;
}
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
+ rc = -EINVAL;
+ goto done;
+ }
+
if (data->event_type >= ARRAY_SIZE(adsp_reg_event_opcode)) {
pr_err("%s: event %u out of boundary of array size of (%lu)\n",
__func__, data->event_type,
@@ -1227,6 +1238,12 @@
goto done;
}
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto fail_send_param;
+ }
+
q6asm_add_hdr_async(ac, &hdr, sz, TRUE);
atomic_set(&ac->cmd_state_pp, -1);
hdr.opcode = adsp_reg_event_opcode[data->event_type];
@@ -1259,6 +1276,7 @@
rc = 0;
fail_send_param:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
kfree(asm_params);
done:
return rc;
@@ -7397,12 +7415,26 @@
struct asm_volume_ctrl_multichannel_gain multi_ch_gain;
int sz = 0;
int rc = 0;
+ int session_id = 0;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
+ goto done;
+ }
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
+ rc = -EINVAL;
+ goto done;
+ }
+
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
goto fail_cmd;
}
+
if (ac->apr == NULL) {
pr_err("%s: AC APR handle NULL\n", __func__);
rc = -EINVAL;
@@ -7456,6 +7488,8 @@
}
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
@@ -7473,7 +7507,7 @@
struct asm_volume_ctrl_multichannel_gain multich_gain;
int sz = 0;
int rc = 0;
- int i;
+ int i, session_id = 0;
u8 default_chmap[VOLUME_CONTROL_MAX_CHANNELS];
if (ac == NULL) {
@@ -7481,30 +7515,44 @@
rc = -EINVAL;
goto done;
}
- if (ac->apr == NULL) {
- dev_err(ac->dev, "%s: AC APR handle NULL\n", __func__);
- rc = -EINVAL;
- goto done;
- }
- if (gains == NULL) {
- dev_err(ac->dev, "%s: gain_list is NULL\n", __func__);
- rc = -EINVAL;
- goto done;
- }
- if (channels > VOLUME_CONTROL_MAX_CHANNELS) {
- dev_err(ac->dev, "%s: Invalid channel count %d\n",
- __func__, channels);
- rc = -EINVAL;
- goto done;
- }
- if (!use_default && ch_map == NULL) {
- dev_err(ac->dev, "%s: NULL channel map\n", __func__);
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
rc = -EINVAL;
goto done;
}
memset(&multich_gain, 0, sizeof(multich_gain));
sz = sizeof(struct asm_volume_ctrl_multichannel_gain);
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
+ if (ac->apr == NULL) {
+ dev_err(ac->dev, "%s: AC APR handle NULL\n", __func__);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
+ if (gains == NULL) {
+ dev_err(ac->dev, "%s: gain_list is NULL\n", __func__);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+ if (channels > VOLUME_CONTROL_MAX_CHANNELS) {
+ dev_err(ac->dev, "%s: Invalid channel count %d\n",
+ __func__, channels);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+ if (!use_default && ch_map == NULL) {
+ dev_err(ac->dev, "%s: NULL channel map\n", __func__);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
q6asm_add_hdr_async(ac, &multich_gain.hdr, sz, TRUE);
atomic_set(&ac->cmd_state_pp, -1);
multich_gain.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
@@ -7522,7 +7570,7 @@
if (use_default) {
rc = q6asm_map_channels(default_chmap, channels, false);
if (rc < 0)
- goto done;
+ goto fail_cmd;
for (i = 0; i < channels; i++) {
multich_gain.gain_data[i].channeltype =
default_chmap[i];
@@ -7540,7 +7588,7 @@
if (rc < 0) {
pr_err("%s: set-params send failed paramid[0x%x] rc %d\n",
__func__, multich_gain.data.param_id, rc);
- goto done;
+ goto fail_cmd;
}
rc = wait_event_timeout(ac->cmd_wait,
@@ -7549,16 +7597,18 @@
pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
multich_gain.data.param_id);
rc = -EINVAL;
- goto done;
+ goto fail_cmd;
}
if (atomic_read(&ac->cmd_state_pp) > 0) {
pr_err("%s: DSP returned error[%d] , set-params paramid[0x%x]\n",
__func__, atomic_read(&ac->cmd_state_pp),
multich_gain.data.param_id);
rc = -EINVAL;
- goto done;
+ goto fail_cmd;
}
rc = 0;
+fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
done:
return rc;
}
@@ -7578,12 +7628,26 @@
struct asm_volume_ctrl_mute_config mute;
int sz = 0;
int rc = 0;
+ int session_id = 0;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
+ goto done;
+ }
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
+ rc = -EINVAL;
+ goto done;
+ }
+
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
goto fail_cmd;
}
+
if (ac->apr == NULL) {
pr_err("%s: AC APR handle NULL\n", __func__);
rc = -EINVAL;
@@ -7632,6 +7696,8 @@
}
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
EXPORT_SYMBOL(q6asm_set_mute);
@@ -7641,17 +7707,18 @@
struct asm_volume_ctrl_master_gain vol;
int sz = 0;
int rc = 0;
- int module_id;
+ int module_id, session_id = 0;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
- goto fail_cmd;
+ goto done;
}
- if (ac->apr == NULL) {
- pr_err("%s: AC APR handle NULL\n", __func__);
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
rc = -EINVAL;
- goto fail_cmd;
+ goto done;
}
switch (instance) {
@@ -7665,6 +7732,18 @@
}
sz = sizeof(struct asm_volume_ctrl_master_gain);
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
+ if (ac->apr == NULL) {
+ pr_err("%s: AC APR handle NULL\n", __func__);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
q6asm_add_hdr_async(ac, &vol.hdr, sz, TRUE);
atomic_set(&ac->cmd_state_pp, -1);
vol.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
@@ -7707,6 +7786,8 @@
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
@@ -7989,12 +8070,26 @@
struct asm_soft_pause_params softpause;
int sz = 0;
int rc = 0;
+ int session_id = 0;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
+ goto done;
+ }
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
+ rc = -EINVAL;
+ goto done;
+ }
+
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
goto fail_cmd;
}
+
if (ac->apr == NULL) {
pr_err("%s: AC APR handle NULL\n", __func__);
rc = -EINVAL;
@@ -8048,6 +8143,8 @@
}
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
EXPORT_SYMBOL(q6asm_set_softpause);
@@ -8059,17 +8156,18 @@
struct asm_soft_step_volume_params softvol;
int sz = 0;
int rc = 0;
- int module_id;
+ int module_id, session_id;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
- goto fail_cmd;
+ goto done;
}
- if (ac->apr == NULL) {
- pr_err("%s: AC APR handle NULL\n", __func__);
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
rc = -EINVAL;
- goto fail_cmd;
+ goto done;
}
switch (instance) {
@@ -8083,6 +8181,18 @@
}
sz = sizeof(struct asm_soft_step_volume_params);
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
+ if (ac->apr == NULL) {
+ pr_err("%s: AC APR handle NULL\n", __func__);
+ rc = -EINVAL;
+ goto fail_cmd;
+ }
+
q6asm_add_hdr_async(ac, &softvol.hdr, sz, TRUE);
atomic_set(&ac->cmd_state_pp, -1);
softvol.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
@@ -8127,6 +8237,8 @@
}
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
@@ -8181,12 +8293,26 @@
int i = 0;
int sz = 0;
int rc = 0;
+ int session_id = 0;
if (ac == NULL) {
pr_err("%s: APR handle NULL\n", __func__);
rc = -EINVAL;
+ goto done;
+ }
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id) {
+ rc = -EINVAL;
+ goto done;
+ }
+
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
goto fail_cmd;
}
+
if (ac->apr == NULL) {
pr_err("%s: AC APR handle NULL\n", __func__);
rc = -EINVAL;
@@ -8264,6 +8390,8 @@
}
rc = 0;
fail_cmd:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
+done:
return rc;
}
EXPORT_SYMBOL(q6asm_equalizer);
@@ -8961,17 +9089,18 @@
char *asm_params = NULL;
struct apr_hdr hdr;
struct asm_stream_cmd_set_pp_params_v2 payload_params;
- int sz, rc;
+ int sz, rc, session_id = 0;
pr_debug("%s:\n", __func__);
if (!ac) {
pr_err("%s: APR handle NULL\n", __func__);
return -EINVAL;
}
- if (ac->apr == NULL) {
- pr_err("%s: AC APR handle NULL\n", __func__);
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id)
return -EINVAL;
- }
+
if (params == NULL) {
pr_err("%s: params NULL\n", __func__);
return -EINVAL;
@@ -8984,6 +9113,18 @@
pr_err("%s, asm params memory alloc failed", __func__);
return -ENOMEM;
}
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto fail_send_param;
+ }
+
+ if (ac->apr == NULL) {
+ pr_err("%s: AC APR handle NULL\n", __func__);
+ rc = -EINVAL;
+ goto fail_send_param;
+ }
+
q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +
sizeof(struct asm_stream_cmd_set_pp_params_v2) +
params_length), TRUE);
@@ -9023,6 +9164,7 @@
rc = 0;
fail_send_param:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
kfree(asm_params);
return rc;
}
@@ -10077,7 +10219,7 @@
struct apr_hdr hdr;
char *asm_params = NULL;
struct asm_stream_cmd_set_pp_params_v2 payload_params;
- int sz, rc = -EINVAL;
+ int sz, rc = -EINVAL, session_id = 0;
pr_debug("%s:\n", __func__);
@@ -10085,23 +10227,14 @@
pr_err("%s: APR handle NULL\n", __func__);
goto done;
}
- if (ac->apr == NULL) {
- pr_err("%s: AC APR handle NULL\n", __func__);
+
+ session_id = q6asm_get_session_id_from_audio_client(ac);
+ if (!session_id)
goto done;
- }
- if (ac->io_mode & NT_MODE) {
- pr_debug("%s: called for NT MODE, exiting\n", __func__);
- goto done;
- }
if (cal_data[ASM_AUDSTRM_CAL] == NULL)
goto done;
- if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE) {
- rc = 0; /* no cal is required, not error case */
- goto done;
- }
-
mutex_lock(&cal_data[ASM_AUDSTRM_CAL]->lock);
cal_block = cal_utils_get_only_cal_block(cal_data[ASM_AUDSTRM_CAL]);
if (cal_block == NULL) {
@@ -10133,6 +10266,26 @@
goto unlock;
}
+ mutex_lock(&session[session_id].mutex_lock_per_session);
+ if (!q6asm_is_valid_audio_client(ac)) {
+ rc = -EINVAL;
+ goto free;
+ }
+
+ if (ac->apr == NULL) {
+ pr_err("%s: AC APR handle NULL\n", __func__);
+ goto free;
+ }
+ if (ac->io_mode & NT_MODE) {
+ pr_debug("%s: called for NT MODE, exiting\n", __func__);
+ goto free;
+ }
+
+ if (ac->perf_mode == ULTRA_LOW_LATENCY_PCM_MODE) {
+ rc = 0; /* no cal is required, not error case */
+ goto free;
+ }
+
/* asm_stream_cmd_set_pp_params_v2 has no APR header in it */
q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +
sizeof(struct asm_stream_cmd_set_pp_params_v2)), TRUE);
@@ -10179,6 +10332,7 @@
rc = 0;
free:
+ mutex_unlock(&session[session_id].mutex_lock_per_session);
kfree(asm_params);
unlock:
mutex_unlock(&cal_data[ASM_AUDSTRM_CAL]->lock);
@@ -10368,8 +10522,10 @@
memset(session, 0, sizeof(struct audio_session) *
(ASM_ACTIVE_STREAMS_ALLOWED + 1));
- for (lcnt = 0; lcnt <= ASM_ACTIVE_STREAMS_ALLOWED; lcnt++)
+ for (lcnt = 0; lcnt <= ASM_ACTIVE_STREAMS_ALLOWED; lcnt++) {
spin_lock_init(&(session[lcnt].session_lock));
+ mutex_init(&(session[lcnt].mutex_lock_per_session));
+ }
set_custom_topology = 1;
/*setup common client used for cal mem map */