Skip to content

Commit ef646ce

Browse files
[nrf fromtree] openthread: fix logging configuration
Currently, `CONFIG_OPENTHREAD_LOG_LEVEL` is used to set log level in OT and register log modules in Zephyr. OpenThread allows 5 levels, causing issues when `OPENTHREAD_LOG_LEVEL_DEBG` is selected ad we are trying to register modules with unknown lvl. This commit adds `CONFIG_OPENTHREAD_MODULE_LOG_LEVEL` which is aligned for Zephyr's log levels. Signed-off-by: Maciej Baczmanski <[email protected]> (cherry picked from commit 3413595)
1 parent 2d1e173 commit ef646ce

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

modules/openthread/platform/alarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#define LOG_MODULE_NAME net_openthread_alarm
8-
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
8+
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
99

1010
#include <zephyr/logging/log.h>
1111
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

modules/openthread/platform/ble.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/* Zephyr Logging */
3131

3232
#define LOG_MODULE_NAME net_openthread_tcat
33-
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
33+
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
3434

3535
LOG_MODULE_REGISTER(LOG_MODULE_NAME);
3636

modules/openthread/platform/messagepool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <openthread/platform/messagepool.h>
1111

1212
#define LOG_MODULE_NAME net_otPlat_messagepool
13-
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
13+
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
1414

1515
LOG_MODULE_REGISTER(LOG_MODULE_NAME);
1616

modules/openthread/platform/uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
7+
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
88
#define LOG_MODULE_NAME net_otPlat_uart
99

1010
#include <zephyr/logging/log.h>

subsys/net/l2/openthread/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,18 @@ config OPENTHREAD_LOG_LEVEL
9090
default 4 if OPENTHREAD_LOG_LEVEL_INFO
9191
default 5 if OPENTHREAD_LOG_LEVEL_DEBG
9292
default 0
93+
help
94+
Log level for OpenThread stack.
95+
96+
config OPENTHREAD_PLATFORM_LOG_LEVEL
97+
int
98+
default 1 if OPENTHREAD_LOG_LEVEL_CRIT
99+
default 2 if OPENTHREAD_LOG_LEVEL_WARN
100+
default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
101+
default 4 if OPENTHREAD_LOG_LEVEL_DEBG
102+
default 0
103+
help
104+
Log level for OpenThread Zephyr platform.
93105

94106
menuconfig OPENTHREAD_L2_DEBUG
95107
bool "OpenThread L2 log support"

0 commit comments

Comments
 (0)