Unverified Commit 2dc94f06 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tee-fixes-for-v5.19' of... 

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 ed8faf6c ("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: default avatarArnd Bergmann <arnd@arndb.de>
parents a902fa8e e5ce073c

drivers/tee/optee/optee_smc.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct optee_smc_call_get_os_revision_result { 
 * Have config return register usage:

 * a0	OPTEE_SMC_RETURN_OK

 * 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

 *	OPTEE_SMC_SHM_* values above

 * a4-7	Preserved

drivers/tee/optee/smc_abi.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = tee_shm_get_va(shm, offs + rpc_arg_offs);

		if (IS_ERR(arg))

			return PTR_ERR(arg);

		if (IS_ERR(rpc_arg))

			return PTR_ERR(rpc_arg);

	}



	if  (rpc_arg && tee_shm_is_dynamic(shm)) {

drivers/tee/tee_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ EXPORT_SYMBOL_GPL(tee_device_unregister); 
/**

 * tee_get_drvdata() - Return 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)

{