8 files changed, 39 insertions, 4 deletions

diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c
index 7d31d92f3..4565e8e71 100644
--- a/drivers/video/tegra/nvmap/nvmap.c
+++ b/drivers/video/tegra/nvmap/nvmap.c
@@ -60,6 +60,9 @@ void *__nvmap_kmap(struct nvmap_handle *h, unsigned int pagenum)
         if (!h)
                 return NULL;
 
+        if (!(h->heap_type & nvmap_dev->cpu_access_mask))
+                goto put_handle;
+
         nvmap_kmaps_inc(h);
         if (pagenum >= h->size >> PAGE_SHIFT)
                 goto out;
@@ -78,6 +81,7 @@ void *__nvmap_kmap(struct nvmap_handle *h, unsigned int pagenum)
         return (void *)kaddr;
 out:
         nvmap_kmaps_dec(h);
+put_handle:
         nvmap_handle_put(h);
         return NULL;
 }
@@ -90,7 +94,8 @@ void __nvmap_kunmap(struct nvmap_handle *h, unsigned int pagenum,
 
         if (!h ||
             WARN_ON(!virt_addr_valid(h)) ||
-            WARN_ON(!addr))
+            WARN_ON(!addr) ||
+            !(h->heap_type & nvmap_dev->cpu_access_mask))
                 return;
 
         if (WARN_ON(pagenum >= h->size >> PAGE_SHIFT))
@@ -131,6 +136,9 @@ void *__nvmap_mmap(struct nvmap_handle *h)
         if (!h)
                 return NULL;
 
+        if (!(h->heap_type & nvmap_dev->cpu_access_mask))
+                goto put_handle;
+
         if (h->vaddr)
                 return h->vaddr;
 
@@ -183,6 +191,7 @@ void *__nvmap_mmap(struct nvmap_handle *h)
         return h->vaddr;
 out:
         nvmap_kmaps_dec(h);
+put_handle:
         nvmap_handle_put(h);
         return NULL;
 }
@@ -191,7 +200,8 @@ void __nvmap_munmap(struct nvmap_handle *h, void *addr)
 {
         if (!h ||
             WARN_ON(!virt_addr_valid(h)) ||
-            WARN_ON(!addr))
+            WARN_ON(!addr) ||
+            !(h->heap_type & nvmap_dev->cpu_access_mask))
                 return;
 
         nvmap_handle_put(h);
