Merge "dsp: add change to enable preemption at cal_utils_dealloc_cal." (dec796e3) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/msm-pcm-routing-v2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1372,7 +1372,7 @@ static struct cal_block_data *msm_routing_find_topology_by_path(int path,
		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
		@@ -1402,7 +1402,7 @@ static struct cal_block_data *msm_routing_find_topology(int path,
		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 *)

dsp/audio_cal_utils.c

+7 −18

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -919,7 +919,6 @@ int cal_utils_dealloc_cal(size_t data_size, void *data,
		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__);

		@@ -967,9 +966,9 @@ int cal_utils_dealloc_cal(size_t data_size, void *data,
		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:
		@@ -1086,7 +1085,7 @@ EXPORT_SYMBOL(cal_utils_mark_cal_used);

		int __init cal_utils_init(void)
		{
		spin_lock_init(&cal_lock);
		mutex_init(&cal_lock);
		return 0;
		}
		/**
		@@ -1094,22 +1093,13 @@ int __init cal_utils_init(void)
		*
		* @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;
		@@ -1119,8 +1109,7 @@ bool cal_utils_is_cal_stale(struct cal_block_data *cal_block, struct cal_type_da
		ret = true;

		unlock:
		spin_unlock_irqrestore(&cal_lock, flags);
		done:
		mutex_unlock(&cal_lock);
		return ret;
		}
		EXPORT_SYMBOL(cal_utils_is_cal_stale);

dsp/q6adm.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -2038,7 +2038,7 @@ static void send_adm_custom_topology(void)
		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);
		@@ -2178,7 +2178,7 @@ static struct cal_block_data *adm_find_cal_by_path(int cal_index, int path)
		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 \|\|
		@@ -2217,7 +2217,7 @@ static struct cal_block_data *adm_find_cal_by_app_type(int cal_index, int path,
		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 \|\|
		@@ -2259,7 +2259,7 @@ static struct cal_block_data *adm_find_cal(int cal_index, int path,

		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 \|\|
		@@ -4120,8 +4120,7 @@ int send_rtac_audvol_cal(void)

		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;
		}

dsp/q6afe.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2189,7 +2189,7 @@ static void afe_send_custom_topology(void)
		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;
		}
		@@ -3037,7 +3037,7 @@ static struct cal_block_data *afe_find_cal_topo_id_by_port(
		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_debug("%s: port id: 0x%x, dev_acdb_id: %d\n", __func__,
		port_id, this_afe.dev_acdb_id[afe_port_index]);
		@@ -3612,7 +3612,7 @@ static int send_afe_cal_type(int cal_index, int port_id)
		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;
		@@ -8267,7 +8267,7 @@ static int afe_sidetone_iir(u16 tx_port_id)
		}
		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;
		@@ -8394,7 +8394,7 @@ static int afe_sidetone(u16 tx_port_id, u16 rx_port_id, bool enable)

		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;
		@@ -10464,7 +10464,7 @@ static struct cal_block_data *afe_find_hw_delay_by_path(
		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)

dsp/q6asm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -806,7 +806,7 @@ int send_asm_custom_topology(struct audio_client *ac)
		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) {
		@@ -11010,7 +11010,7 @@ static int q6asm_get_asm_topology_apptype(struct q6asm_cal_info *cal_info)

		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;
		@@ -11070,7 +11070,7 @@ int q6asm_send_cal(struct audio_client *ac)
		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__);