STM: Fix heap size formula in scatter files #14133
Merged
Conversation
This file contains hidden or 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
The heap size was incorrectly calculated. This fixes it by subtracting the Stack size, any memory chunks allocated before the start of the application (for vectors and/or crash report), and finally the size of the application from the total RAM size.
ciarmcom
added
the
release-type: patch
|
@hugueskamba, thank you for your changes. |
jeromecoutant
approved these changes
Jan 11, 2021
0xc0170
approved these changes
Jan 11, 2021
|
Ci started |
Jenkins CI Test : ✔️ SUCCESSBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
LDong-Arm
reviewed
Jan 12, 2021
There was a problem hiding this comment.
@hugueskamba
Sorry for the late review. As per my comments, two targets have specially memory layouts, and from my understanding their calculations were correct before this PR.
| } | ||
|
|
||
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { | ||
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { |
There was a problem hiding this comment.
This target has a very different memory layout - in fact, it has two RAMs at two distinct locations (see all lines above):
- RAM1 (address: MBED_RAM_START, size: MBED_RAM_SIZE):
- some part of static memory (see comment at line 88)
- heap (what we are calculating here)
- stack (== RAM_FIXED_SIZE, defined at line 86)
- RAM2 (address: MBED_RAM2_START, size: MBED_RAM2_SIZE):
- vector
- crash report
- remaining part of static memory (that didn't fit into RAM1), starting at MBED_IRAM2_START (they call that...)
So the old calculation was correct for this particular target.
Suggested change
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { | |
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { |
| } | ||
|
|
||
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up | ||
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up |
There was a problem hiding this comment.
Similarly, this targets has two RAMs at two distinct locations. Some of the macros are defined in https://github.com/ARMmbed/mbed-os/blob/mbed-os-6.6.0/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/cmsis_nvic.h
See my other comment. I think the old calculation is correct here.
Suggested change
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_IRAM2_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up | |
| ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { ; Heap growing up |
mbedmain
added
release-version: 6.7.0
Release-pending
and removed
release-type: patch
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.
Summary of changes
The heap size was incorrectly calculated.
This fixes it by subtracting the Stack size, any memory chunks allocated
before the start of the application (for vectors and/or crash report), and
finally the size of the application from the total RAM size.
Impact of changes
Migration actions required
Documentation
Pull request type
Test results
Reviewers