Merge tag 'optee-cleanup-for-v6.8' of https://git.linaro.org/people/jens.wiklander...

[linux-2.6-microblaze.git] / drivers / tee / optee / core.c

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 1eaa191..3aed554 100644 (file)
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -25,46 +25,46 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
                                                   size_t num_pages,
                                                   unsigned long start))
 {
-       unsigned int order = get_order(size);
-       struct page *page;
+       size_t nr_pages = roundup(size, PAGE_SIZE) / PAGE_SIZE;
+       struct page **pages;
+       unsigned int i;
        int rc = 0;
 
        /*
         * Ignore alignment since this is already going to be page aligned
         * and there's no need for any larger alignment.
         */
-       page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
-       if (!page)
+       shm->kaddr = alloc_pages_exact(nr_pages * PAGE_SIZE,
+                                      GFP_KERNEL | __GFP_ZERO);
+       if (!shm->kaddr)
                return -ENOMEM;
 
-       shm->kaddr = page_address(page);
-       shm->paddr = page_to_phys(page);
-       shm->size = PAGE_SIZE << order;
+       shm->paddr = virt_to_phys(shm->kaddr);
+       shm->size = nr_pages * PAGE_SIZE;
 
-       if (shm_register) {
-               unsigned int nr_pages = 1 << order, i;
-               struct page **pages;
+       pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
+       if (!pages) {
+               rc = -ENOMEM;
+               goto err;
+       }
 
-               pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
-               if (!pages) {
-                       rc = -ENOMEM;
-                       goto err;
-               }
+       for (i = 0; i < nr_pages; i++)
+               pages[i] = virt_to_page((u8 *)shm->kaddr + i * PAGE_SIZE);
 
-               for (i = 0; i < nr_pages; i++)
-                       pages[i] = page + i;
+       shm->pages = pages;
+       shm->num_pages = nr_pages;
 
+       if (shm_register) {
                rc = shm_register(shm->ctx, shm, pages, nr_pages,
                                  (unsigned long)shm->kaddr);
-               kfree(pages);
                if (rc)
                        goto err;
        }
 
        return 0;
-
 err:
-       free_pages((unsigned long)shm->kaddr, order);
+       free_pages_exact(shm->kaddr, shm->size);
+       shm->kaddr = NULL;
        return rc;
 }
 
@@ -74,8 +74,10 @@ void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
 {
        if (shm_unregister)
                shm_unregister(shm->ctx, shm);
-       free_pages((unsigned long)shm->kaddr, get_order(shm->size));
+       free_pages_exact(shm->kaddr, shm->size);
        shm->kaddr = NULL;
+       kfree(shm->pages);
+       shm->pages = NULL;
 }
 
 static void optee_bus_scan(struct work_struct *work)
@@ -123,7 +125,8 @@ int optee_open(struct tee_context *ctx, bool cap_memref_null)
 
 static void optee_release_helper(struct tee_context *ctx,
                                 int (*close_session)(struct tee_context *ctx,
-                                                     u32 session))
+                                                     u32 session,
+                                                     bool system_thread))
 {
        struct optee_context_data *ctxdata = ctx->data;
        struct optee_session *sess;
@@ -135,7 +138,7 @@ static void optee_release_helper(struct tee_context *ctx,
        list_for_each_entry_safe(sess, sess_tmp, &ctxdata->sess_list,
                                 list_node) {
                list_del(&sess->list_node);
-               close_session(ctx, sess->session_id);
+               close_session(ctx, sess->session_id, sess->use_sys_thread);
                kfree(sess);
        }
        kfree(ctxdata);