Fix WiFi allocation in SPIRAM on ESP32 and ESP32-S3 #82870
Merged
+87
−22
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
|
The following west manifest projects have changed revision in this Pull Request:
✅ All manifest checks OK Note: This message is automatically posted and updated by the Manifest GitHub Action. |
marekmatej
force-pushed
the
bugfix/memory_spiram_esp32s3
branch
from
e309224 to
dd178e7
Compare
marekmatej
changed the title
marekmatej
force-pushed
the
bugfix/memory_spiram_esp32s3
branch
from
dd178e7 to
3a8267a
Compare
added 3 commits
December 12, 2024 17:07
Fix allocations of large buffers if SPIRAM and WiFi alloc to SPIRAM are both enabled. Signed-off-by: Marek Matej <[email protected]>
Fix the allocations if the SPIRAM and WiFi alloc to SPIRAM are both enabled. Signed-off-by: Marek Matej <[email protected]>
Rename psram.c -> esp_psram.c to align with the naming conventions. Signed-off-by: Marek Matej <[email protected]>
marekmatej
force-pushed
the
bugfix/memory_spiram_esp32s3
branch
from
3a8267a to
fa55140
Compare
zephyrbot
requested review from
LucasTambor,
raffarost,
sylvioalves,
uLipe and
wmrsouza
sylvioalves
reviewed
Dec 12, 2024
wmrsouza
approved these changes
Dec 12, 2024
sylvioalves
reviewed
Dec 13, 2024
sylvioalves
approved these changes
Dec 13, 2024
sylvioalves
reviewed
Dec 13, 2024
Comment on lines
+685
to
+703
| #ifdef CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM | ||
| *(EXCLUDE_FILE( | ||
| *libdrivers__wifi.a:* | ||
| *libsubsys__net__l2__ethernet.a:* | ||
| *libsubsys__net__lib__config.a:* | ||
| *libsubsys__net__ip.a:* | ||
| *libsubsys__net.a:* ) .noinit) | ||
| *(EXCLUDE_FILE( | ||
| *libdrivers__wifi.a:* | ||
| *libsubsys__net__l2__ethernet.a:* | ||
| *libsubsys__net__lib__config.a:* | ||
| *libsubsys__net__ip.a:* | ||
| *libsubsys__net.a:* ) .noinit.*) | ||
| #else | ||
| *(.noinit) | ||
| *(.noinit.*) | ||
| . = ALIGN (8); | ||
| #endif /* CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM */ | ||
| __dram_noinit_end = ABSOLUTE(.); | ||
| . = ALIGN (4); |
There was a problem hiding this comment.
There is something wrong with this logic. In case CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM is defined, it should only exclude the net/wifi stuff. Currently, it is also not adding .noinit data at all. Is that right?
There was a problem hiding this comment.
It excludes the noinit and noinit.* sections for object files matching the pattern. If the SPIRAM alloc is not defined it spills noinit and noinit.* without exceptions.
raffarost
approved these changes
Dec 13, 2024
uLipe
approved these changes
Dec 13, 2024
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.
This PR fixes the ESP32 and ESP32S3 linker in case when CONFIG_SPIRAM and CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM are both enabled. This frees the space in the internal DRAM.
Fixes #74675