kernel: prioritize C atomic functions if selected #33964
Merged
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
Xtensa cores are highly configurable so each SoC may not have the needed instructions for the hardware assisted atomic operations. So instead of selecting the arch-specific atomic operations kconfig, do a "imply" instead. So SoC or board configs can disable this. Signed-off-by: Daniel Leung <[email protected]>
The builtin atomic header file should not include the syscall header that is generated from C version of atomic functions. Signed-off-by: Daniel Leung <[email protected]>
dcpleung
requested review from
andyross,
carlescufi,
galak,
MaureenHelm and
nashif
as code owners
Usually, GCC builtin or arch-specific atomic functions are being used. The corresponding kconfigs are "selected" by architecture or SoC kconfigs. CONFIG_ATOMIC_OPERATIONS_C is usually used to override the GCC built-in or arch-specific atomic functions when these two are not supported. So change the priority of #include so that C version is included first if selected, and skips the inline versions of the other two variants. Or else there will be two compiled versions of atomic functions: inline version and the compiled C version. Note that the arch-specific version and builtin are swapped, so the builtin one is now the default. Fixes zephyrproject-rtos#33857 Signed-off-by: Daniel Leung <[email protected]>
dcpleung
force-pushed
the
kconfig_atomics
branch
from
23aedf5
to
ae14ccf
Compare
andyross
approved these changes
Apr 1, 2021
nashif
approved these changes
Apr 2, 2021
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.
Usually, GCC builtin or arch-specific atomic functions are being used. The corresponding kconfigs are "selected" by architecture
or SoC kconfigs. CONFIG_ATOMIC_OPERATIONS_C is usually used to override the GCC built-in or arch-specific atomic unctions when these two are not supported. So change the priority of #include so that C version is included first if selected, and skips the inline versions of the other two variants. Or else there will be two compiled versions of atomic functions: inline version and the compiled C version.
Also remove the incorrectly included generated syscall header in
atomic_builtin.h, and changesCONFIG_ATOMIC_OPERATIONS_ARCHtoimplyfor Xtensa.Fixes #33857