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

HEAP configuration related change #82903

Merged
merged 5 commits into from
Dec 16, 2024
Merged

HEAP configuration related change #82903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
749e48e
drivers: wifi: nxp: add heap for NXP Wi-Fi
MaochenWang1 Dec 11, 2024
0702b42
hostap: increase the default heap size of hostapd case
MaochenWang1 Dec 11, 2024
b6bfeac
samples: wifi: shell: remove CONFIG_HEAP_MEM_POOL_SIZE for RW612
MaochenWang1 Dec 11, 2024
bef518c
net: sockets: choose SOCKETPAIR_HEAP when MEM_POOL enabled
MaochenWang1 Dec 11, 2024
f86f1f3
samples: wifi: shell: use MBEDTLS_ENABLE_HEAP for RW612
MaochenWang1 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/wifi/nxp/Kconfig.nxp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ if WIFI_NXP

module = WIFI_NXP

config HEAP_MEM_POOL_ADD_SIZE_NXP_WIFI
def_int 25984 if WIFI_NM_WPA_SUPPLICANT
def_int 51200

config WIFI_MGMT_SCAN_CHAN_MAX_MANUAL
default 50

Expand Down
3 changes: 2 additions & 1 deletion modules/hostap/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ if WIFI_NM_WPA_SUPPLICANT

config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
def_int 85000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE && !MBEDTLS_ENABLE_HEAP
def_int 40000 if WIFI_NM_WPA_SUPPLICANT_AP || WIFI_NM_HOSTAPD_AP
def_int 85000 if WIFI_NM_HOSTAPD_AP
def_int 40000 if WIFI_NM_WPA_SUPPLICANT_AP
# 8192 for MbedTLS heap
def_int 21808 if MBEDTLS_ENABLE_HEAP
# 30K is mandatory, but might need more for long duration use cases
Expand Down
1 change: 0 additions & 1 deletion samples/net/wifi/shell/boards/frdm_rw612.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ CONFIG_LOG_PRINTK=n
CONFIG_THREAD_CUSTOM_DATA=y
CONFIG_EVENTS=y
CONFIG_SYS_HEAP_AUTO=y
CONFIG_HEAP_MEM_POOL_SIZE=122880
CONFIG_SCHED_MULTIQ=y
CONFIG_ZVFS_OPEN_MAX=30

Expand Down
4 changes: 3 additions & 1 deletion samples/net/wifi/shell/boards/overlay_hostap_rw612.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ CONFIG_ENTROPY_GENERATOR=y
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
CONFIG_MBEDTLS_ENTROPY_C=y
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=80000
# mbedtls heap for enterprise case
CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=69952

#priority
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
Expand Down
1 change: 0 additions & 1 deletion samples/net/wifi/shell/boards/rd_rw612_bga.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ CONFIG_LOG_PRINTK=n
CONFIG_THREAD_CUSTOM_DATA=y
CONFIG_EVENTS=y
CONFIG_SYS_HEAP_AUTO=y
CONFIG_HEAP_MEM_POOL_SIZE=122880
CONFIG_SCHED_MULTIQ=y
CONFIG_ZVFS_OPEN_MAX=30

Expand Down
2 changes: 1 addition & 1 deletion subsys/net/lib/sockets/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ config NET_SOCKETPAIR_BUFFER_SIZE

choice
prompt "Memory management for socketpair"
default NET_SOCKETPAIR_HEAP if HEAP_MEM_POOL_SIZE != 0
default NET_SOCKETPAIR_HEAP if KERNEL_MEM_POOL

config NET_SOCKETPAIR_STATIC
bool "Pre-allocate memory statically"
Expand Down
Loading