2021-06-09 17:16:21

by Jens Wiklander

[permalink] [raw]
Subject: [PATCH 5/7] tpm_ftpm_tee: use tee_shm_alloc_kernel_buf()

Uses the new simplified tee_shm_alloc_kernel_buf() function instead of
the old deprecated tee_shm_alloc() function which required specific
TEE_SHM-flags.

Signed-off-by: Jens Wiklander <[email protected]>
---
drivers/char/tpm/tpm_ftpm_tee.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c
index 2ccdf8ac6994..6e3235565a4d 100644
--- a/drivers/char/tpm/tpm_ftpm_tee.c
+++ b/drivers/char/tpm/tpm_ftpm_tee.c
@@ -254,11 +254,11 @@ static int ftpm_tee_probe(struct device *dev)
pvt_data->session = sess_arg.session;

/* Allocate dynamic shared memory with fTPM TA */
- pvt_data->shm = tee_shm_alloc(pvt_data->ctx,
- MAX_COMMAND_SIZE + MAX_RESPONSE_SIZE,
- TEE_SHM_MAPPED | TEE_SHM_DMA_BUF);
+ pvt_data->shm = tee_shm_alloc_kernel_buf(pvt_data->ctx,
+ MAX_COMMAND_SIZE +
+ MAX_RESPONSE_SIZE);
if (IS_ERR(pvt_data->shm)) {
- dev_err(dev, "%s: tee_shm_alloc failed\n", __func__);
+ dev_err(dev, "%s: tee_shm_alloc_kernel_buf failed\n", __func__);
rc = -ENOMEM;
goto out_shm_alloc;
}
--
2.31.1


2021-06-09 17:52:37

by Tyler Hicks

[permalink] [raw]
Subject: Re: [PATCH 5/7] tpm_ftpm_tee: use tee_shm_alloc_kernel_buf()

On 2021-06-09 12:23:22, Jens Wiklander wrote:
> Uses the new simplified tee_shm_alloc_kernel_buf() function instead of
> the old deprecated tee_shm_alloc() function which required specific
> TEE_SHM-flags.
>
> Signed-off-by: Jens Wiklander <[email protected]>

Reviewed-by: Tyler Hicks <[email protected]>

Tyler

> ---
> drivers/char/tpm/tpm_ftpm_tee.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c
> index 2ccdf8ac6994..6e3235565a4d 100644
> --- a/drivers/char/tpm/tpm_ftpm_tee.c
> +++ b/drivers/char/tpm/tpm_ftpm_tee.c
> @@ -254,11 +254,11 @@ static int ftpm_tee_probe(struct device *dev)
> pvt_data->session = sess_arg.session;
>
> /* Allocate dynamic shared memory with fTPM TA */
> - pvt_data->shm = tee_shm_alloc(pvt_data->ctx,
> - MAX_COMMAND_SIZE + MAX_RESPONSE_SIZE,
> - TEE_SHM_MAPPED | TEE_SHM_DMA_BUF);
> + pvt_data->shm = tee_shm_alloc_kernel_buf(pvt_data->ctx,
> + MAX_COMMAND_SIZE +
> + MAX_RESPONSE_SIZE);
> if (IS_ERR(pvt_data->shm)) {
> - dev_err(dev, "%s: tee_shm_alloc failed\n", __func__);
> + dev_err(dev, "%s: tee_shm_alloc_kernel_buf failed\n", __func__);
> rc = -ENOMEM;
> goto out_shm_alloc;
> }
> --
> 2.31.1
>