core: add and use service_init_crypto() macro

Add the service_init_crypto() used to initialize the internal crypto API before the rest of the registered service_init functions are called. Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Jerome Forissier <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
OP-TEE · Aug 22, 2024 · 420f112 · 420f112
1 parent 913d93a
commit 420f112
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/include/initcall.h b/core/include/initcall.h
@@ -105,8 +105,9 @@ struct initcall {
 
 #define early_init(fn)			__define_initcall(early_init, 1, fn)
 #define early_init_late(fn)		__define_initcall(early_init, 2, fn)
-#define service_init(fn)		__define_initcall(service_init, 1, fn)
-#define service_init_late(fn)		__define_initcall(service_init, 2, fn)
+#define service_init_crypto(fn)		__define_initcall(service_init, 1, fn)
+#define service_init(fn)		__define_initcall(service_init, 2, fn)
+#define service_init_late(fn)		__define_initcall(service_init, 3, fn)
 #define driver_init(fn)			__define_initcall(driver_init, 1, fn)
 #define driver_init_late(fn)		__define_initcall(driver_init, 2, fn)
 #define release_init_resource(fn)	__define_initcall(driver_init, 3, fn)

diff --git a/core/tee/tee_cryp_utl.c b/core/tee/tee_cryp_utl.c
@@ -214,4 +214,4 @@ static TEE_Result tee_cryp_init(void)
 
 	return TEE_SUCCESS;
 }
-service_init(tee_cryp_init);
+service_init_crypto(tee_cryp_init);