Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix libc heap size calculation for ESP32, use heap adapter #84331

Merged
merged 3 commits into from
Feb 5, 2025
Merged

Fix libc heap size calculation for ESP32, use heap adapter #84331

merged 3 commits into from
Feb 5, 2025

Conversation

marekmatej
Copy link

@marekmatej marekmatej commented Jan 21, 2025 •
edited
Loading

This PR:

  • fixes the libc heap allocation for ESP32 chips
  • remove ESP heap and transform the heap adapter
  • use kernel heap by default in RF stacks

@zephyrbot zephyrbot added area: C Library C Standard Library size: XS A PR changing only a single line of code labels Jan 21, 2025
thedjnK
thedjnK requested changes Jan 21, 2025
View reviewed changes
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 3142fc0 to 853dbfe Compare January 22, 2025 23:14
@zephyrbot zephyrbot added the platform: ESP32 Espressif ESP32 label Jan 22, 2025
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 853dbfe to 851f3ab Compare January 22, 2025 23:18
@marekmatej marekmatej changed the title libc: common: Kconfig Fix system heap size calc for ESP32 and separate it from the ESP heap Jan 22, 2025
wmrsouza
wmrsouza previously approved these changes Jan 23, 2025
View reviewed changes
@marekmatej marekmatej requested a review from thedjnK January 23, 2025 11:03
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 851f3ab to de5e46b Compare January 23, 2025 14:19
thedjnK
thedjnK previously approved these changes Jan 25, 2025
View reviewed changes
@marekmatej marekmatej removed the size: XS A PR changing only a single line of code label Jan 25, 2025
wmrsouza
wmrsouza previously approved these changes Jan 26, 2025
View reviewed changes
sylvioalves
sylvioalves previously approved these changes Jan 28, 2025
View reviewed changes
@marekmatej marekmatej dismissed stale reviews from sylvioalves, wmrsouza, and thedjnK via 9debbfd January 29, 2025 13:33
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from de5e46b to 9debbfd Compare January 29, 2025 13:33
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch 3 times, most recently from f4e0e99 to 8d16387 Compare January 30, 2025 16:47
@marekmatej marekmatej marked this pull request as ready for review January 30, 2025 21:22
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 8d16387 to 500adf2 Compare January 31, 2025 13:26
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Jan 31, 2025
@marekmatej
Copy link
Author

@stephanosio can you PTAL

@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 500adf2 to e50546c Compare January 31, 2025 14:48
uLipe
uLipe previously approved these changes Feb 3, 2025
View reviewed changes
cfriedt
cfriedt previously approved these changes Feb 4, 2025
View reviewed changes
Marek Matej added 2 commits February 4, 2025 20:01
manifest: update hal_espressif
4a63780 
Use proper hal version.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
lib: libc: malloc.c: fix calculation of sys heap
af16c98 
Change the condition so that ESP32 SoCs are using `_heap_sentry` to
get actual run-time heap size.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
@marekmatej marekmatej dismissed stale reviews from cfriedt and uLipe via 7bb8cd2 February 4, 2025 19:01
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from e50546c to 7bb8cd2 Compare February 4, 2025 19:01
soc: espressif: Remove ESP heap and use heap adapter
dbc7fca 
Remove ESP heap from the sources. System heap is default heap.
Use heap adapter layer to configure used heap.
Use MEM_POOL memory request config to Wi-Fi and Bluetooth drivers.
Update the Wi-Fi and BLE memory needs.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
@marekmatej marekmatej force-pushed the bugfix/libc_malloc_arena_size branch from 7bb8cd2 to dbc7fca Compare February 4, 2025 19:03
@marekmatej marekmatej requested review from cfriedt and uLipe February 4, 2025 19:23
@sylvioalves sylvioalves mentioned this pull request Feb 5, 2025
Open
@marekmatej marekmatej assigned sylvioalves and unassigned stephanosio Feb 5, 2025
@kartben kartben merged commit 6e6ab2f into zephyrproject-rtos:main Feb 5, 2025
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uLipe uLipe uLipe approved these changes

@sylvioalves sylvioalves sylvioalves approved these changes

@aescolar aescolar Awaiting requested review from aescolar

@keith-packard keith-packard Awaiting requested review from keith-packard

@nashif nashif Awaiting requested review from nashif

@stephanosio stephanosio Awaiting requested review from stephanosio

@LucasTambor LucasTambor Awaiting requested review from LucasTambor

@raffarost raffarost Awaiting requested review from raffarost

@jukkar jukkar Awaiting requested review from jukkar

@Kludentwo Kludentwo Awaiting requested review from Kludentwo

@rlubos rlubos Awaiting requested review from rlubos

@wmrsouza wmrsouza Awaiting requested review from wmrsouza

@thedjnK thedjnK Awaiting requested review from thedjnK

@cfriedt cfriedt Awaiting requested review from cfriedt

Assignees

@sylvioalves sylvioalves

Labels
area: Bluetooth HCI Bluetooth HCI Driver area: Bluetooth area: C Library C Standard Library area: Wi-Fi Wi-Fi manifest manifest-hal_espressif platform: ESP32 Espressif ESP32
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@marekmatej @zephyrbot @cfriedt @thedjnK @uLipe @sylvioalves @wmrsouza @kartben @stephanosio