dsp: add change to enable preemption at cal_utils_dealloc_cal.
Add change to enable preemption at cal_utils_dealloc_cal.
Change-Id: I3d9304851f4d61d7afb82c0512421159ec788db1
Signed-off-by: Saurav Kumar <sauravk@codeaurora.org>
diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c
index 7d05543..03603a2 100644
--- a/asoc/msm-pcm-routing-v2.c
+++ b/asoc/msm-pcm-routing-v2.c
@@ -1177,7 +1177,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, cal_data[cal_index]))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
if (((struct audio_cal_info_adm_top *)cal_block
@@ -1207,7 +1207,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, cal_data[cal_index]))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
cal_info = (struct audio_cal_info_adm_top *)
diff --git a/dsp/audio_cal_utils.c b/dsp/audio_cal_utils.c
index cc66c2d..0f37fda 100644
--- a/dsp/audio_cal_utils.c
+++ b/dsp/audio_cal_utils.c
@@ -10,7 +10,7 @@
#include <linux/mutex.h>
#include <dsp/audio_cal_utils.h>
-spinlock_t cal_lock;
+struct mutex cal_lock;
static int unmap_memory(struct cal_type_data *cal_type,
struct cal_block_data *cal_block);
@@ -901,7 +901,6 @@
int ret = 0;
struct cal_block_data *cal_block;
struct audio_cal_type_dealloc *dealloc_data = data;
- unsigned long flags = 0;
pr_debug("%s\n", __func__);
@@ -949,9 +948,9 @@
if (ret < 0)
goto err;
- spin_lock_irqsave(&cal_lock, flags);
+ mutex_lock(&cal_lock);
delete_cal_block(cal_block);
- spin_unlock_irqrestore(&cal_lock, flags);
+ mutex_unlock(&cal_lock);
err:
mutex_unlock(&cal_type->lock);
done:
@@ -1068,7 +1067,7 @@
int __init cal_utils_init(void)
{
- spin_lock_init(&cal_lock);
+ mutex_init(&cal_lock);
return 0;
}
/**
@@ -1076,22 +1075,13 @@
*
* @cal_block: pointer to cal block
*
- * @cal_type: pointer to the cal type
- *
* Returns true if cal block is stale, false otherwise
*/
-bool cal_utils_is_cal_stale(struct cal_block_data *cal_block, struct cal_type_data *cal_type)
+bool cal_utils_is_cal_stale(struct cal_block_data *cal_block)
{
bool ret = false;
- unsigned long flags = 0;
- if (!cal_type) {
- pr_err("%s: cal_type is Null", __func__);
- goto done;
- }
-
- spin_lock_irqsave(&cal_lock, flags);
- cal_block = cal_utils_get_only_cal_block(cal_type);
+ mutex_lock(&cal_lock);
if (!cal_block) {
pr_err("%s: cal_block is Null", __func__);
goto unlock;
@@ -1101,8 +1091,7 @@
ret = true;
unlock:
- spin_unlock_irqrestore(&cal_lock, flags);
-done:
+ mutex_unlock(&cal_lock);
return ret;
}
EXPORT_SYMBOL(cal_utils_is_cal_stale);
diff --git a/dsp/q6adm.c b/dsp/q6adm.c
index ed1a50a..51ca185 100644
--- a/dsp/q6adm.c
+++ b/dsp/q6adm.c
@@ -2004,7 +2004,7 @@
this_adm.set_custom_topology = 0;
cal_block = cal_utils_get_only_cal_block(this_adm.cal_data[cal_index]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, this_adm.cal_data[cal_index]))
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block))
goto unlock;
pr_debug("%s: Sending cal_index %d\n", __func__, cal_index);
@@ -2144,7 +2144,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, this_adm.cal_data[cal_index]))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
if (cal_index == ADM_AUDPROC_CAL ||
@@ -2183,7 +2183,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, this_adm.cal_data[cal_index]))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
if (cal_index == ADM_AUDPROC_CAL ||
@@ -2225,7 +2225,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, this_adm.cal_data[cal_index]))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
if (cal_index == ADM_AUDPROC_CAL ||
@@ -3963,8 +3963,7 @@
cal_block = cal_utils_get_only_cal_block(
this_adm.cal_data[ADM_RTAC_AUDVOL_CAL]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block,
- this_adm.cal_data[ADM_RTAC_AUDVOL_CAL])) {
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block)) {
pr_err("%s: can't find cal block!\n", __func__);
goto unlock;
}
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 8cb2519..283d425 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -2108,7 +2108,7 @@
goto unlock;
this_afe.set_custom_topology = 0;
cal_block = cal_utils_get_only_cal_block(this_afe.cal_data[cal_index]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, this_afe.cal_data[cal_index])) {
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block)) {
pr_err("%s cal_block not found!!\n", __func__);
goto unlock;
}
@@ -2852,7 +2852,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
/* Skip cal_block if it is already marked stale */
- if (cal_utils_is_cal_stale(cal_block, cal_type))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
pr_info("%s: port id: 0x%x, dev_acdb_id: %d\n", __func__,
port_id, this_afe.dev_acdb_id[afe_port_index]);
@@ -3290,7 +3290,7 @@
cal_block = cal_utils_get_only_cal_block(
this_afe.cal_data[cal_index]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, this_afe.cal_data[cal_index])) {
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block)) {
pr_err_ratelimited("%s cal_block not found!!\n", __func__);
ret = -EINVAL;
goto unlock;
@@ -7727,7 +7727,7 @@
}
mutex_lock(&this_afe.cal_data[cal_index]->lock);
cal_block = cal_utils_get_only_cal_block(this_afe.cal_data[cal_index]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, this_afe.cal_data[cal_index])) {
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block)) {
pr_err("%s: cal_block not found\n ", __func__);
mutex_unlock(&this_afe.cal_data[cal_index]->lock);
ret = -EINVAL;
@@ -7854,7 +7854,7 @@
mutex_lock(&this_afe.cal_data[cal_index]->lock);
cal_block = cal_utils_get_only_cal_block(this_afe.cal_data[cal_index]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, this_afe.cal_data[cal_index])) {
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block)) {
pr_err("%s: cal_block not found\n", __func__);
mutex_unlock(&this_afe.cal_data[cal_index]->lock);
ret = -EINVAL;
@@ -9758,7 +9758,7 @@
cal_block = list_entry(ptr,
struct cal_block_data, list);
- if (cal_utils_is_cal_stale(cal_block, cal_type))
+ if (cal_utils_is_cal_stale(cal_block))
continue;
if (((struct audio_cal_info_hw_delay *)cal_block->cal_info)
diff --git a/dsp/q6asm.c b/dsp/q6asm.c
index 2a078ea..235cdbd 100644
--- a/dsp/q6asm.c
+++ b/dsp/q6asm.c
@@ -808,7 +808,7 @@
set_custom_topology = 0;
cal_block = cal_utils_get_only_cal_block(cal_data[ASM_CUSTOM_TOP_CAL]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, cal_data[ASM_CUSTOM_TOP_CAL]))
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block))
goto unlock;
if (cal_block->cal_data.size == 0) {
@@ -11092,7 +11092,7 @@
mutex_lock(&cal_data[ASM_TOPOLOGY_CAL]->lock);
cal_block = cal_utils_get_only_cal_block(cal_data[ASM_TOPOLOGY_CAL]);
- if (cal_block == NULL || cal_utils_is_cal_stale(cal_block, cal_data[ASM_CUSTOM_TOP_CAL]))
+ if (cal_block == NULL || cal_utils_is_cal_stale(cal_block))
goto unlock;
cal_info->topology_id = ((struct audio_cal_info_asm_top *)
cal_block->cal_info)->topology;
@@ -11152,7 +11152,7 @@
goto unlock;
}
- if (cal_utils_is_cal_stale(cal_block, cal_data[ASM_AUDSTRM_CAL])) {
+ if (cal_utils_is_cal_stale(cal_block)) {
rc = 0; /* not error case */
pr_debug("%s: cal_block is stale\n",
__func__);
diff --git a/include/dsp/audio_cal_utils.h b/include/dsp/audio_cal_utils.h
index 0507486..99f619f 100644
--- a/include/dsp/audio_cal_utils.h
+++ b/include/dsp/audio_cal_utils.h
@@ -94,7 +94,7 @@
void cal_utils_mark_cal_used(struct cal_block_data *cal_block);
-bool cal_utils_is_cal_stale(struct cal_block_data *cal_block, struct cal_type_data *cal_type);
+bool cal_utils_is_cal_stale(struct cal_block_data *cal_block);
int cal_utils_init(void);
#endif