From: Jens Wiklander <jens.wiklander@linaro.org>
To: tee-dev@lists.linaro.org, linux-kernel@vger.kernel.org
Cc: Jerome Forissier <jerome@forissier.org>,
Sumit Garg <sumit.garg@linaro.org>,
Etienne Carriere <etienne.carriere@linaro.org>,
Rijo Thomas <Rijo-john.Thomas@amd.com>,
Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>,
Jens Wiklander <jens.wiklander@linaro.org>
Subject: [PATCH 1/5] tee: remove linked list of struct tee_shm
Date: Thu, 9 Jan 2020 13:36:47 +0100 [thread overview]
Message-ID: <20200109123651.18520-2-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20200109123651.18520-1-jens.wiklander@linaro.org>
Removes list_shm from struct tee_context since the linked list isn't used
any longer.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 1 -
drivers/tee/tee_shm.c | 12 +-----------
include/linux/tee_drv.h | 3 ---
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 37d22e39fd8d..6aec502c495c 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -44,7 +44,6 @@ static struct tee_context *teedev_open(struct tee_device *teedev)
kref_init(&ctx->refcount);
ctx->teedev = teedev;
- INIT_LIST_HEAD(&ctx->list_shm);
rc = teedev->desc->ops->open(ctx);
if (rc)
goto err;
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 09ddcd06c715..6cabb834db7d 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -17,8 +17,6 @@ static void tee_shm_release(struct tee_shm *shm)
mutex_lock(&teedev->mutex);
idr_remove(&teedev->idr, shm->id);
- if (shm->ctx)
- list_del(&shm->link);
mutex_unlock(&teedev->mutex);
if (shm->flags & TEE_SHM_POOL) {
@@ -174,12 +172,8 @@ static struct tee_shm *__tee_shm_alloc(struct tee_context *ctx,
}
}
- if (ctx) {
+ if (ctx)
teedev_ctx_get(ctx);
- mutex_lock(&teedev->mutex);
- list_add_tail(&shm->link, &ctx->list_shm);
- mutex_unlock(&teedev->mutex);
- }
return shm;
err_rem:
@@ -307,10 +301,6 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
}
}
- mutex_lock(&teedev->mutex);
- list_add_tail(&shm->link, &ctx->list_shm);
- mutex_unlock(&teedev->mutex);
-
return shm;
err:
if (shm) {
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index 7a03f68fb982..cbddb883a7f8 100644
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -49,7 +49,6 @@ struct tee_shm_pool;
*/
struct tee_context {
struct tee_device *teedev;
- struct list_head list_shm;
void *data;
struct kref refcount;
bool releasing;
@@ -170,7 +169,6 @@ void tee_device_unregister(struct tee_device *teedev);
* struct tee_shm - shared memory object
* @teedev: device used to allocate the object
* @ctx: context using the object, if NULL the context is gone
- * @link link element
* @paddr: physical address of the shared memory
* @kaddr: virtual address of the shared memory
* @size: size of shared memory
@@ -187,7 +185,6 @@ void tee_device_unregister(struct tee_device *teedev);
struct tee_shm {
struct tee_device *teedev;
struct tee_context *ctx;
- struct list_head link;
phys_addr_t paddr;
void *kaddr;
size_t size;
--
2.17.1
next prev parent reply other threads:[~2020-01-09 12:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 12:36 [PATCH 0/5] tee: shared memory cleanup Jens Wiklander
2020-01-09 12:36 ` Jens Wiklander [this message]
2020-01-09 12:36 ` [PATCH 2/5] tee: remove unused tee_shm_priv_alloc() Jens Wiklander
2020-01-09 12:36 ` [PATCH 3/5] tee: don't assign shm id for private shms Jens Wiklander
2020-01-09 12:36 ` [PATCH 4/5] tee: remove redundant teedev in struct tee_shm Jens Wiklander
2020-01-09 12:36 ` [PATCH 5/5] tee: tee_shm_op_mmap(): use TEE_SHM_USER_MAPPED Jens Wiklander
2020-01-23 10:21 ` [PATCH 0/5] tee: shared memory cleanup Jens Wiklander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200109123651.18520-2-jens.wiklander@linaro.org \
--to=jens.wiklander@linaro.org \
--cc=Devaraj.Rangasamy@amd.com \
--cc=Rijo-john.Thomas@amd.com \
--cc=etienne.carriere@linaro.org \
--cc=jerome@forissier.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sumit.garg@linaro.org \
--cc=tee-dev@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®