summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-21 20:15:19 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-21 20:15:19 -0700
commit150e8fab6800a1777b8415144cff1859d39f5994 (patch)
tree1e56798cf75974793ff4b8aa13458b4df234d513 /drivers/char
parent44f9f08a04894f7743372ed14359c6504d6f65a1 (diff)
parent8048977b4104cd3eee14b1b90d7ef5b6fea0bbfc (diff)
Merge "msm: ADSPRPC: Add exec permission for hyp_assign_phys"
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/adsprpc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 7a4b52913a19..8017961783f7 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -320,6 +320,7 @@ static struct fastrpc_channel_ctx gcinfo[NUM_CHANNELS] = {
.channel = SMD_APPS_DSPS,
.link.link_info.edge = "dsps",
.link.link_info.transport = "smem",
+ .vmid = VMID_SSC_Q6,
},
{
.name = "cdsprpc-smd",
@@ -700,7 +701,7 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, unsigned attr,
if (vmid) {
int srcVM[1] = {VMID_HLOS};
int destVM[2] = {VMID_HLOS, vmid};
- int destVMperm[2] = {PERM_READ | PERM_WRITE,
+ int destVMperm[2] = {PERM_READ | PERM_WRITE | PERM_EXEC,
PERM_READ | PERM_WRITE | PERM_EXEC};
VERIFY(err, !hyp_assign_phys(map->phys,
@@ -772,7 +773,7 @@ static int fastrpc_buf_alloc(struct fastrpc_file *fl, ssize_t size,
if (vmid) {
int srcVM[1] = {VMID_HLOS};
int destVM[2] = {VMID_HLOS, vmid};
- int destVMperm[2] = {PERM_READ | PERM_WRITE,
+ int destVMperm[2] = {PERM_READ | PERM_WRITE | PERM_EXEC,
PERM_READ | PERM_WRITE | PERM_EXEC};
VERIFY(err, !hyp_assign_phys(buf->phys, buf_page_size(size),