2023-11-02 07:32:07

by Sumit Garg

[permalink] [raw]
Subject: [PATCH v4 0/2] tee: optee: Fixes for supplicant dependent enumeration

Currently supplicant dependent optee device enumeration only registers
devices whenever tee-supplicant is invoked for the first time. But it
forgets to remove devices when tee-supplicant daemon stops running and
closes its context gracefully. This leads to following error for fTPM
driver during reboot/shutdown:

[ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024

Fix this by adding an attribute for supplicant dependent devices so that
the user-space service can detect and detach supplicant devices before
closing the supplicant:

$ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
then echo $(basename "$dev") > $dev/driver/unbind; fi done

While at it use the global system workqueue for OP-TEE bus scanning work
rather than our own custom one.

Changes in v4:
- Changing the device name would be an ABI break, rather switch to
additional device attribute: "need_supplicant" to distinguish for ABI
compatibility.
- Dropped tested-by for patch #1, I would encourage folks to retest
this.

Changes in v3:

- Split patch into 2 separate ones, one for supplicant fix and other for
the workqueue.

Changes in v2:

- Use device names to separate out tee-supplicant dependent devices via
this patch.
- Since user-space service is aware about tee-supplicant lifespan, so
allow the user-space service to unbind tee-supplicant dependent
devices before killing the supplicant. Following command has to be
added to the tee-supplicant service file.

$ for dev in /sys/bus/tee/devices/*; do if [[ "$dev" == *"optee-ta-supp-"* ]]; \
then echo $(basename "$dev") > $dev/driver/unbind; fi done

Sumit Garg (2):
tee: optee: Fix supplicant based device enumeration
tee: optee: Remove redundant custom workqueue

.../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
drivers/tee/optee/core.c | 13 ++-----------
drivers/tee/optee/device.c | 17 +++++++++++++++--
drivers/tee/optee/optee_private.h | 2 --
4 files changed, 26 insertions(+), 15 deletions(-)

--
2.34.1


2023-11-02 07:32:13

by Sumit Garg

[permalink] [raw]
Subject: [PATCH v4 2/2] tee: optee: Remove redundant custom workqueue

Global system workqueue is sufficient to suffice OP-TEE bus scanning work
needs. So drop redundant usage of the custom workqueue.

Tested-by: Jan Kiszka <[email protected]>
Tested-by: Masahisa Kojima <[email protected]>
Signed-off-by: Sumit Garg <[email protected]>
---
drivers/tee/optee/core.c | 13 ++-----------
drivers/tee/optee/optee_private.h | 2 --
2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 2a258bd3b6b5..1eaa191b6ff6 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -15,7 +15,6 @@
#include <linux/string.h>
#include <linux/tee_drv.h>
#include <linux/types.h>
-#include <linux/workqueue.h>
#include "optee_private.h"

int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
@@ -110,12 +109,7 @@ int optee_open(struct tee_context *ctx, bool cap_memref_null)

if (!optee->scan_bus_done) {
INIT_WORK(&optee->scan_bus_work, optee_bus_scan);
- optee->scan_bus_wq = create_workqueue("optee_bus_scan");
- if (!optee->scan_bus_wq) {
- kfree(ctxdata);
- return -ECHILD;
- }
- queue_work(optee->scan_bus_wq, &optee->scan_bus_work);
+ schedule_work(&optee->scan_bus_work);
optee->scan_bus_done = true;
}
}
@@ -158,10 +152,7 @@ void optee_release_supp(struct tee_context *ctx)
struct optee *optee = tee_get_drvdata(ctx->teedev);

optee_release_helper(ctx, optee_close_session_helper);
- if (optee->scan_bus_wq) {
- destroy_workqueue(optee->scan_bus_wq);
- optee->scan_bus_wq = NULL;
- }
+
optee_supp_release(&optee->supp);
}

diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index 6bb5cae09688..94c0ee381894 100644
--- a/drivers/tee/optee/optee_private.h
+++ b/drivers/tee/optee/optee_private.h
@@ -178,7 +178,6 @@ struct optee_ops {
* @pool: shared memory pool
* @rpc_param_count: If > 0 number of RPC parameters to make room for
* @scan_bus_done flag if device registation was already done.
- * @scan_bus_wq workqueue to scan optee bus and register optee drivers
* @scan_bus_work workq to scan optee bus and register optee drivers
*/
struct optee {
@@ -197,7 +196,6 @@ struct optee {
struct tee_shm_pool *pool;
unsigned int rpc_param_count;
bool scan_bus_done;
- struct workqueue_struct *scan_bus_wq;
struct work_struct scan_bus_work;
};

--
2.34.1

2023-11-02 07:32:40

by Sumit Garg

[permalink] [raw]
Subject: [PATCH v4 1/2] tee: optee: Fix supplicant based device enumeration

Currently supplicant dependent optee device enumeration only registers
devices whenever tee-supplicant is invoked for the first time. But it
forgets to remove devices when tee-supplicant daemon stops running and
closes its context gracefully. This leads to following error for fTPM
driver during reboot/shutdown:

[ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024

Fix this by adding an attribute for supplicant dependent devices so that
the user-space service can detect and detach supplicant devices before
closing the supplicant:

$ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
then echo $(basename "$dev") > $dev/driver/unbind; fi done

Reported-by: Jan Kiszka <[email protected]>
Link: https://github.com/OP-TEE/optee_os/issues/6094
Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
Signed-off-by: Sumit Garg <[email protected]>
---
.../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
drivers/tee/optee/device.c | 17 +++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Documentation/ABI/testing/sysfs-bus-optee-devices b/Documentation/ABI/testing/sysfs-bus-optee-devices
index 0f58701367b6..d914f6629662 100644
--- a/Documentation/ABI/testing/sysfs-bus-optee-devices
+++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
@@ -6,3 +6,12 @@ Description:
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
are free to create needed API under optee-ta-<uuid> directory.
+
+What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
+Date: July 2008
+KernelVersion: 6.7
+Contact: [email protected]
+Description:
+ Allows to distinguish whether an OP-TEE based TA/device requires user-space
+ tee-supplicant to function properly or not. This attribute will be present for
+ devices which depend on tee-supplicant to be running.
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
index 64f0e047c23d..4b1092127694 100644
--- a/drivers/tee/optee/device.c
+++ b/drivers/tee/optee/device.c
@@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
kfree(optee_device);
}

-static int optee_register_device(const uuid_t *device_uuid)
+static ssize_t need_supplicant_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return 0;
+}
+
+static DEVICE_ATTR_RO(need_supplicant);
+
+static int optee_register_device(const uuid_t *device_uuid, u32 func)
{
struct tee_client_device *optee_device = NULL;
int rc;
@@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
put_device(&optee_device->dev);
}

+ if (func == PTA_CMD_GET_DEVICES_SUPP)
+ device_create_file(&optee_device->dev,
+ &dev_attr_need_supplicant);
+
return rc;
}

