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: switch to qcom_scm_assign_mem from hyp_assign_phys"

Browse Source
This commit is contained in:
qctecmdr
2023-01-24 15:43:49 -08:00
committed by Gerrit - the friendly Code Review server
parent 121ee6c421 4f59f5ce02
commit a63269b7e0
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hw_fence/src/hw_fence_drv_utils.c
View File

@@ -8,6 +8,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gunyah/gh_rm_drv.h> #include <linux/gunyah/gh_rm_drv.h>
#include <linux/gunyah/gh_dbl.h> #include <linux/gunyah/gh_dbl.h>
#include <linux/qcom_scm.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"
@@ -339,18 +340,19 @@ int hw_fence_utils_init_virq(struct hw_fence_driver_data *drv_data)
static int hw_fence_gunyah_share_mem(struct hw_fence_driver_data *drv_data, static int hw_fence_gunyah_share_mem(struct hw_fence_driver_data *drv_data,
gh_vmid_t self, gh_vmid_t peer) gh_vmid_t self, gh_vmid_t peer)
{ {
u32 src_vmlist[1] = {self}; struct qcom_scm_vmperm src_vmlist[] = {{self, PERM_READ | PERM_WRITE | PERM_EXEC}};
int src_perms[2] = {PERM_READ | PERM_WRITE | PERM_EXEC}; struct qcom_scm_vmperm dst_vmlist[] = {{self, PERM_READ | PERM_WRITE},
int dst_vmlist[2] = {self, peer}; {peer, PERM_READ | PERM_WRITE}};
int dst_perms[2] = {PERM_READ | PERM_WRITE, PERM_READ | PERM_WRITE}; int srcvmids = BIT(src_vmlist[0].vmid);
int dstvmids = BIT(dst_vmlist[0].vmid) | BIT(dst_vmlist[1].vmid);
struct gh_acl_desc *acl; struct gh_acl_desc *acl;
struct gh_sgl_desc *sgl; struct gh_sgl_desc *sgl;
int ret; int ret;
ret = hyp_assign_phys(drv_data->res.start, resource_size(&drv_data->res), ret = qcom_scm_assign_mem(drv_data->res.start, resource_size(&drv_data->res), &srcvmids,
src_vmlist, 1, dst_vmlist, dst_perms, 2); dst_vmlist, ARRAY_SIZE(dst_vmlist));
if (ret) { if (ret) {
HWFNC_ERR("%s: hyp_assign_phys failed addr=%x size=%u err=%d\n", HWFNC_ERR("%s: qcom_scm_assign_mem failed addr=%x size=%u err=%d\n",
__func__, drv_data->res.start, drv_data->size, ret); __func__, drv_data->res.start, drv_data->size, ret);
return ret; return ret;
} }
@@ -379,9 +381,8 @@ static int hw_fence_gunyah_share_mem(struct hw_fence_driver_data *drv_data,
HWFNC_ERR("%s: gh_rm_mem_share failed addr=%x size=%u err=%d\n", HWFNC_ERR("%s: gh_rm_mem_share failed addr=%x size=%u err=%d\n",
__func__, drv_data->res.start, drv_data->size, ret); __func__, drv_data->res.start, drv_data->size, ret);
/* Attempt to give resource back to HLOS */ /* Attempt to give resource back to HLOS */
hyp_assign_phys(drv_data->res.start, resource_size(&drv_data->res), qcom_scm_assign_mem(drv_data->res.start, resource_size(&drv_data->res),
dst_vmlist, 2, &dstvmids, src_vmlist, ARRAY_SIZE(src_vmlist));
src_vmlist, src_perms, 1);
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
} }