leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for TEE subsystem

Browse Source 
A fix for the recently merged commit ed8faf6c8f ("optee: add
 OPTEE_SMC_CALL_WITH_RPC_ARG and OPTEE_SMC_CALL_WITH_REGD_ARG").
 Two small fixes in comment, repeated words etc.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmLIMsIaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJeh0RAAlsgEM+Mb1TZKUnfdY+Yt
 NTgPJHLBo0Rv2yBIpcAg0oFw0Jg2eIc6isg6q6fPhSe6nBie1x6FaxhlBwRf7Saj
 zvn/P+hADYH0IZFATBs+XtrW8REAfCBqcoA8X6E/VZdD7nUzoOg9shanhygIQFMl
 HThStrt4A9pPXMF5RIG03VM2Ca6Mb4im3m4ox8av2cG1apBzNAXTwU4VwXyGMdkv
 YgJQrZRiM6UCKzGKCME9Lb9aNaPHr+IA4RfsxynKvkFiar7wju25RMPAPSWCYZFU
 rvh9ibhzz4yqLwDYUPitDwZHp9U+pmEmcTd+uDBVGaK5PFSZhQsGTupoJ4oeYBSE
 E5lXuriBw2LTH+8bVkjw6sa9+cQ4G+19JhJbIxJ+52Ex7gAVe5ajF5S42uHI2Rof
 BEJbYNKecxWXk5J757XHgQJGhgW6Vls4JpvfgmC83ueMNd5Es7s1SnLtDizXCCiU
 oiOZWG3QqHxcJ2TtHos9zZ44xqwgfuXvp0j5P8emnrxFEVMbCXymWl/82Xq8NIAo
 zmphkefccBcww2IMtOb49iY68mUpI1rEnHRtDyKRHa56igX6/2KQlWKuRXMRegBF
 12bkGBr1HwxooiyI7qBB3wsDRd5bO0idLqxAf3z0WLgLqX9Mdl6h8pwEJFPOpu7p
 nzXQyt/7Z915gG71B4oY8n0=
 =+wwB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLIOE8ACgkQmmx57+YA
 GNmoEw//UKySpfZPPtUphdoPGXqP0bbBljcSzfBCkF27XjO1jIAWAWfv3MOLC2kq
 DOy+YhV7+gbT1UyMcsToBwKiEQKEhudcOYvGFzgKNTG1Lym8x/lkKbj/jPd0SU0v
 wUquoPL4IAz9xFo4Cj5kTv2N9MpP2oucFPoetNhKT0sfPDN+oL5JKLsuiU+ZCVOl
 JEq40+ZYsc1ESg71P44WmaVxAzg4nDvUhYLr1OMXvqEhpICFGetngXV8Kk0e0COP
 K01/1b53zcckbE8icZyKqxIg316Pk6NpRQPZPJvo81BL01Gm0oBYVqMerasVISbB
 9NgwoRm+4ZZbt44gcIxfxSeXaOrk8FdsjXxX7es57q5KW7/wSEn2SU4GUqjmj9Yf
 8d+feygv5tJbw1zPxhURekGzRRb7kF9ccndgVJKPkB9pEB6OO57gyYtqxm3pwj3H
 LiUNlle6X9NtAUjsXh44bBZIvNo/AvIM/uZeDqphQLGUyq7FSaQJT7pKQ67tDheP
 ABO68s9b5mz9GV8fVyb/s8hhrfTnIryu9T+zBq/TCYYSHtlhdJZN4Y4DFTrUD57+
 ForXwUGvqy62R+K2yJ2RD4951qktypyEBdDqNvmaRz64N+IUSWgYnJu2ARkG2AKr
 toLc9RLLXCUt++mTk2RRZiHOzQ73JHOeKEQXYZ7mOuY10l8v7x8=
 =L85/
 -----END PGP SIGNATURE-----

Merge tag 'tee-fixes-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fixes for TEE subsystem

A fix for the recently merged commit ed8faf6c8f ("optee: add
OPTEE_SMC_CALL_WITH_RPC_ARG and OPTEE_SMC_CALL_WITH_REGD_ARG").
Two small fixes in comment, repeated words etc.

* tag 'tee-fixes-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: tee_get_drvdata(): fix description of return value
  optee: Remove duplicate 'of' in two places.
  optee: smc_abi.c: fix wrong pointer passed to IS_ERR/PTR_ERR()

Link: https://lore.kernel.org/r/20220708134607.GA901814@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-07-08 15:59:42 +02:00
commit 2dc94f0612
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tee/optee/optee_smc.h
View File

@ -189,7 +189,7 @@ struct optee_smc_call_get_os_revision_result {
* Have config return register usage: * Have config return register usage:
* a0 OPTEE_SMC_RETURN_OK * a0 OPTEE_SMC_RETURN_OK
* a1 Physical address of start of SHM * a1 Physical address of start of SHM
* a2 Size of of SHM * a2 Size of SHM
* a3 Cache settings of memory, as defined by the * a3 Cache settings of memory, as defined by the
* OPTEE_SMC_SHM_* values above * OPTEE_SMC_SHM_* values above
* a4-7 Preserved * a4-7 Preserved

4
drivers/tee/optee/smc_abi.c
View File

@ -884,8 +884,8 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx,
rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params); rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
rpc_arg = tee_shm_get_va(shm, offs + rpc_arg_offs); rpc_arg = tee_shm_get_va(shm, offs + rpc_arg_offs);
if (IS_ERR(arg)) if (IS_ERR(rpc_arg))
return PTR_ERR(arg); return PTR_ERR(rpc_arg);
} }
if (rpc_arg && tee_shm_is_dynamic(shm)) { if (rpc_arg && tee_shm_is_dynamic(shm)) {

2
drivers/tee/tee_core.c
View File

@ -1073,7 +1073,7 @@ EXPORT_SYMBOL_GPL(tee_device_unregister);
/** /**
* tee_get_drvdata() - Return driver_data pointer * tee_get_drvdata() - Return driver_data pointer
* @teedev: Device containing the driver_data pointer * @teedev: Device containing the driver_data pointer
* @returns the driver_data pointer supplied to tee_register(). * @returns the driver_data pointer supplied to tee_device_alloc().
*/ */
void *tee_get_drvdata(struct tee_device *teedev) void *tee_get_drvdata(struct tee_device *teedev)
{ {