[Backport v2.7-branch] Fix booting issue with FVP BaseR v8R (version >= 11.16.16) #44806
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
In the Armv8R AArch64 profile[1], the Armv8R AArch64 is always in secure mode. But the FVP_BaseR_AEMv8R before version 11.16.16 doesn't strictly follow this rule. It still has some non-secure registers (e.g. CNTHP_CTL_EL2). Since version 11.16.16, the FVP_BaseR_AEMv8R has fixed this issue. The CNTHP_XXX_EL2 registers have been changed to CNTHPS_XXX_EL2. So the FVP_BaseR_AEMv8R (version >= 11.16.16) cannot boot Zephyr. This patch will fix it. [1] https://developer.arm.com/documentation/ddi0600/latest/ Signed-off-by: Jaxson Han <[email protected]> Change-Id: If986f34dc080ae7a8b226bba589b6fe616a4260b (cherry picked from commit fd231e3)
After the fix of FVP_BaseR_AEMv8R booting issue, the minimum required version of FVP will be 11.16.16. Add an FVP minimal required version check in building time. When the ARMFVP_MIN_VERSION is set in board cmake file, the version check will be enabled and print a warning. Signed-off-by: Jaxson Han <[email protected]> Change-Id: Ibbade0c328b5e91b8830fb35cba6917f08aabbda (cherry picked from commit 3c1f319)
The current minimum required version of "Armv8-R AEM FVP" is 11.16.16. Signed-off-by: Jaxson Han <[email protected]> Change-Id: Iaaf1ec7fd432753371b58d13fdd29b1278f6c997 (cherry picked from commit 3875a1e)
Increase CONFIG_MAX_THREAD_BYTES to 3 to fix the build issue on tests/drivers/build_all/modem/ test case. Signed-off-by: Jaxson Han <[email protected]> Change-Id: I6a26955bdd7e8b176894fa8246aec63a3a3db05f (cherry picked from commit a483828)
zephyrbot
requested review from
nashif,
carlocaione,
tejlmand and
povergoing
as code owners
github-actions
bot
added
area: API
carlocaione
approved these changes
Apr 12, 2022
stephanosio
approved these changes
Apr 12, 2022
povergoing
approved these changes
Apr 13, 2022
cfriedt
approved these changes
Apr 15, 2022
Closed
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.
Backport a483828~4..a483828 from #43309
Fixes #44886