linux.git/drivers/tee, branch v5.12.5

tee: optee: do not check memref size on return from Secure World

2021-05-12T06:39:36+00:00

[ Upstream commit c650b8dc7a7910eb25af0aac1720f778b29e679d ]

When Secure World returns, it may have changed the size attribute of the
memory references passed as [in/out] parameters. The GlobalPlatform TEE
Internal Core API specification does not restrict the values that this
size can take. In particular, Secure World may increase the value to be
larger than the size of the input buffer to indicate that it needs more.

Therefore, the size check in optee_from_msg_param() is incorrect and
needs to be removed. This fixes a number of failed test cases in the
GlobalPlatform TEE Initial Configuratiom Test Suite v2_0_0_0-2017_06_09
when OP-TEE is compiled without dynamic shared memory support
(CFG_CORE_DYN_SHM=n).

Reviewed-by: Sumit Garg 
Suggested-by: Jens Wiklander 
Signed-off-by: Jerome Forissier 
Signed-off-by: Jens Wiklander 
Signed-off-by: Sasha Levin

module: remove never implemented MODULE_SUPPORTED_DEVICE

2021-03-17T20:16:18+00:00

MODULE_SUPPORTED_DEVICE was added in pre-git era and never was
implemented. We can safely remove it, because the kernel has grown
to have many more reliable mechanisms to determine if device is
supported or not.

Signed-off-by: Leon Romanovsky 
Signed-off-by: Linus Torvalds

Merge tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

2021-02-09T15:10:49+00:00

Simplify i2c acess in OP-TEE driver

* tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: simplify i2c access

Link: https://lore.kernel.org/soc/20210208125853.GA288348%40jade
Signed-off-by: Arnd Bergmann

optee: simplify i2c access

2021-02-08T12:42:31+00:00

Storing a bogus i2c_client structure on the stack adds overhead and
causes a compile-time warning:

drivers/tee/optee/rpc.c:493:6: error: stack frame size of 1056 bytes in function 'optee_handle_rpc' [-Werror,-Wframe-larger-than=]
void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param,

Change the implementation of handle_rpc_func_cmd_i2c_transfer() to
open-code the i2c_transfer() call, which makes it easier to read
and avoids the warning.

Fixes: c05210ab9757 ("drivers: optee: allow op-tee to access devices on the i2c bus")
Tested-by: Jorge Ramirez-Ortiz 
Signed-off-by: Arnd Bergmann 
Signed-off-by: Jens Wiklander

Merge tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/drivers

2021-02-03T12:24:57+00:00

Remove unnecessary need_resched() before cond_resched()

* tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
  tee: optee: remove need_resched() before cond_resched()
  tee: optee: replace might_sleep with cond_resched

Link: https://lore.kernel.org/r/20210203120953.GB3624453@jade
Signed-off-by: Arnd Bergmann

tee: optee: remove need_resched() before cond_resched()

2021-02-03T07:11:11+00:00

Testing need_resched() before cond_resched() is not needed as an
equivalent test is done internally in cond_resched(). So drop the
need_resched() test.

Fixes: dcb3b06d9c34 ("tee: optee: replace might_sleep with cond_resched")
Reviewed-by: Rouven Czerwinski 
Tested-by: Rouven Czerwinski 
Tested-by: Sumit Garg 
Acked-by: Arnd Bergmann 
Signed-off-by: Jens Wiklander

optee: sync OP-TEE headers

2021-02-02T13:50:41+00:00

Pulls in updates in the internal headers from OP-TEE OS [1]. A few
defines has been shortened, hence the changes in rpc.c. Defines not used
by the driver in tee_rpc_cmd.h has been filtered out.

Note that this does not change the ABI.

Link: [1] https://github.com/OP-TEE/optee_os
Reviewed-by: Sumit Garg 
Signed-off-by: Jens Wiklander

tee: optee: fix 'physical' typos

2021-02-02T13:50:28+00:00

Fix misspellings of "physical".

Signed-off-by: Bjorn Helgaas 
Signed-off-by: Jens Wiklander

drivers: optee: use flexible-array member instead of zero-length array

2021-02-02T13:50:21+00:00

Use flexible-array member introduced in C99 instead of zero-length
array. Most of zero-length array was already taken care in previous
patch [1]. Now modified few more cases which were not handled earlier.

[1]. https://patchwork.kernel.org/patch/11394197/

Signed-off-by: Tian Tao 
Signed-off-by: Jens Wiklander

tee: optee: replace might_sleep with cond_resched

2021-01-21T09:36:48+00:00

