Prepare for dynamic boot configuration #7233
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jenswi-linaro
force-pushed
the
dyn_boot
branch
from
83621b2 to
56fece1
Compare
|
Update to fix the checkpatch issues. |
jforissier
reviewed
Jan 29, 2025
There was a problem hiding this comment.
For " core: arm: entry_a32.S: use ldr over adr":
Reviewed-by: Jerome Forissier <[email protected]>
jenswi-linaro
force-pushed
the
dyn_boot
branch
from
56fece1 to
704c04d
Compare
|
Rebased on master and tag applied. |
jenswi-linaro
force-pushed
the
dyn_boot
branch
from
704c04d to
036ac13
Compare
|
Rebased to resolve a conflict. |
etienne-lms
reviewed
Feb 12, 2025
There was a problem hiding this comment.
Reviewed-by: Etienne Carriere <[email protected]> for commits:
"core: arm: entry_a32.S: use ldr over adr",
"core: thread: get stacks from recorded end-va",
"core: thread: initialize stack canaries from recorded end-va" and
"core: arm32: initialize secure monitor late" (period missing in commit message).
Acked-by: Etienne Carriere <[email protected]> for commit
"core: arm: refactor boot".
core/arch/arm/kernel/boot.c
Outdated
| @@ -1077,14 +1081,7 @@ void __weak boot_init_primary_late(unsigned long fdt __unused, | |||
| thread_set_exceptions(thread_get_exceptions() | | |||
| THREAD_EXCP_NATIVE_INTR); | |||
There was a problem hiding this comment.
Nitpicking: since the rebase operation, would it be worth simplifying the native interrupt unmask sequence here?
boot_primary_init_intc();
init_vfp_nsec();
+ /* Unmask native interrupts during initcalls */
+ thread_set_exceptions(thread_get_exceptions() &
+ ~THREAD_EXCP_NATIVE_INTR);
+
if (!IS_ENABLED(CFG_NS_VIRTUALIZATION)) {
- /* Unmask native interrupts during driver initcalls */
- thread_set_exceptions(thread_get_exceptions() &
- ~THREAD_EXCP_NATIVE_INTR);
init_tee_runtime();
- thread_set_exceptions(thread_get_exceptions() |
- THREAD_EXCP_NATIVE_INTR);
}
if (!IS_ENABLED(CFG_WITH_PAGER))
boot_mem_release_tmp_alloc();
- /* Unmask native interrupts during init/finalcalls */
- thread_set_exceptions(thread_get_exceptions() &
- ~THREAD_EXCP_NATIVE_INTR);
-
if (!IS_ENABLED(CFG_NS_VIRTUALIZATION))
call_driver_initcalls();
call_finalcalls();
IMSG("Primary CPU switching to normal world boot");
thread_set_exceptions(thread_get_exceptions() |
THREAD_EXCP_NATIVE_INTR);
}Likely for a specific commit or P-R.
There was a problem hiding this comment.
Yes, I'll add a commit on top.
Hmm, I just realized that we can't have native interrupts unmasked for virtualization since we're still on the tmp stack then. I'll fix that in the "optimization" commit.
core/kernel/thread.c
Outdated
| @@ -496,6 +516,7 @@ void __nostackcheck thread_init_core_local_stacks(void) | |||
| tcl[n].abt_stack_va_end = GET_STACK_BOTTOM(stack_abt, n); | |||
| } | |||
| } | |||
| #endif | |||
There was a problem hiding this comment.
suggestion: #endif /*CFG_BOOT_INIT_THREAD_CORE_LOCAL0*/
core/kernel/thread.c
Outdated
| @@ -195,20 +229,24 @@ static void print_stack_limits(void) | |||
| size_t n = 0; | |||
| vaddr_t __maybe_unused start = 0; | |||
| vaddr_t __maybe_unused end = 0; | |||
| vaddr_t va; | |||
mk/config.mk
Outdated
| @@ -1265,10 +1265,14 @@ CFG_CORE_UNSAFE_MODEXP ?= n | |||
| CFG_TA_MEBDTLS_UNSAFE_MODEXP ?= n | |||
|
|
|||
| # CFG_BOOT_MEM, when enabled, adds stack like memory allocation during boot. | |||
| # CFG_BOOT_INIT_THREAD_CORE_LOCAL0, when enabled, initialize | |||
There was a problem hiding this comment.
s/initialize/initializes/
Load address of reset_vect_table using ldr r0, =reset_vect_table, instead of adr r0 reset_vect_table to allow longer addressing range. Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Jerome Forissier <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
Introduce CFG_BOOT_INIT_THREAD_CORE_LOCAL0 to indicate that thread_core_local[0] is initialized before the boot_init_* functions are called. thread_init_core_local_stacks() and thread_init_thread_core_local() are replaced by a new version of thread_init_thread_core_local() for CFG_BOOT_INIT_THREAD_CORE_LOCAL0=y. Move initialization of thread_core_local[] from very early to boot_init_primary_late() where various DTBs containing run-time configuration are available. This will be needed in later patches when the number of configured cores can be read from DT or some other run-time configuration. Move the "OP-TEE version" print and following code from boot_init_primary_late() to boot_init_primary_final() Signed-off-by: Jens Wiklander <[email protected]> Acked-by: Etienne Carriere <[email protected]>
Each stack has its end-va or top recorded in either thread_core_local[] or threads[] as tmp_stack_va_end, abt_stack_va_end, or stack_va_end. This address together with the known size of the stack is enough to calculate all the other needed stack related addresses: - start and end canaries, - top and bottom of the stacks. Add and use new internal functions to calculate these addresses and remove the now unused macros. This is needed in later patches where the stacks aren't statically allocated. INIT_CANARY(), GET_START_CANARY(), and GET_END_CANARY() are kept for now to see that the addresses for the canaries are calculated correctly in the new functions. Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
Continue where "core: thread: get stacks from recorded end-va" left and initialize the stack canaries based on the recorded end-va. This is needed in later patches where the stacks aren't statically allocated. Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
Initialize the secure monitor as late as possible before exiting to the normal world. This is needed in later patches where the stacks aren't statically allocated. Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
jenswi-linaro
force-pushed
the
dyn_boot
branch
from
036ac13 to
096e3f2
Compare
|
Comments addressed, and tags applied. Added a new commit, "core: arm: boot: mask native interrupts for virtualization. |
etienne-lms
reviewed
Feb 14, 2025
There was a problem hiding this comment.
Reviewed-by: Etienne Carriere <[email protected]> for commit
"core: arm: boot: mask native interrupts for virtualization".
Native interrupts are prior to this patch unmasked while processing initcalls. This is only permitted if the temporary stack isn't used. That's not true when CFG_NS_VIRTUALIZATION=y so fix this by only unmasking when NS-virtualization isn't enabled. Fixes: 259c34d ("core: arm: boot: enable native interrupts before initcalls") Signed-off-by: Jens Wiklander <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
jenswi-linaro
force-pushed
the
dyn_boot
branch
from
096e3f2 to
f7f3608
Compare
|
Tag applied. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.