Skip to content

Commit 0439fcf

Browse files
b49020jenswi-linaro
authored andcommitted
tee: Refactor TEE subsystem header files
Since commit 25559c2 ("tee: add kernel internal client interface"), it has been a common include/linux/tee_drv.h header file which is shared to hold TEE subsystem internal bits along with the APIs exposed to the TEE client drivers. However, this practice is prone to TEE subsystem internal APIs abuse and especially so with the new TEE implementation drivers being added to reuse existing functionality. In order to address this split TEE subsystem internal bits as a separate header file: include/linux/tee_core.h which should be the one used by TEE implementation drivers. With that include/linux/tee_drv.h lists only APIs exposed by TEE subsystem to the TEE client drivers. Signed-off-by: Sumit Garg <[email protected]> Signed-off-by: Balint Dobszay <[email protected]> Signed-off-by: Jens Wiklander <[email protected]>
1 parent 4cece76 commit 0439fcf

File tree

19 files changed

+343
-305
lines changed

19 files changed

+343
-305
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21684,6 +21684,7 @@ F: Documentation/driver-api/tee.rst
2168421684
F: Documentation/tee/
2168521685
F: Documentation/userspace-api/tee.rst
2168621686
F: drivers/tee/
21687+
F: include/linux/tee_core.h
2168721688
F: include/linux/tee_drv.h
2168821689
F: include/uapi/linux/tee.h
2168921690

drivers/tee/amdtee/amdtee_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <linux/mutex.h>
1111
#include <linux/spinlock.h>
12-
#include <linux/tee_drv.h>
12+
#include <linux/tee_core.h>
1313
#include <linux/kref.h>
1414
#include <linux/types.h>
1515
#include "amdtee_if.h"

drivers/tee/amdtee/call.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <linux/device.h>
77
#include <linux/tee.h>
8-
#include <linux/tee_drv.h>
8+
#include <linux/tee_core.h>
99
#include <linux/psp-tee.h>
1010
#include <linux/slab.h>
1111
#include <linux/psp.h>

drivers/tee/amdtee/core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
#include <linux/slab.h>
1010
#include <linux/string.h>
1111
#include <linux/device.h>
12-
#include <linux/tee_drv.h>
12+
#include <linux/tee_core.h>
1313
#include <linux/types.h>
1414
#include <linux/mm.h>
1515
#include <linux/uaccess.h>
1616
#include <linux/firmware.h>
1717
#include "amdtee_private.h"
18-
#include "../tee_private.h"
1918
#include <linux/psp-tee.h>
2019

2120
static struct amdtee_driver_data *drv_data;

drivers/tee/amdtee/shm_pool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
#include <linux/slab.h>
7-
#include <linux/tee_drv.h>
7+
#include <linux/tee_core.h>
88
#include <linux/psp.h>
99
#include "amdtee_private.h"
1010

drivers/tee/optee/call.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/errno.h>
88
#include <linux/mm.h>
99
#include <linux/slab.h>
10-
#include <linux/tee_drv.h>
10+
#include <linux/tee_core.h>
1111
#include <linux/types.h>
1212
#include "optee_private.h"
1313

drivers/tee/optee/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/module.h>
1414
#include <linux/slab.h>
1515
#include <linux/string.h>
16-
#include <linux/tee_drv.h>
16+
#include <linux/tee_core.h>
1717
#include <linux/types.h>
1818
#include "optee_private.h"
1919

drivers/tee/optee/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <linux/kernel.h>
99
#include <linux/slab.h>
10-
#include <linux/tee_drv.h>
10+
#include <linux/tee_core.h>
1111
#include <linux/uuid.h>
1212
#include "optee_private.h"
1313

drivers/tee/optee/ffa_abi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <linux/sched.h>
1212
#include <linux/slab.h>
1313
#include <linux/string.h>
14-
#include <linux/tee_drv.h>
14+
#include <linux/tee_core.h>
1515
#include <linux/types.h>
1616
#include "optee_private.h"
1717
#include "optee_ffa.h"

drivers/tee/optee/notif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/errno.h>
1010
#include <linux/slab.h>
1111
#include <linux/spinlock.h>
12-
#include <linux/tee_drv.h>
12+
#include <linux/tee_core.h>
1313
#include "optee_private.h"
1414

1515
struct notif_entry {

0 commit comments

Comments
 (0)