@@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
num_devices = shm_size / sizeof(uuid_t);

for (idx = 0; idx < num_devices; idx++) {
- rc = optee_register_device(&device_uuid[idx]);
+ rc = optee_register_device(&device_uuid[idx], func);
if (rc)
goto out_shm;
}
--
2.34.1

2023-11-02 09:26:41

by Jerome Forissier

[permalink] [raw]
Subject: Re: [PATCH v4 1/2] tee: optee: Fix supplicant based device enumeration



On 11/2/23 08:30, Sumit Garg wrote:
> Currently supplicant dependent optee device enumeration only registers
> devices whenever tee-supplicant is invoked for the first time. But it
> forgets to remove devices when tee-supplicant daemon stops running and
> closes its context gracefully. This leads to following error for fTPM
> driver during reboot/shutdown:
>
> [ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024
>
> Fix this by adding an attribute for supplicant dependent devices so that
> the user-space service can detect and detach supplicant devices before
> closing the supplicant:
>
> $ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
> then echo $(basename "$dev") > $dev/driver/unbind; fi done
>
> Reported-by: Jan Kiszka <[email protected]>
> Link: https://github.com/OP-TEE/optee_os/issues/6094
> Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
> Signed-off-by: Sumit Garg <[email protected]>
> ---
> .../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
> drivers/tee/optee/device.c | 17 +++++++++++++++--
> 2 files changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-bus-optee-devices b/Documentation/ABI/testing/sysfs-bus-optee-devices
> index 0f58701367b6..d914f6629662 100644
> --- a/Documentation/ABI/testing/sysfs-bus-optee-devices
> +++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
> @@ -6,3 +6,12 @@ Description:
> OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
> matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
> are free to create needed API under optee-ta-<uuid> directory.
> +
> +What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
> +Date: July 2008
> +KernelVersion: 6.7
> +Contact: [email protected]
> +Description:
> + Allows to distinguish whether an OP-TEE based TA/device requires user-space
> + tee-supplicant to function properly or not. This attribute will be present for
> + devices which depend on tee-supplicant to be running.
> diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> index 64f0e047c23d..4b1092127694 100644
> --- a/drivers/tee/optee/device.c
> +++ b/drivers/tee/optee/device.c
> @@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
> kfree(optee_device);
> }
>
> -static int optee_register_device(const uuid_t *device_uuid)
> +static ssize_t need_supplicant_show(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + return 0;
> +}
> +
> +static DEVICE_ATTR_RO(need_supplicant);
> +
> +static int optee_register_device(const uuid_t *device_uuid, u32 func)
> {
> struct tee_client_device *optee_device = NULL;
> int rc;
> @@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
> put_device(&optee_device->dev);
> }
>
> + if (func == PTA_CMD_GET_DEVICES_SUPP)
> + device_create_file(&optee_device->dev,
> + &dev_attr_need_supplicant);
> +
> return rc;
> }
>
> @@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
> num_devices = shm_size / sizeof(uuid_t);
>
> for (idx = 0; idx < num_devices; idx++) {
> - rc = optee_register_device(&device_uuid[idx]);
> + rc = optee_register_device(&device_uuid[idx], func);
> if (rc)
> goto out_shm;
> }

