Revert "init: Make entry init-function less and introduce service objects"

This reverts commit 175da6b.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

include/zephyr/device.h

@@ -1263,6 +1263,7 @@ device_get_dt_nodelabels(const struct device *dev)
 	static const Z_DECL_ALIGN(struct init_entry) __used __noasan Z_INIT_ENTRY_SECTION(         \
 		level, prio, Z_DEVICE_INIT_SUB_PRIO(node_id))                                      \
 		Z_INIT_ENTRY_NAME(DEVICE_NAME_GET(dev_id)) = {                                     \
+			.init_fn = NULL,                                                           \
 			.dev = (const struct device *)&DEVICE_NAME_GET(dev_id),                    \
 		}
 

include/zephyr/init.h

@@ -13,8 +13,6 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
 
-#include <zephyr/service.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -67,14 +65,15 @@ struct device;
  */
 struct init_entry {
 	/**
-	 * An init entry can be about a device or a service, _init_object
-	 * will be used to differentiate depending on relative sections.
+	 * If the init function belongs to a SYS_INIT, this field stored the
+	 * initialization function, otherwise it is set to NULL.
+	 */
+	int (*init_fn)(void);
+	/**
+	 * If the init entry belongs to a device, this fields stores a
+	 * reference to it, otherwise it is set to NULL.
 	 */
-	union {
-		const void *_init_object;
-		const struct device *dev;
-		const struct service *srv;
-	};
+	const struct device *dev;
 };
 
 /** @cond INTERNAL_HIDDEN */
@@ -165,12 +164,9 @@ struct init_entry {
  * @see SYS_INIT()
  */
 #define SYS_INIT_NAMED(name, init_fn_, level, prio)                                       \
-	Z_SERVICE_DEFINE(name, init_fn_, level, prio);                                    \
 	static const Z_DECL_ALIGN(struct init_entry)                                      \
 		Z_INIT_ENTRY_SECTION(level, prio, 0) __used __noasan                      \
-		Z_INIT_ENTRY_NAME(name) = {                                               \
-			.srv = (const struct service *)&Z_SERVICE_NAME_GET(name)          \
-		}
+		Z_INIT_ENTRY_NAME(name) = {.init_fn = (init_fn_), .dev = NULL}            \
 
 /** @} */
 

include/zephyr/linker/common-rom/common-rom-kernel-devices.ld

@@ -22,8 +22,6 @@
 
 	ITERABLE_SECTION_ROM_NUMERIC(device, Z_LINK_ITERABLE_SUBALIGN)
 
-	ITERABLE_SECTION_ROM_NUMERIC(service, Z_LINK_ITERABLE_SUBALIGN)
-
 #if defined(CONFIG_GEN_SW_ISR_TABLE) && defined(CONFIG_SHARED_INTERRUPTS)
 	/* since z_shared_isr() is not referenced anywhere when
 	 * zephyr_pre0.elf is built, the linker will end up dropping it.

include/zephyr/service.h

@@ -136,9 +136,6 @@ enum init_level {
 extern const struct init_entry __init_SMP_start[];
 #endif /* CONFIG_SMP */
 
-TYPE_SECTION_START_EXTERN(struct service, service);
-TYPE_SECTION_END_EXTERN(struct service, service);
-
 /*
  * storage space for the interrupt stack
  *
@@ -340,12 +337,6 @@ static int do_device_init(const struct device *dev)
 	return rc;
 }
 
-static inline bool is_entry_about_service(const void *obj)
-{
-	return (obj >= (void *)_service_list_start &&
-		obj < (void *)_service_list_end);
-}
-
 /**
  * @brief Execute all the init entry initialization functions at a given level
  *
@@ -374,26 +365,17 @@ static void z_sys_init_run_level(enum init_level level)
 	const struct init_entry *entry;
 
 	for (entry = levels[level]; entry < levels[level+1]; entry++) {
+		const struct device *dev = entry->dev;
 		int result = 0;
 
-		if (unlikely(entry->_init_object == NULL)) {
-			continue;
-		}
-
 		sys_trace_sys_init_enter(entry, level);
-
-		if (is_entry_about_service(entry->_init_object)) {
-			const struct service *srv = entry->srv;
-
-			result = srv->init();
-		} else {
-			const struct device *dev = entry->dev;
-
+		if (dev != NULL) {
 			if ((dev->flags & DEVICE_FLAG_INIT_DEFERRED) == 0U) {
 				result = do_device_init(dev);
 			}
+		} else {
+			result = entry->init_fn();
 		}
-
 		sys_trace_sys_init_exit(entry, level, result);
 	}
 }

kernel/init.c

@@ -28,7 +28,7 @@ static K_CONDVAR_DEFINE(wait_start);
 STRUCT_SECTION_START_EXTERN(net_socket_service_desc);
 STRUCT_SECTION_END_EXTERN(net_socket_service_desc);
 
-static struct service_context {
+static struct service {
 	struct zsock_pollfd events[CONFIG_ZVFS_POLL_MAX];
 	int count;
 } ctx;