might_sleep() is a debugging aid and triggers rescheduling only for
certain kernel configurations. Replace with an explicit check and
reschedule to work for all kernel configurations. Fixes the following
trace:

  [  572.945146] rcu: INFO: rcu_sched self-detected stall on CPU
  [  572.949275] rcu:     0-....: (2099 ticks this GP) idle=572/1/0x40000002 softirq=7412/7412 fqs=974
  [  572.957964]  (t=2100 jiffies g=10393 q=21)
  [  572.962054] NMI backtrace for cpu 0
  [  572.965540] CPU: 0 PID: 165 Comm: xtest Not tainted 5.8.7 #1
  [  572.971188] Hardware name: STM32 (Device Tree Support)
  [  572.976354] [] (unwind_backtrace) from [] (show_stack+0x10/0x14)
  [  572.984080] [] (show_stack) from [] (dump_stack+0xc4/0xd8)
  [  572.991300] [] (dump_stack) from [] (nmi_cpu_backtrace+0x90/0xc4)
  [  572.999130] [] (nmi_cpu_backtrace) from [] (nmi_trigger_cpumask_backtrace+0xec/0x130)
  [  573.008706] [] (nmi_trigger_cpumask_backtrace) from [] (rcu_dump_cpu_stacks+0xe8/0x110)
  [  573.018453] [] (rcu_dump_cpu_stacks) from [] (rcu_sched_clock_irq+0x7fc/0xa88)
  [  573.027416] [] (rcu_sched_clock_irq) from [] (update_process_times+0x30/0x8c)
  [  573.036291] [] (update_process_times) from [] (tick_sched_timer+0x4c/0xa8)
  [  573.044905] [] (tick_sched_timer) from [] (__hrtimer_run_queues+0x174/0x358)
  [  573.053696] [] (__hrtimer_run_queues) from [] (hrtimer_interrupt+0x118/0x2bc)
  [  573.062573] [] (hrtimer_interrupt) from [] (arch_timer_handler_virt+0x28/0x30)
  [  573.071536] [] (arch_timer_handler_virt) from [] (handle_percpu_devid_irq+0x8c/0x240)
  [  573.081109] [] (handle_percpu_devid_irq) from [] (generic_handle_irq+0x34/0x44)
  [  573.090156] [] (generic_handle_irq) from [] (__handle_domain_irq+0x5c/0xb0)
  [  573.098857] [] (__handle_domain_irq) from [] (gic_handle_irq+0x4c/0x90)
  [  573.107209] [] (gic_handle_irq) from [] (__irq_svc+0x6c/0x90)
  [  573.114682] Exception stack(0xd90dfcf8 to 0xd90dfd40)
  [  573.119732] fce0:                                                       ffff0004 00000000
  [  573.127917] fd00: 00000000 00000000 00000000 00000000 00000000 00000000 d93493cc ffff0000
  [  573.136098] fd20: d2bc39c0 be926998 d90dfd58 d90dfd48 c09f3384 c01151f0 400d0013 ffffffff
  [  573.144281] [] (__irq_svc) from [] (__arm_smccc_smc+0x10/0x20)
  [  573.151854] [] (__arm_smccc_smc) from [] (optee_smccc_smc+0x3c/0x44)
  [  573.159948] [] (optee_smccc_smc) from [] (optee_do_call_with_arg+0xb8/0x154)
  [  573.168735] [] (optee_do_call_with_arg) from [] (optee_invoke_func+0x110/0x190)
  [  573.177786] [] (optee_invoke_func) from [] (tee_ioctl+0x10b8/0x11c0)
  [  573.185879] [] (tee_ioctl) from [] (ksys_ioctl+0xe0/0xa4c)
  [  573.193101] [] (ksys_ioctl) from [] (ret_fast_syscall+0x0/0x54)
  [  573.200750] Exception stack(0xd90dffa8 to 0xd90dfff0)
  [  573.205803] ffa0:                   be926bf4 be926a78 00000003 8010a403 be926908 004e3cf8
  [  573.213987] ffc0: be926bf4 be926a78 00000000 00000036 be926908 be926918 be9269b0 bffdf0f8
  [  573.222162] ffe0: b6d76fb0 be9268fc b6d66621 b6c7e0d8

seen on STM32 DK2 with CONFIG_PREEMPT_NONE.

Fixes: 9f02b8f61f29 ("tee: optee: add might_sleep for RPC requests")
Signed-off-by: Rouven Czerwinski 
Tested-by: Sumit Garg 
[jw: added fixes tag + small adjustments in the code]
Signed-off-by: Jens Wiklander