Acked-by: Jerome Forissier <[email protected]>

Thanks!

--
Jerome

2023-11-02 14:29:49

by Ilias Apalodimas

[permalink] [raw]
Subject: Re: [PATCH v4 1/2] tee: optee: Fix supplicant based device enumeration

Hi Sumit,

On Thu, 2 Nov 2023 at 09:31, Sumit Garg <[email protected]> wrote:
>
> Currently supplicant dependent optee device enumeration only registers
> devices whenever tee-supplicant is invoked for the first time. But it
> forgets to remove devices when tee-supplicant daemon stops running and
> closes its context gracefully. This leads to following error for fTPM
> driver during reboot/shutdown:
>
> [ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024
>
> Fix this by adding an attribute for supplicant dependent devices so that
> the user-space service can detect and detach supplicant devices before
> closing the supplicant:
>
> $ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
> then echo $(basename "$dev") > $dev/driver/unbind; fi done
>
> Reported-by: Jan Kiszka <[email protected]>
> Link: https://github.com/OP-TEE/optee_os/issues/6094
> Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
> Signed-off-by: Sumit Garg <[email protected]>
> ---
> .../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
> drivers/tee/optee/device.c | 17 +++++++++++++++--
> 2 files changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-bus-optee-devices b/Documentation/ABI/testing/sysfs-bus-optee-devices
> index 0f58701367b6..d914f6629662 100644
> --- a/Documentation/ABI/testing/sysfs-bus-optee-devices
> +++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
> @@ -6,3 +6,12 @@ Description:
> OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
> matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
> are free to create needed API under optee-ta-<uuid> directory.
> +
> +What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
> +Date: July 2008

nit, date needs changing

> +KernelVersion: 6.7
> +Contact: [email protected]
> +Description:
> + Allows to distinguish whether an OP-TEE based TA/device requires user-space
> + tee-supplicant to function properly or not. This attribute will be present for
> + devices which depend on tee-supplicant to be running.
> diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> index 64f0e047c23d..4b1092127694 100644
> --- a/drivers/tee/optee/device.c
> +++ b/drivers/tee/optee/device.c
> @@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
> kfree(optee_device);
> }
>
> -static int optee_register_device(const uuid_t *device_uuid)
> +static ssize_t

(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + return 0;
> +}
> +
> +static DEVICE_ATTR_RO(need_supplicant);
> +
> +static int optee_register_device(const uuid_t *device_uuid, u32 func)
> {
> struct tee_client_device *optee_device = NULL;
> int rc;
> @@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
> put_device(&optee_device->dev);
> }
>
> + if (func == PTA_CMD_GET_DEVICES_SUPP)
> + device_create_file(&optee_device->dev,
> + &dev_attr_need_supplicant);
> +
> return rc;
> }
>
> @@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
> num_devices = shm_size / sizeof(uuid_t);
>
> for (idx = 0; idx < num_devices; idx++) {
> - rc = optee_register_device(&device_uuid[idx]);
> + rc = optee_register_device(&device_uuid[idx], func);
> if (rc)
> goto out_shm;
> }
> --
> 2.34.1
>