diff --git a/drivers/video/tegra/nvmap/nvmap_alloc.c b/drivers/video/tegra/nvmap/nvmap_alloc.c
index 45241570d..2154bca21 100644
--- a/drivers/video/tegra/nvmap/nvmap_alloc.c
+++ b/drivers/video/tegra/nvmap/nvmap_alloc.c
@@ -306,7 +306,7 @@ int nvmap_alloc_handle(struct nvmap_client *client,
         h->userflags = flags;
         nr_page = ((h->size + PAGE_SIZE - 1) >> PAGE_SHIFT);
         /* Force mapping to uncached for VPR memory. */
-        if (heap_mask & NVMAP_HEAP_CARVEOUT_VPR)
+        if (heap_mask & (NVMAP_HEAP_CARVEOUT_VPR | ~nvmap_dev->cpu_access_mask))
                 h->flags = NVMAP_HANDLE_UNCACHEABLE;
         else
                 h->flags = (flags & NVMAP_HANDLE_CACHE_FLAG);
diff --git a/drivers/video/tegra/nvmap/nvmap_cache.c b/drivers/video/tegra/nvmap/nvmap_cache.c
index 7877b1b19..c2bf634c8 100644
--- a/drivers/video/tegra/nvmap/nvmap_cache.c
+++ b/drivers/video/tegra/nvmap/nvmap_cache.c
@@ -421,6 +421,11 @@ int __nvmap_do_cache_maint(struct nvmap_client *client,
         if (!h)
                 return -EFAULT;
 
+        if (!(h->heap_type & nvmap_dev->cpu_access_mask)) {
+                nvmap_handle_put(h);
+                return -EPERM;
+        }
+
         nvmap_kmaps_inc(h);
         if (op == NVMAP_CACHE_OP_INV)
                 op = NVMAP_CACHE_OP_WB_INV;
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c
index ce0f8dcfa..c22995d75 100644
--- a/drivers/video/tegra/nvmap/nvmap_dev.c
+++ b/drivers/video/tegra/nvmap/nvmap_dev.c
@@ -511,6 +511,11 @@ int __nvmap_map(struct nvmap_handle *h, struct vm_area_struct *vma)
         if (!h)
                 return -EINVAL;
 
+        if (!(h->heap_type & nvmap_dev->cpu_access_mask)) {
+                nvmap_handle_put(h);
+                return -EPERM;
+        }
+
         /*
          * Don't allow mmap on VPR memory as it would be mapped
          * as device memory. User space shouldn't be accessing
@@ -1693,6 +1698,7 @@ int __init nvmap_probe(struct platform_device *pdev)
                         nvmap_debug_root, &nvmap_max_handle_count);
 
         nvmap_dev->dynamic_dma_map_mask = ~0;
+        nvmap_dev->cpu_access_mask = ~0;
         for (i = 0; i < plat->nr_carveouts; i++)
                 (void)nvmap_create_carveout(&plat->carveouts[i]);
 
diff --git a/drivers/video/tegra/nvmap/nvmap_heap.c b/drivers/video/tegra/nvmap/nvmap_heap.c
index d5e9ce70a..cf1fcd764 100644
--- a/drivers/video/tegra/nvmap/nvmap_heap.c
+++ b/drivers/video/tegra/nvmap/nvmap_heap.c
@@ -377,7 +377,8 @@ struct nvmap_heap *nvmap_heap_create(struct device *parent,
         h->vm_id = co->vmid;
         INIT_LIST_HEAD(&h->all_list);
         mutex_init(&h->lock);
-        if (nvmap_cache_maint_phys_range(NVMAP_CACHE_OP_WB_INV,
+        if (!co->no_cpu_access &&
+                nvmap_cache_maint_phys_range(NVMAP_CACHE_OP_WB_INV,
                                 base, base + len, true, true)) {
                 dev_err(parent, "cache flush failed\n");
                 goto fail;
@@ -398,6 +399,9 @@ finish:
         if (co->disable_dynamic_dma_map)
                 nvmap_dev->dynamic_dma_map_mask &= ~co->usage_mask;
 
+        if (co->no_cpu_access)
+                nvmap_dev->cpu_access_mask &= ~co->usage_mask;
+
         dev_info(parent, "created heap %s base 0x%p size (%zuKiB)\n",
                 co->name, (void *)(uintptr_t)base, len/1024);
         return h;
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c
index 0c02f16fc..095554fa7 100644
--- a/drivers/video/tegra/nvmap/nvmap_ioctl.c
+++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c
@@ -403,6 +403,9 @@ static ssize_t rw_handle(struct nvmap_client *client, struct nvmap_handle *h,
         void *addr;
         int ret = 0;
 
+        if (!(h->heap_type & nvmap_dev->cpu_access_mask))
+                return -EPERM;
+
         if (!elem_size || !count)
                 return -EINVAL;
 
@@ -657,6 +660,11 @@ int nvmap_ioctl_cache_maint_list(struct file *filp, void __user *arg,
                         err = -EINVAL;
                         goto free_mem;
                 }
+                if (!(refs[i]->heap_type & nvmap_dev->cpu_access_mask)) {
+                        err = -EPERM;
+                        goto free_mem;
+                }
+
                 n_unmarshal_handles++;
         }
 
diff --git a/drivers/video/tegra/nvmap/nvmap_priv.h b/drivers/video/tegra/nvmap/nvmap_priv.h
index 5048f6aea..d31235fe8 100644
--- a/drivers/video/tegra/nvmap/nvmap_priv.h
+++ b/drivers/video/tegra/nvmap/nvmap_priv.h
@@ -237,6 +237,7 @@ struct nvmap_device {
         struct rb_root  tags;
         struct mutex    tags_lock;
         u32 dynamic_dma_map_mask;
+        u32 cpu_access_mask;
 };
 
 enum nvmap_stats_t {
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h
index d551f992d..764e03fe3 100644
--- a/include/linux/nvmap.h
+++ b/include/linux/nvmap.h
@@ -87,6 +87,7 @@ struct nvmap_platform_carveout {
         int can_alloc;
         bool enable_static_dma_map;
         bool disable_dynamic_dma_map;
+        bool no_cpu_access; /* carveout can't be accessed from cpu at all */
         bool init_done; /* FIXME: remove once all caveouts use reserved-memory */
 };