Cleanup of init/device and kernel internal headers #93323

nashif · 2025-07-18T12:14:42Z

Started when I noticed soc code including kernel_internal.h. Then i started finding other oddities and misplaced code.

Cleanup of init.c which was getting overloaded with too many functions used by arch and soc code and remove unrelated declarations from kernel_internal.h which were forcing some non-kernel code to include kernel_internal.h

No functional changes, only code movements and header cleanup`

dcpleung · 2025-07-31T16:36:47Z

Maybe time for a boot subsys? :D

sylvioalves · 2025-07-31T17:00:05Z

arch/common/CMakeLists.txt

+zephyr_library_sources(
+  init.c
+)
+zephyr_library_sources_ifdef(CONFIG_XIP


LGTM. Only code style could be improved here:

zephyr_library_sources(init.c) zephyr_library_sources_ifdef(CONFIG_XIP xip.c)

andyross

Looks good here. I particularly love the isolation of arch/common code, makes a lot of our memory setup initialization less confusing.

marekmatej

besides a small nit looks good

marekmatej · 2025-07-31T20:39:35Z

kernel/boot_args.c

@@ -2,10 +2,10 @@
 * Copyright The Zephyr Project contributors
 */

- #include <zephyr/sys/util.h>


just a nit, but maybe you could move this change in the previous commit

cfriedt

LGTM 👍

Not really a kernel feature, more for architecture, which is reflected in how XIP is enabled and tested. Move it to architecture code to keep which much of the 'implementation' and usage is. Signed-off-by: Anas Nashif <[email protected]>

Move under arch, as this is not a kernel feature really. arch also matches the test idcentifier in place. Signed-off-by: Anas Nashif <[email protected]>

Cleanup init.c code and move early boot code into arch/ and make it accessible outside of the boot process/kernel. All of this code is not related to the 'kernel' and is mostly used within the architecture boot / setup process. The way it was done, some soc code was including kernel_internal.h directly, which shouldn't be done. Signed-off-by: Anas Nashif <[email protected]>

No reason for this to be part of already packed init.c. Moved to own file and build only when BOOTARGS are enabled. Signed-off-by: Anas Nashif <[email protected]>

Cleanup kconfig of bootargs and put everything in one menuconfig. Signed-off-by: Anas Nashif <[email protected]>

Move device model syscalls to device.c and decouple kernel header from device related routines. Cleanup init to have only what is needed. Signed-off-by: Anas Nashif <[email protected]>

simplify cmake file and use macros for adding files that are part of the kernel based on the configuration. Signed-off-by: Anas Nashif <[email protected]>

Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>

Declare z_interrupt_stacks as extern. Signed-off-by: Anas Nashif <[email protected]>

Declare z_cstart as extern as otherwise we will need to pull in kernel_internal.h. Signed-off-by: Anas Nashif <[email protected]>

nashif · 2025-08-04T16:36:49Z

rebased

sonarqubecloud · 2025-08-04T16:56:09Z

Quality Gate passed

Issues
0 New issues
13 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.1% Duplication on New Code

See analysis details on SonarQube Cloud

peter-mitsis · 2025-08-04T17:14:58Z

soc/espressif/esp32/soc.c

@@ -18,6 +18,7 @@

 extern void z_prep_c(void);
 extern void esp_reset_reason_init(void);
+extern FUNC_NORETURN void z_cstart(void);


With how things are currently structured, declaring z_cstart() here is not necessary as it is not called within this file. However, z_prep_c() is called, which in turn calls z_cstart(). This also applies to esp32s2 and esp32s3.

nashif force-pushed the topic/kernel/cleanup1 branch from 3fb599e to 6f592fa Compare July 18, 2025 12:26

nashif force-pushed the topic/kernel/cleanup1 branch from 34833e7 to 61932ec Compare July 31, 2025 13:09

nashif marked this pull request as ready for review July 31, 2025 13:10

zephyrbot requested review from andyross, ceolin, cfriedt, dcpleung, jeremybettis, LucasTambor, marekmatej, npitre, peter-mitsis, raffarost, sylvioalves, TaiJuWu, tejlmand, uLipe and wmrsouza July 31, 2025 13:11

zephyrbot assigned dcpleung Jul 31, 2025

sylvioalves reviewed Jul 31, 2025

View reviewed changes

andyross previously approved these changes Jul 31, 2025

View reviewed changes

marekmatej previously approved these changes Jul 31, 2025

View reviewed changes

wmrsouza previously approved these changes Jul 31, 2025

View reviewed changes

dcpleung previously approved these changes Aug 1, 2025

View reviewed changes

uLipe previously approved these changes Aug 1, 2025

View reviewed changes

cfriedt previously approved these changes Aug 1, 2025

View reviewed changes

nashif added 3 commits August 4, 2025 12:36

kernel: move xip into arch/common

707cf82

Not really a kernel feature, more for architecture, which is reflected in how XIP is enabled and tested. Move it to architecture code to keep which much of the 'implementation' and usage is. Signed-off-by: Anas Nashif <[email protected]>

tests: xip: move under arch

1d4efeb

Move under arch, as this is not a kernel feature really. arch also matches the test idcentifier in place. Signed-off-by: Anas Nashif <[email protected]>

tests: gen_isr_table: move under arch

9a76edf

Move under arch, as this is not a kernel feature really. arch also matches the test idcentifier in place. Signed-off-by: Anas Nashif <[email protected]>

nashif added 12 commits August 4, 2025 12:36

tests: interrupt: move under arch

a7257c2

Move under arch, as this is not a kernel feature really. arch also matches the test idcentifier in place. Signed-off-by: Anas Nashif <[email protected]>

kernel: init: move boot arg handling to own file

c42fa88

No reason for this to be part of already packed init.c. Moved to own file and build only when BOOTARGS are enabled. Signed-off-by: Anas Nashif <[email protected]>

kernel: boot args kconfig cleanup

21d460a

Cleanup kconfig of bootargs and put everything in one menuconfig. Signed-off-by: Anas Nashif <[email protected]>

device: move device syscalls to device.c

37b3b5a

Move device model syscalls to device.c and decouple kernel header from device related routines. Cleanup init to have only what is needed. Signed-off-by: Anas Nashif <[email protected]>

kernel: use cmake macro for adding kernel files

cefb7e0

simplify cmake file and use macros for adding files that are part of the kernel based on the configuration. Signed-off-by: Anas Nashif <[email protected]>

arch: init: rename z_early_memset -> arch_early_memset

d0bcf88

Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>

arch: boot: rename z_early_memcpy -> arch_early_memcpy

0ec9f9e

Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>

arch: init: z_bss_zero -> arch_bss_zero

cf3a109

Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>

arch: init: rename z_data_copy -> arch_data_copy

5f89065

Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>

arch: x86: declare z_interrupt_stacks

4056f0c

Declare z_interrupt_stacks as extern. Signed-off-by: Anas Nashif <[email protected]>

soc: espressif: declare z_cstart

336804f

Declare z_cstart as extern as otherwise we will need to pull in kernel_internal.h. Signed-off-by: Anas Nashif <[email protected]>

nashif dismissed stale reviews from cfriedt, uLipe, dcpleung, wmrsouza, marekmatej, and andyross via 336804f August 4, 2025 16:36

nashif force-pushed the topic/kernel/cleanup1 branch from 61932ec to 336804f Compare August 4, 2025 16:36

marekmatej approved these changes Aug 4, 2025

View reviewed changes

wmrsouza approved these changes Aug 4, 2025

View reviewed changes

peter-mitsis reviewed Aug 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Cleanup of init/device and kernel internal headers #93323

Cleanup of init/device and kernel internal headers #93323

nashif commented Jul 18, 2025 •

edited

Loading

Uh oh!

dcpleung commented Jul 31, 2025

Uh oh!

sylvioalves Jul 31, 2025

Uh oh!

andyross left a comment

Uh oh!

marekmatej left a comment

Uh oh!

marekmatej Jul 31, 2025

Uh oh!

cfriedt left a comment

Uh oh!

nashif commented Aug 4, 2025

Uh oh!

sonarqubecloud bot commented Aug 4, 2025

Uh oh!

peter-mitsis Aug 4, 2025

Uh oh!

Uh oh!

Cleanup of init/device and kernel internal headers #93323

Are you sure you want to change the base?

Cleanup of init/device and kernel internal headers #93323

Conversation

nashif commented Jul 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dcpleung commented Jul 31, 2025

Uh oh!

sylvioalves Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

andyross left a comment

Choose a reason for hiding this comment

Uh oh!

marekmatej left a comment

Choose a reason for hiding this comment

Uh oh!

marekmatej Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

cfriedt left a comment

Choose a reason for hiding this comment

Uh oh!

nashif commented Aug 4, 2025

Uh oh!

sonarqubecloud bot commented Aug 4, 2025

Quality Gate passed

Uh oh!

peter-mitsis Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nashif commented Jul 18, 2025 •

edited

Loading