Other than that
Reviewed-by: Ilias Apalodimas <[email protected]>

2023-11-03 05:53:05

by Sumit Garg

[permalink] [raw]
Subject: Re: [PATCH v4 1/2] tee: optee: Fix supplicant based device enumeration

Hi Ilias,

On Thu, 2 Nov 2023 at 19:58, Ilias Apalodimas
<[email protected]> wrote:
>
> Hi Sumit,
>
> On Thu, 2 Nov 2023 at 09:31, Sumit Garg <[email protected]> wrote:
> >
> > Currently supplicant dependent optee device enumeration only registers
> > devices whenever tee-supplicant is invoked for the first time. But it
> > forgets to remove devices when tee-supplicant daemon stops running and
> > closes its context gracefully. This leads to following error for fTPM
> > driver during reboot/shutdown:
> >
> > [ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024
> >
> > Fix this by adding an attribute for supplicant dependent devices so that
> > the user-space service can detect and detach supplicant devices before
> > closing the supplicant:
> >
> > $ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
> > then echo $(basename "$dev") > $dev/driver/unbind; fi done
> >
> > Reported-by: Jan Kiszka <[email protected]>
> > Link: https://github.com/OP-TEE/optee_os/issues/6094
> > Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
> > Signed-off-by: Sumit Garg <[email protected]>
> > ---
> > .../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
> > drivers/tee/optee/device.c | 17 +++++++++++++++--
> > 2 files changed, 24 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/ABI/testing/sysfs-bus-optee-devices b/Documentation/ABI/testing/sysfs-bus-optee-devices
> > index 0f58701367b6..d914f6629662 100644
> > --- a/Documentation/ABI/testing/sysfs-bus-optee-devices
> > +++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
> > @@ -6,3 +6,12 @@ Description:
> > OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
> > matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
> > are free to create needed API under optee-ta-<uuid> directory.
> > +
> > +What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
> > +Date: July 2008
>
> nit, date needs changing
>

Thanks for catching that. If nothing major comes up then I hope Jens
can correct it while applying.

> > +KernelVersion: 6.7
> > +Contact: [email protected]
> > +Description:
> > + Allows to distinguish whether an OP-TEE based TA/device requires user-space
> > + tee-supplicant to function properly or not. This attribute will be present for
> > + devices which depend on tee-supplicant to be running.
> > diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> > index 64f0e047c23d..4b1092127694 100644
> > --- a/drivers/tee/optee/device.c
> > +++ b/drivers/tee/optee/device.c
> > @@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
> > kfree(optee_device);
> > }
> >
> > -static int optee_register_device(const uuid_t *device_uuid)
> > +static ssize_t
>
> (struct device *dev,
> > + struct device_attribute *attr,
> > + char *buf)
> > +{
> > + return 0;
> > +}
> > +
> > +static DEVICE_ATTR_RO(need_supplicant);
> > +
> > +static int optee_register_device(const uuid_t *device_uuid, u32 func)
> > {
> > struct tee_client_device *optee_device = NULL;
> > int rc;
> > @@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
> > put_device(&optee_device->dev);
> > }
> >
> > + if (func == PTA_CMD_GET_DEVICES_SUPP)
> > + device_create_file(&optee_device->dev,
> > + &dev_attr_need_supplicant);
> > +
> > return rc;
> > }
> >
> > @@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
> > num_devices = shm_size / sizeof(uuid_t);
> >
> > for (idx = 0; idx < num_devices; idx++) {
> > - rc = optee_register_device(&device_uuid[idx]);
> > + rc = optee_register_device(&device_uuid[idx], func);
> > if (rc)
> > goto out_shm;
> > }
> > --
> > 2.34.1
> >
>
> Other than that
> Reviewed-by: Ilias Apalodimas <[email protected]>

Thanks.

-Sumit

2023-11-03 08:36:21

by Jens Wiklander

[permalink] [raw]
Subject: Re: [PATCH v4 1/2] tee: optee: Fix supplicant based device enumeration

Hi,

