samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp: Fix payload mismatch issue in AFE clock setting

Browse Source 
IID support is set from user space during boot up
which can come in parallel with AFE set clock requests
due to which param payload is set in difference with
the actual set param command as per instance id support.

Change-Id: I07e45fda0943cac814f25c16da930dfae5d209a6
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
This commit is contained in:
Aditya Bavanari
2019-02-28 11:06:41 +05:30
committed by Meng Wang
parent efdb8d9f66
commit 23513e0973
3 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
dsp/q6common.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
*/
#include <dsp/q6common.h>
@@ -104,3 +104,74 @@ int q6common_pack_pp_params(u8 *dest, struct param_hdr_v3 *v3_hdr,
return 0;
}
EXPORT_SYMBOL(q6common_pack_pp_params);
/**
* q6common_pack_pp_params_v2
*
* Populate params header based on instance ID support and pack
* it with payload.
* Instance ID support -
* yes - param_hdr_v3 + payload
* no - param_hdr_v1 + payload
*
* @dest: destination data pointer to be packed into
* @v3_hdr: param header v3
* @param_data: param payload
* @total_size: total size of packed data (hdr + payload)
* @iid_supported: Instance ID supported or not
*
* Returns 0 on success or error on failure
*/
int q6common_pack_pp_params_v2(u8 *dest, struct param_hdr_v3 *v3_hdr,
u8 *param_data, u32 *total_size,
bool iid_supported)
{
struct param_hdr_v1 *v1_hdr = NULL;
u32 packed_size = 0;
u32 param_size = 0;
if (dest == NULL) {
pr_err("%s: Received NULL pointer for destination\n", __func__);
return -EINVAL;
} else if (v3_hdr == NULL) {
pr_err("%s: Received NULL pointer for header\n", __func__);
return -EINVAL;
} else if (total_size == NULL) {
pr_err("%s: Received NULL pointer for total size\n", __func__);
return -EINVAL;
}
param_size = v3_hdr->param_size;
packed_size = iid_supported ? sizeof(struct param_hdr_v3) :
sizeof(struct param_hdr_v1);
if (iid_supported) {
memcpy(dest, v3_hdr, packed_size);
} else {
v1_hdr = (struct param_hdr_v1 *) dest;
v1_hdr->module_id = v3_hdr->module_id;
v1_hdr->param_id = v3_hdr->param_id;
if (param_size > U16_MAX) {
pr_err("%s: Invalid param size for V1 %d\n", __func__,
param_size);
return -EINVAL;
}
v1_hdr->param_size = param_size;
v1_hdr->reserved = 0;
}
/*
* Make param_data optional for cases when there is no data
* present as in some set cases and all get cases.
*/
if (param_data != NULL) {
memcpy(dest + packed_size, param_data, param_size);
packed_size += param_size;
}
*total_size = packed_size;
return 0;
}
EXPORT_SYMBOL(q6common_pack_pp_params_v2);