Revert parts of "soc: intel: move init code from SYS_INIT to hooks"

This reverts parts of commit c344771 related to intel_adsp soc. There is a dependency on device initialization that was missed. Reverting until we have a proper way for migrating to hooks. Fixes #78880 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
zephyrproject-rtos · Sep 23, 2024 · 810f978 · 810f978
1 parent 43cc36f
commit 810f978
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig
@@ -15,8 +15,6 @@ config SOC_SERIES_INTEL_ADSP_ACE
  select XTENSA_CPU_HAS_HIFI3
  select XTENSA_CPU_HAS_HIFI4
  select ARCH_HAS_RESERVED_PAGE_FRAMES if MMU
- select SOC_LATE_INIT_HOOK
- select SOC_EARLY_INIT_HOOK
 
 config SOC_INTEL_COMM_WIDGET
  bool "Intel Communication Widget driver"

diff --git a/soc/intel/intel_adsp/ace/multiprocessing.c b/soc/intel/intel_adsp/ace/multiprocessing.c
@@ -108,11 +108,11 @@ void soc_mp_init(void)
  soc_cpus_active[0] = true;
 }
 
-void soc_late_init_hook(void)
+static int host_runtime_get(void)
 {
- pm_device_runtime_get(INTEL_ADSP_HST_DOMAIN_DEV);
+ return pm_device_runtime_get(INTEL_ADSP_HST_DOMAIN_DEV);
 }
-
+SYS_INIT(host_runtime_get, POST_KERNEL, 99);
 
 #ifdef CONFIG_ADSP_IMR_CONTEXT_SAVE
 /*

diff --git a/soc/intel/intel_adsp/cavs/Kconfig b/soc/intel/intel_adsp/cavs/Kconfig
@@ -11,7 +11,6 @@ config SOC_SERIES_INTEL_ADSP_CAVS
  select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc"
  select ARCH_HAS_COHERENCE
  select HAS_PM
- select SOC_EARLY_INIT_HOOK
 
 config SOC_INTEL_CAVS_V25
  select XTENSA_WAITI_BUG

diff --git a/soc/intel/intel_adsp/common/boot_complete.c b/soc/intel/intel_adsp/common/boot_complete.c
@@ -28,3 +28,5 @@ int boot_complete(void)
 
  return 0;
 }
+
+SYS_INIT(boot_complete, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/soc/intel/intel_adsp/common/soc.c b/soc/intel/intel_adsp/common/soc.c
@@ -6,17 +6,15 @@
 #include <zephyr/init.h>
 #include <zephyr/linker/section_tags.h>
 
-extern int boot_complete(void);
 extern void power_init(void);
 extern void adsp_clock_init(void);
 
 #if CONFIG_MP_MAX_NUM_CPUS > 1
 extern void soc_mp_init(void);
 #endif
 
-void soc_early_init_hook(void)
+static __imr int soc_init(void)
 {
- (void)boot_complete();
  power_init();
 
 #ifdef CONFIG_ADSP_CLOCK
@@ -26,4 +24,8 @@ void soc_early_init_hook(void)
 #if CONFIG_MP_MAX_NUM_CPUS > 1
  soc_mp_init();
 #endif
+
+ return 0;
 }
+
+SYS_INIT(soc_init, PRE_KERNEL_1, 99);