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

Merge "mm-drivers: hw_fence: avoid mem share from rm callback" into display-kernel.lnx.1.0

Browse Source
This commit is contained in:
Linux Build Service Account
2023-04-04 22:11:39 -07:00
committed by Gerrit - the friendly Code Review server
parent cda6ac87d1 b39fb22f2d
commit f47b39d527
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hw_fence/src/hw_fence_drv_utils.c
View File

@@ -10,6 +10,7 @@
#include <linux/gunyah/gh_dbl.h> #include <linux/gunyah/gh_dbl.h>
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/gh_cpusys_vm_mem_access.h>
#include <soc/qcom/secure_buffer.h> #include <soc/qcom/secure_buffer.h>
#include "hw_fence_drv_priv.h" #include "hw_fence_drv_priv.h"
@@ -346,8 +347,10 @@ static int hw_fence_rm_cb(struct notifier_block *nb, unsigned long cmd, void *da
{ {
struct gh_rm_notif_vm_status_payload *vm_status_payload; struct gh_rm_notif_vm_status_payload *vm_status_payload;
struct hw_fence_driver_data *drv_data; struct hw_fence_driver_data *drv_data;
struct resource res;
gh_vmid_t peer_vmid; gh_vmid_t peer_vmid;
gh_vmid_t self_vmid; gh_vmid_t self_vmid;
int ret;
drv_data = container_of(nb, struct hw_fence_driver_data, rm_nb); drv_data = container_of(nb, struct hw_fence_driver_data, rm_nb);
@@ -380,11 +383,25 @@ static int hw_fence_rm_cb(struct notifier_block *nb, unsigned long cmd, void *da
switch (vm_status_payload->vm_status) { switch (vm_status_payload->vm_status) {
case GH_RM_VM_STATUS_READY: case GH_RM_VM_STATUS_READY:
HWFNC_DBG_INIT("init mem\n"); ret = gh_cpusys_vm_get_share_mem_info(&res);
if (hw_fence_gunyah_share_mem(drv_data, self_vmid, peer_vmid)) if (ret) {
HWFNC_ERR("failed to share memory\n"); HWFNC_DBG_INIT("mem not shared ret:%d, attempt share\n", ret);
else if (hw_fence_gunyah_share_mem(drv_data, self_vmid, peer_vmid))
drv_data->vm_ready = true; HWFNC_ERR("failed to share memory\n");
else
drv_data->vm_ready = true;
} else {
if (drv_data->res.start == res.start &&
resource_size(&drv_data->res) == resource_size(&res)) {
drv_data->vm_ready = true;
HWFNC_DBG_INIT("mem_ready: add:0x%x size:%d ret:%d\n", res.start,
resource_size(&res), ret);
} else {
HWFNC_ERR("mem-shared mismatch:[0x%x,%d] expected:[0x%x,%d]\n",
res.start, resource_size(&res), drv_data->res.start,
resource_size(&drv_data->res));
}
}
break; break;
case GH_RM_VM_STATUS_RESET: case GH_RM_VM_STATUS_RESET:
HWFNC_DBG_INIT("reset\n"); HWFNC_DBG_INIT("reset\n");