Skip to content

Commit 27b8143

Browse files
axelnxpaxelnxp
authored
[NXP][zephyr] Updates to NXP Zephyr platform enablement (project-chip#31823)
* Fix duplicate definition of recvmsg on latest zephyr tree * Remove redundant config flags * Configure event queue size to 64 * Remove recovery mechanism in wifi implementation * Always enable CHIP_FACTORY_RESET_ERASE_NVS * Update net configuration for wifi Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com>
1 parent 91ba8b6 commit 27b8143

File tree

7 files changed

+86
-170
lines changed

7 files changed

+86
-170
lines changed

‎config/nxp/chip-module/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ endif #CHIP_FACTORY_DATA_BUILD
208208
# See config/zephyr/Kconfig for full definition
209209
config CHIP_FACTORY_RESET_ERASE_NVS
210210
bool
211-
default y if CHIP_FACTORY_DATA || CHIP_FACTORY_DATA_CUSTOM_BACKEND
211+
default y
212212

213213
endif
214214

‎config/nxp/chip-module/Kconfig.defaults

+37-7
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ config PTHREAD_IPC
8787

8888
config POSIX_MAX_FDS
8989
int
90-
default 16
90+
default 8
9191

9292
# Application stack size
9393
config MAIN_STACK_SIZE
@@ -99,12 +99,21 @@ config INIT_STACKS
9999
config NET_MGMT_EVENT_STACK_SIZE
100100
default 2048
101101

102+
config NET_MGMT_EVENT_QUEUE_SIZE
103+
default 20
104+
102105
config NET_IPV6_MLD
103106
default y
104107

105108
config NET_IF_MCAST_IPV6_ADDR_COUNT
106109
default 14
107110

111+
config NET_IF_MAX_IPV4_COUNT
112+
default 2
113+
114+
config NET_IF_MAX_IPV6_COUNT
115+
default 2
116+
108117
config NET_TC_TX_COUNT
109118
default 1
110119

@@ -129,10 +138,10 @@ config NET_TC_RX_THREAD_BASE_PRIO
129138

130139
# Network buffers
131140
config NET_PKT_RX_COUNT
132-
default 16
141+
default 60
133142

134143
config NET_PKT_TX_COUNT
135-
default 16
144+
default 40
136145

137146
config NET_BUF_RX_COUNT
138147
default 60
@@ -141,7 +150,7 @@ config NET_BUF_TX_COUNT
141150
default 80
142151

143152
config NET_BUF_DATA_SIZE
144-
default 1700
153+
default 1744
145154

146155
# Bluetooth Low Energy configs
147156

@@ -233,11 +242,14 @@ choice WPA_SUPP_LOG_LEVEL_CHOICE
233242
endchoice
234243

235244
config WPA_SUPP_THREAD_STACK_SIZE
236-
default 6144
245+
default 12288
237246

238247
config SYSTEM_WORKQUEUE_STACK_SIZE
239248
default 2048
240249

250+
config NET_TCP_WORKQ_STACK_SIZE
251+
default 2048
252+
241253
# align these numbers to match the OpenThread config
242254
config NET_IF_UNICAST_IPV6_ADDR_COUNT
243255
default 6
@@ -246,7 +258,25 @@ config NET_IF_MCAST_IPV6_ADDR_COUNT
246258
default 8
247259

248260
config NET_SOCKETS_POLL_MAX
249-
default 4
261+
default 8
262+
263+
config NET_IPV4_FRAGMENT_MAX_COUNT
264+
default 3
265+
266+
config NET_IPV4_FRAGMENT_MAX_PKT
267+
default 7
268+
269+
config NET_IPV4_FRAGMENT_TIMEOUT
270+
default 3
271+
272+
config NET_IPV6_FRAGMENT_MAX_COUNT
273+
default 3
274+
275+
config NET_IPV6_FRAGMENT_MAX_PKT
276+
default 7
277+
278+
config NET_IPV6_FRAGMENT_TIMEOUT
279+
default 3
250280

251281
# options managed by IP4/IP6 simultaneous support
252282
# aligned here to match OpenThread config
@@ -260,7 +290,7 @@ config SHELL_STACK_SIZE
260290
default 2616
261291

262292
config HEAP_MEM_POOL_SIZE
263-
default 65536
293+
default 122880
264294

265295
config CHIP_MALLOC_SYS_HEAP_SIZE
266296
default 28672 # 28 kB

‎src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h

+15-60
Original file line numberDiff line numberDiff line change
@@ -27,74 +27,31 @@
2727

2828
// ==================== Platform Adaptations ====================
2929

30-
#ifndef CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
31-
#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
32-
#endif
33-
34-
#ifndef CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE
35-
#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
36-
#endif
37-
38-
#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION
39-
#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
40-
#endif
41-
42-
#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
43-
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE
44-
#endif
45-
46-
#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR
47-
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
48-
#endif
49-
50-
#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING
51-
#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
52-
#endif
53-
54-
#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT
55-
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
56-
#endif
57-
58-
#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT
59-
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
60-
#endif
61-
62-
#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER
63-
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
64-
#endif
65-
66-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
6730
#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID CONFIG_CHIP_DEVICE_VENDOR_ID
68-
#endif
69-
70-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
71-
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
72-
#endif
73-
74-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME
7531
#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME CONFIG_CHIP_DEVICE_VENDOR_NAME
76-
#endif
77-
78-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME
32+
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
7933
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME CONFIG_CHIP_DEVICE_PRODUCT_NAME
80-
#endif
81-
82-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
34+
#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
35+
#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
8336
#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
84-
#endif
85-
86-
#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
8737
#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
88-
#endif
38+
#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
39+
#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
40+
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
41+
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
42+
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE
43+
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
44+
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
45+
#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
8946

9047
#ifdef CONFIG_NET_L2_OPENTHREAD
9148
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
9249
#else
9350
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
9451
#endif
9552

96-
#ifdef CONFIG_WIFI_NXP
97-
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NXP
53+
#ifdef CONFIG_CHIP_WIFI
54+
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_CHIP_WIFI
9855
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
9956
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
10057
#else
@@ -155,6 +112,8 @@
155112
#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192
156113
#endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
157114

115+
#define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 64
116+
158117
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
159118
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
160119
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
@@ -197,10 +156,6 @@
197156
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
198157
#endif // CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE
199158

200-
#ifdef CONFIG_CHIP_DEVICE_TYPE
201-
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
202-
#endif // CONFIG_CHIP_DEVICE_TYPE
203-
204159
#ifdef CONFIG_CHIP_EXTENDED_DISCOVERY
205160
#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
206161
#endif // CONFIG_CHIP_EXTENDED_DISCOVERY

‎src/platform/nxp/zephyr/SystemPlatformConfig.h

+2
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@
2525
#pragma once
2626

2727
#include <platform/Zephyr/SystemPlatformConfig.h>
28+
29+
#define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS 0

‎src/platform/nxp/zephyr/wifi/NxpWifiDriver.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ CHIP_ERROR NxpWifiDriver::CommitConfiguration()
147147

148148
CHIP_ERROR NxpWifiDriver::RevertConfiguration()
149149
{
150-
// Abort Connection Recovery if it is in progress during reverting configuration.
151-
// This is needed to stop recovery process after failsafe timer expiring.
152-
WiFiManager::Instance().AbortConnectionRecovery();
153-
154150
LoadFromStorage();
155151

156152
if (WiFiManager::StationStatus::CONNECTING <= WiFiManager::Instance().GetStationStatus())

0 commit comments

Comments
 (0)