On 8/31/20 8:23 AM, Jorge Ramirez-Ortiz wrote:
> When the optee driver is compiled into the kernel while the i2c core
> is configured as a module, the i2c symbols are not available.
>
> This commit addresses the situation by disabling the i2c support for
> this use case while allowing it in all other scenarios:
>
> i2c=y, optee=y
> i2c=m, optee=m
> i2c=y, optee=m
> i2c=m, optee=y (not supported)
>
> Reported-by: kernel test robot <l...@intel.com>
> Signed-off-by: Jorge Ramirez-Ortiz <jo...@foundries.io>
> ---
>
> This patch applies on top of
>
> https://git.linaro.org/people/jens.wiklander/linux-tee.git/tag/?h=optee-i2c-for-v5.10
>
> drivers/tee/optee/rpc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
> index 64a206c56264..96e91d5f0a86 100644
> --- a/drivers/tee/optee/rpc.c
> +++ b/drivers/tee/optee/rpc.c
> @@ -51,6 +51,7 @@ static void handle_rpc_func_cmd_get_time(struct
> optee_msg_arg *arg)
> }
>
> #if IS_ENABLED(CONFIG_I2C)
> +#if !defined(CONFIG_I2C_MODULE) || defined(CONFIG_OPTEE_MODULE)
Looks like
#if IS_REACHABLE(CONFIG_I2C)
should work here.
> static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
> struct optee_msg_arg *arg)
> {
> @@ -140,6 +141,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct
> tee_context *ctx,
> arg->ret = TEEC_ERROR_NOT_SUPPORTED;
> }
> #endif
> +#endif
>
> static struct wq_entry *wq_entry_get(struct optee_wait_queue *wq, u32 key)
> {
>
--
~Randy
