Subject: [PATCHv2] drivers: optee: fix i2c build issue

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 <[email protected]>
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
---
v2: uses IS_REACHABLE instead of macro combination

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, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
index 64a206c56264..1e3614e4798f 100644
--- a/drivers/tee/optee/rpc.c
+++ b/drivers/tee/optee/rpc.c
@@ -50,7 +50,7 @@ static void handle_rpc_func_cmd_get_time(struct optee_msg_arg *arg)
arg->ret = TEEC_ERROR_BAD_PARAMETERS;
}

-#if IS_ENABLED(CONFIG_I2C)
+#if IS_REACHABLE(CONFIG_I2C)
static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
struct optee_msg_arg *arg)
{
--
2.17.1


2020-09-01 10:06:12

by Jens Wiklander

[permalink] [raw]
Subject: Re: [PATCHv2] drivers: optee: fix i2c build issue

On Mon, Aug 31, 2020 at 06:11:02PM +0200, 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 <[email protected]>
> Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
> ---
> v2: uses IS_REACHABLE instead of macro combination
>
> 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, 1 insertion(+), 1 deletion(-)
>

Thanks for the prompt fix, I'm picking this up.

Cheers,
Jens