On Fri, Nov 3, 2023 at 6:52 AM Sumit Garg <[email protected]> wrote:
>
> Hi Ilias,
>
> On Thu, 2 Nov 2023 at 19:58, Ilias Apalodimas
> <[email protected]> wrote:
> >
> > Hi Sumit,
> >
> > On Thu, 2 Nov 2023 at 09:31, Sumit Garg <[email protected]> wrote:
> > >
> > > Currently supplicant dependent optee device enumeration only registers
> > > devices whenever tee-supplicant is invoked for the first time. But it
> > > forgets to remove devices when tee-supplicant daemon stops running and
> > > closes its context gracefully. This leads to following error for fTPM
> > > driver during reboot/shutdown:
> > >
> > > [ 73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024
> > >
> > > Fix this by adding an attribute for supplicant dependent devices so that
> > > the user-space service can detect and detach supplicant devices before
> > > closing the supplicant:
> > >
> > > $ for dev in /sys/bus/tee/devices/*; do if [[ -f "$dev/need_supplicant" && -f "$dev/driver/unbind" ]]; \
> > > then echo $(basename "$dev") > $dev/driver/unbind; fi done
> > >
> > > Reported-by: Jan Kiszka <[email protected]>
> > > Link: https://github.com/OP-TEE/optee_os/issues/6094

Checkpatch complains here, we should use "Closes:" instead of "Link:".

> > > Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
> > > Signed-off-by: Sumit Garg <[email protected]>
> > > ---
> > > .../ABI/testing/sysfs-bus-optee-devices | 9 +++++++++
> > > drivers/tee/optee/device.c | 17 +++++++++++++++--
> > > 2 files changed, 24 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/Documentation/ABI/testing/sysfs-bus-optee-devices b/Documentation/ABI/testing/sysfs-bus-optee-devices
> > > index 0f58701367b6..d914f6629662 100644
> > > --- a/Documentation/ABI/testing/sysfs-bus-optee-devices
> > > +++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
> > > @@ -6,3 +6,12 @@ Description:
> > > OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
> > > matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
> > > are free to create needed API under optee-ta-<uuid> directory.
> > > +
> > > +What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
> > > +Date: July 2008
> >
> > nit, date needs changing
> >
>
> Thanks for catching that. If nothing major comes up then I hope Jens
> can correct it while applying.

Sure, I can update it to November 2023.

I'll fix the date and the "Closes:" tag if there's no v5.

Cheers,
Jens

>
> > > +KernelVersion: 6.7
> > > +Contact: [email protected]
> > > +Description:
> > > + Allows to distinguish whether an OP-TEE based TA/device requires user-space
> > > + tee-supplicant to function properly or not. This attribute will be present for
> > > + devices which depend on tee-supplicant to be running.
> > > diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> > > index 64f0e047c23d..4b1092127694 100644
> > > --- a/drivers/tee/optee/device.c
> > > +++ b/drivers/tee/optee/device.c
> > > @@ -60,7 +60,16 @@ static void optee_release_device(struct device *dev)
> > > kfree(optee_device);
> > > }
> > >
> > > -static int optee_register_device(const uuid_t *device_uuid)
> > > +static ssize_t
> >
> > (struct device *dev,
> > > + struct device_attribute *attr,
> > > + char *buf)
> > > +{
> > > + return 0;
> > > +}
> > > +
> > > +static DEVICE_ATTR_RO(need_supplicant);
> > > +
> > > +static int optee_register_device(const uuid_t *device_uuid, u32 func)
> > > {
> > > struct tee_client_device *optee_device = NULL;
> > > int rc;
> > > @@ -83,6 +92,10 @@ static int optee_register_device(const uuid_t *device_uuid)
> > > put_device(&optee_device->dev);
> > > }
> > >
> > > + if (func == PTA_CMD_GET_DEVICES_SUPP)
> > > + device_create_file(&optee_device->dev,
> > > + &dev_attr_need_supplicant);
> > > +
> > > return rc;
> > > }
> > >
> > > @@ -142,7 +155,7 @@ static int __optee_enumerate_devices(u32 func)
> > > num_devices = shm_size / sizeof(uuid_t);
> > >
> > > for (idx = 0; idx < num_devices; idx++) {
> > > - rc = optee_register_device(&device_uuid[idx]);
> > > + rc = optee_register_device(&device_uuid[idx], func);
> > > if (rc)
> > > goto out_shm;
> > > }
> > > --
> > > 2.34.1
> > >
> >
> > Other than that
> > Reviewed-by: Ilias Apalodimas <[email protected]>
>
> Thanks.
>
> -Sumit