A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

dsp: msm_audio_ion_vm: Fix Kernel panic and add token logic in SMMU FE

Browse source 
Fix to resolve kernel panic by unmapping kernel VA when smmu map fails &
add token logic to avoid stale hab response during aHAL restart

Suggested-by: Karthik D K
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
Change-Id: I7a793262ffa98d9e6698b99fb720e583d3990ce7
This commit is contained in:
Rahul Sharma 2021-04-08 13:27:34 +05:30 • committed by Gerrit - the friendly Code Review server
commit c254cedf0a
1 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

90
dsp/msm_audio_ion_vm.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/init.h>
@ -29,6 +29,8 @@
#define MSM_AUDIO_SMMU_VM_CMD_MAP 0x00000001
#define MSM_AUDIO_SMMU_VM_CMD_UNMAP 0x00000002
#define MSM_AUDIO_SMMU_VM_CMD_MAP_V2 0x00000003
#define MSM_AUDIO_SMMU_VM_CMD_UNMAP_V2 0x00000004
#define MSM_AUDIO_SMMU_VM_HAB_MINOR_ID 1
struct msm_audio_ion_private {
@ -50,28 +52,34 @@ struct msm_audio_alloc_data {
u32 export_id;
};
struct msm_audio_smmu_vm_map_cmd {
struct msm_audio_smmu_vm_map_cmd_v2 {
int cmd_id;
u32 export_id;
u32 buf_size;
u32 token;
};
struct msm_audio_smmu_vm_map_cmd_rsp {
struct msm_audio_smmu_vm_map_cmd_rsp_v2 {
int status;
u64 addr;
u32 token;
};
struct msm_audio_smmu_vm_unmap_cmd {
struct msm_audio_smmu_vm_unmap_cmd_v2 {
int cmd_id;
u32 export_id;
u32 token;
};
struct msm_audio_smmu_vm_unmap_cmd_rsp {
struct msm_audio_smmu_vm_unmap_cmd_rsp_v2 {
int status;
u32 token;
u64 padding;
};
static struct msm_audio_ion_private msm_audio_ion_data = {0,};
static u32 msm_audio_ion_hab_handle;
static u32 token_id;
static void msm_audio_ion_add_allocation(
struct msm_audio_ion_private *msm_audio_ion_data,
@ -229,8 +237,8 @@ static int msm_audio_ion_smmu_map(struct dma_buf *dma_buf,
u32 cmd_rsp_size;
bool found = false;
bool exported = false;
struct msm_audio_smmu_vm_map_cmd smmu_map_cmd;
struct msm_audio_smmu_vm_map_cmd_rsp cmd_rsp;
struct msm_audio_smmu_vm_map_cmd_v2 smmu_map_cmd;
struct msm_audio_smmu_vm_map_cmd_rsp_v2 cmd_rsp;
struct msm_audio_alloc_data *alloc_data = NULL;
unsigned long delay = jiffies + (HZ / 2);
@ -252,9 +260,13 @@ static int msm_audio_ion_smmu_map(struct dma_buf *dma_buf,
}
exported = true;
smmu_map_cmd.cmd_id = MSM_AUDIO_SMMU_VM_CMD_MAP;
smmu_map_cmd.cmd_id = MSM_AUDIO_SMMU_VM_CMD_MAP_V2;
smmu_map_cmd.export_id = export_id;
smmu_map_cmd.buf_size = *len;
smmu_map_cmd.token = token_id;
pr_debug("%s: export_id %u, smmu_map_cmd.token %u\n",
__func__, smmu_map_cmd.export_id, smmu_map_cmd.token);
token_id++;
rc = habmm_socket_send(msm_audio_ion_hab_handle,
(void *)&smmu_map_cmd, sizeof(smmu_map_cmd), 0);
@ -279,6 +291,28 @@ static int msm_audio_ion_smmu_map(struct dma_buf *dma_buf,
goto err;
}
while (cmd_rsp.token != smmu_map_cmd.token) {
pr_err("%s: invalid token %u, expected %u\n",
__func__, cmd_rsp.token, smmu_map_cmd.token);
cmd_rsp_size = sizeof(cmd_rsp);
rc = habmm_socket_recv(msm_audio_ion_hab_handle,
(void *)&cmd_rsp,
&cmd_rsp_size,
0xFFFFFFFF,
0);
if (time_before(jiffies, delay) && (rc == -EINTR) &&
(cmd_rsp_size == 0)) {
continue;
}
if (rc) {
pr_err("%s: habmm_socket_recv failed %d\n",
__func__, rc);
goto err;
}
}
if (cmd_rsp_size != sizeof(cmd_rsp)) {
pr_err("%s: invalid size for cmd rsp %u, expected %zu\n",
__func__, cmd_rsp_size, sizeof(cmd_rsp));
@ -302,10 +336,10 @@ static int msm_audio_ion_smmu_map(struct dma_buf *dma_buf,
if (!found) {
pr_err("%s: cannot find allocation, dma_buf %pK", __func__, dma_buf);
return -EINVAL;
rc = -EINVAL;
}
return 0;
return rc;
err:
if (exported)
@ -320,8 +354,8 @@ static int msm_audio_ion_smmu_unmap(struct dma_buf *dma_buf)
int rc;
bool found = false;
u32 cmd_rsp_size;
struct msm_audio_smmu_vm_unmap_cmd smmu_unmap_cmd;
struct msm_audio_smmu_vm_unmap_cmd_rsp cmd_rsp;
struct msm_audio_smmu_vm_unmap_cmd_v2 smmu_unmap_cmd;
struct msm_audio_smmu_vm_unmap_cmd_rsp_v2 cmd_rsp;
struct msm_audio_alloc_data *alloc_data, *next;
unsigned long delay = jiffies + (HZ / 2);
@ -336,9 +370,12 @@ static int msm_audio_ion_smmu_unmap(struct dma_buf *dma_buf)
if (alloc_data->dma_buf == dma_buf) {
found = true;
smmu_unmap_cmd.cmd_id = MSM_AUDIO_SMMU_VM_CMD_UNMAP;
smmu_unmap_cmd.cmd_id = MSM_AUDIO_SMMU_VM_CMD_UNMAP_V2;
smmu_unmap_cmd.export_id = alloc_data->export_id;
smmu_unmap_cmd.token = token_id;
pr_debug("%s: export_id %u, smmu_unmap_cmd.token %u\n",
__func__, smmu_unmap_cmd.export_id, smmu_unmap_cmd.token);
token_id++;
rc = habmm_socket_send(msm_audio_ion_hab_handle,
(void *)&smmu_unmap_cmd,
sizeof(smmu_unmap_cmd), 0);
@ -363,6 +400,28 @@ static int msm_audio_ion_smmu_unmap(struct dma_buf *dma_buf)
goto err;
}
while (cmd_rsp.token != smmu_unmap_cmd.token) {
pr_err("%s: invalid token %u, expected %u\n",
__func__, cmd_rsp.token, smmu_unmap_cmd.token);
cmd_rsp_size = sizeof(cmd_rsp);
rc = habmm_socket_recv(msm_audio_ion_hab_handle,
(void *)&cmd_rsp,
&cmd_rsp_size,
0xFFFFFFFF,
0);
if (time_before(jiffies, delay) && (rc == -EINTR) &&
(cmd_rsp_size == 0)) {
continue;
}
if (rc) {
pr_err("%s: habmm_socket_recv failed %d\n",
__func__, rc);
goto err;
}
}
if (cmd_rsp_size != sizeof(cmd_rsp)) {
pr_err("%s: invalid size for cmd rsp %u\n",
__func__, cmd_rsp_size);
@ -400,8 +459,6 @@ err:
if (found) {
(void)habmm_unexport(msm_audio_ion_hab_handle,
alloc_data->export_id, 0xFFFFFFFF);
list_del(&(alloc_data->list));
kfree(alloc_data);
}
mutex_unlock(&(msm_audio_ion_data.list_mutex));
@ -535,6 +592,7 @@ static int msm_audio_ion_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
if (rc) {
pr_err("%s: failed to do smmu map, err = %d\n",
__func__, rc);
msm_audio_ion_unmap_kernel(dma_buf);
msm_audio_dma_buf_unmap(dma_buf, false);
goto err;
}