samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Merge "dsp: add support for new ADM LSM cal types"

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Linux Build Service Account
2017-12-16 03:09:26 -08:00
committet von Gerrit - the friendly Code Review server
Ursprung 3a6d24603e 2a627ae4bb
Commit 9c81253780
7 geänderte Dateien mit 169 neuen und 45 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

55
dsp/q6afe.c
Datei anzeigen

@@ -30,12 +30,14 @@
enum {
AFE_COMMON_RX_CAL = 0,
AFE_COMMON_TX_CAL,
AFE_LSM_TX_CAL,
AFE_AANC_CAL,
AFE_FB_SPKR_PROT_CAL,
AFE_HW_DELAY_CAL,
AFE_SIDETONE_CAL,
AFE_SIDETONE_IIR_CAL,
AFE_TOPOLOGY_CAL,
AFE_LSM_TOPOLOGY_CAL,
AFE_CUST_TOPOLOGY_CAL,
AFE_FB_SPKR_PROT_TH_VI_CAL,
AFE_FB_SPKR_PROT_EX_VI_CAL,
@@ -1396,14 +1398,15 @@ err_exit:
return NULL;
}
static int afe_get_cal_topology_id(u16 port_id, u32 *topology_id)
static int afe_get_cal_topology_id(u16 port_id, u32 *topology_id,
int cal_type_index)
{
int ret = 0;
struct cal_block_data *cal_block = NULL;
struct audio_cal_info_afe_top *afe_top_info = NULL;
if (this_afe.cal_data[AFE_TOPOLOGY_CAL] == NULL) {
if (this_afe.cal_data[cal_type_index] == NULL) {
pr_err("%s: [AFE_TOPOLOGY_CAL] not initialized\n", __func__);
return -EINVAL;
}
@@ -1413,9 +1416,9 @@ static int afe_get_cal_topology_id(u16 port_id, u32 *topology_id)
}
*topology_id = 0;
mutex_lock(&this_afe.cal_data[AFE_TOPOLOGY_CAL]->lock);
mutex_lock(&this_afe.cal_data[cal_type_index]->lock);
cal_block = afe_find_cal_topo_id_by_port(
this_afe.cal_data[AFE_TOPOLOGY_CAL], port_id);
this_afe.cal_data[cal_type_index], port_id);
if (cal_block == NULL) {
pr_err("%s: [AFE_TOPOLOGY_CAL] not initialized for this port %d\n",
__func__, port_id);
@@ -1437,7 +1440,7 @@ static int afe_get_cal_topology_id(u16 port_id, u32 *topology_id)
__func__, port_id, afe_top_info->acdb_id,
afe_top_info->topology, ret);
unlock:
mutex_unlock(&this_afe.cal_data[AFE_TOPOLOGY_CAL]->lock);
mutex_unlock(&this_afe.cal_data[cal_type_index]->lock);
return ret;
}
@@ -1455,7 +1458,12 @@ static int afe_send_port_topology_id(u16 port_id)
return -EINVAL;
}
ret = afe_get_cal_topology_id(port_id, &topology_id);
ret = afe_get_cal_topology_id(port_id, &topology_id, AFE_TOPOLOGY_CAL);
if (ret < 0) {
pr_debug("%s: Check for LSM topology\n", __func__);
ret = afe_get_cal_topology_id(port_id, &topology_id,
AFE_LSM_TOPOLOGY_CAL);
}
if (ret || !topology_id) {
pr_debug("%s: AFE port[%d] get_cal_topology[%d] invalid!\n",
__func__, port_id, topology_id);
@@ -1572,7 +1580,7 @@ exit:
return cal_block;
}
static void send_afe_cal_type(int cal_index, int port_id)
static int send_afe_cal_type(int cal_index, int port_id)
{
struct cal_block_data *cal_block = NULL;
int ret;
@@ -1583,19 +1591,22 @@ static void send_afe_cal_type(int cal_index, int port_id)
if (this_afe.cal_data[cal_index] == NULL) {
pr_warn("%s: cal_index %d not allocated!\n",
__func__, cal_index);
ret = -EINVAL;
goto done;
}
if (afe_port_index < 0) {
pr_err("%s: Error getting AFE port index %d\n",
__func__, afe_port_index);
ret = -EINVAL;
goto done;
}
mutex_lock(&this_afe.cal_data[cal_index]->lock);
if (((cal_index == AFE_COMMON_RX_CAL) ||
(cal_index == AFE_COMMON_TX_CAL)) &&
(cal_index == AFE_COMMON_TX_CAL) ||
(cal_index == AFE_LSM_TX_CAL)) &&
(this_afe.dev_acdb_id[afe_port_index] > 0))
cal_block = afe_find_cal(cal_index, port_id);
else
@@ -1604,6 +1615,7 @@ static void send_afe_cal_type(int cal_index, int port_id)
if (cal_block == NULL) {
pr_err("%s cal_block not found!!\n", __func__);
ret = -EINVAL;
goto unlock;
}
@@ -1613,6 +1625,7 @@ static void send_afe_cal_type(int cal_index, int port_id)
if (ret) {
pr_err("%s: Remap_cal_data failed for cal %d!\n",
__func__, cal_index);
ret = -EINVAL;
goto unlock;
}
ret = afe_send_cal_block(port_id, cal_block);
@@ -1622,16 +1635,20 @@ static void send_afe_cal_type(int cal_index, int port_id)
unlock:
mutex_unlock(&this_afe.cal_data[cal_index]->lock);
done:
return;
return ret;
}
void afe_send_cal(u16 port_id)
{
int ret;
pr_debug("%s: port_id=0x%x\n", __func__, port_id);
if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_TX) {
afe_send_cal_spkr_prot_tx(port_id);
send_afe_cal_type(AFE_COMMON_TX_CAL, port_id);
ret = send_afe_cal_type(AFE_COMMON_TX_CAL, port_id);
if (ret < 0)
send_afe_cal_type(AFE_LSM_TX_CAL, port_id);
} else if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_RX) {
afe_send_cal_spkr_prot_rx(port_id);
send_afe_cal_type(AFE_COMMON_RX_CAL, port_id);
@@ -6914,6 +6931,9 @@ static int get_cal_type_index(int32_t cal_type)
case AFE_COMMON_TX_CAL_TYPE:
ret = AFE_COMMON_TX_CAL;
break;
case AFE_LSM_TX_CAL_TYPE:
ret = AFE_LSM_TX_CAL;
break;
case AFE_AANC_CAL_TYPE:
ret = AFE_AANC_CAL;
break;
@@ -6932,6 +6952,9 @@ static int get_cal_type_index(int32_t cal_type)
case AFE_TOPOLOGY_CAL_TYPE:
ret = AFE_TOPOLOGY_CAL;
break;
case AFE_LSM_TOPOLOGY_CAL_TYPE:
ret = AFE_LSM_TOPOLOGY_CAL;
break;
case AFE_CUST_TOPOLOGY_CAL_TYPE:
ret = AFE_CUST_TOPOLOGY_CAL;
break;
@@ -7434,6 +7457,12 @@ static int afe_init_cal_data(void)
{afe_map_cal_data, afe_unmap_cal_data,
cal_utils_match_buf_num} },
{{AFE_LSM_TX_CAL_TYPE,
{afe_alloc_cal, afe_dealloc_cal, NULL,
afe_set_cal, NULL, NULL} },
{afe_map_cal_data, afe_unmap_cal_data,
cal_utils_match_buf_num} },
{{AFE_AANC_CAL_TYPE,
{afe_alloc_cal, afe_dealloc_cal, NULL,
afe_set_cal, NULL, NULL} },
@@ -7466,6 +7495,12 @@ static int afe_init_cal_data(void)
{NULL, NULL,
cal_utils_match_buf_num} },
{{AFE_LSM_TOPOLOGY_CAL_TYPE,
{NULL, NULL, NULL,
afe_set_cal, NULL, NULL} },
{NULL, NULL,
cal_utils_match_buf_num} },
{{AFE_CUST_TOPOLOGY_CAL_TYPE,
{afe_alloc_cal, afe_dealloc_cal, NULL,
afe_set_cal, NULL, NULL} },