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

arch: Migrate to new logging subsys #9361

Closed
wants to merge 1 commit into from
Closed

arch: Migrate to new logging subsys #9361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions arch/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,32 @@ config SIMPLE_FATAL_ERROR_HANDLER
for footprint-concerned systems. Only enable this option if you do not
want debug capabilities in case of system fatal error.

choice
prompt "Architecture logging level"
default ARCH_LOG_LEVEL_DBG

config ARCH_LOG_LEVEL_OFF
bool "Off"
config ARCH_LOG_LEVEL_ERR
bool "Error"
config ARCH_LOG_LEVEL_WRN
bool "Warning"
config ARCH_LOG_LEVEL_INF
bool "Info"
config ARCH_LOG_LEVEL_DBG
bool "Debug"

endchoice

config ARCH_LOG_LEVEL
int
default 0 if ARCH_LOG_LEVEL_OFF
default 1 if ARCH_LOG_LEVEL_ERR
default 2 if ARCH_LOG_LEVEL_WRN
default 3 if ARCH_LOG_LEVEL_INF
default 4 if ARCH_LOG_LEVEL_DBG


menu "Interrupt Configuration"
#
# Interrupt related configs
Expand Down
10 changes: 7 additions & 3 deletions arch/arm/core/cortex_m/mpu/arm_core_mpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
#include <soc.h>
#include <arch/arm/cortex_m/cmsis.h>
#include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
#include <logging/sys_log.h>

#define LOG_MODULE_NAME arm_core_mpu
#define LOG_LEVEL CONFIG_ARCH_LOG_LEVEL
#include <logging/log.h>
LOG_MODULE_REGISTER();

#if defined(CONFIG_MPU_STACK_GUARD)
/*
Expand Down Expand Up @@ -50,7 +54,7 @@ void configure_mpu_stack_guard(struct k_thread *thread)
*/
void configure_mpu_user_context(struct k_thread *thread)
{
SYS_LOG_DBG("configure user thread %p's context", thread);
LOG_DBG("configure user thread %p's context", thread);
arm_core_mpu_disable();
arm_core_mpu_configure_user_context(thread);
arm_core_mpu_enable();
Expand All @@ -66,7 +70,7 @@ void configure_mpu_user_context(struct k_thread *thread)
*/
void configure_mpu_mem_domain(struct k_thread *thread)
{
SYS_LOG_DBG("configure thread %p's domain", thread);
LOG_DBG("configure thread %p's domain", thread);
arm_core_mpu_disable();
arm_core_mpu_configure_mem_domain(thread->mem_domain_info.mem_domain);
arm_core_mpu_enable();
Expand Down
27 changes: 15 additions & 12 deletions arch/arm/core/cortex_m/mpu/arm_mpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@
#include <arch/arm/cortex_m/cmsis.h>
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
#include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
#include <logging/sys_log.h>
#include <linker/linker-defs.h>

#define LOG_MODULE_NAME arm_mpu
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder if there is point to create to independent instances (arm_mpu and arm_core_mpu). If they are always working together then it can be just arm_mpu (see http://docs.zephyrproject.org/subsystems/logging/logger.html#usage for details how to declare a multi-file module).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nordic-krch arm_mpu, or nxp_mpu are the MPU drivers, while arm_core_mpu is the high-level memory protection module that can work with both drivers

#include <logging/log.h>
LOG_MODULE_REGISTER();

/**
* Get the number of supported MPU regions.
*/
Expand Down Expand Up @@ -48,7 +51,7 @@ static void _region_init(u32_t index, struct arm_mpu_region *region_conf)
MPU->RBAR = (region_conf->base & MPU_RBAR_ADDR_Msk)
| MPU_RBAR_VALID_Msk | index;
MPU->RASR = region_conf->attr | MPU_RASR_ENABLE_Msk;
SYS_LOG_DBG("[%d] 0x%08x 0x%08x",
LOG_DBG("[%d] 0x%08x 0x%08x",
index, region_conf->base, region_conf->attr);
}

Expand Down Expand Up @@ -202,7 +205,7 @@ static inline void _disable_region(u32_t r_index)
"Index 0x%x out-of-bound (supported regions: 0x%x)\n",
r_index,
_get_num_regions());
SYS_LOG_DBG("disable region 0x%x", r_index);
LOG_DBG("disable region 0x%x", r_index);
/* Disable region */
ARM_MPU_ClrRegion(r_index);
}
Expand Down Expand Up @@ -269,7 +272,7 @@ void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
{
struct arm_mpu_region region_conf;

SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
LOG_DBG("Region info: 0x%x 0x%x", base, size);
u32_t region_index = _get_region_index_by_type(type);
region_conf.attr = _get_region_attr_by_type(type, size);
region_conf.base = base;
Expand Down Expand Up @@ -309,19 +312,19 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
struct arm_mpu_region region_conf;

if (mem_domain) {
SYS_LOG_DBG("configure domain: %p", mem_domain);
LOG_DBG("configure domain: %p", mem_domain);
num_partitions = mem_domain->num_partitions;
pparts = mem_domain->partitions;
} else {
SYS_LOG_DBG("disable domain partition regions");
LOG_DBG("disable domain partition regions");
num_partitions = 0;
pparts = NULL;
}

for (; region_index < _get_num_regions(); region_index++) {
if (num_partitions && pparts->size) {
SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index, pparts->start, pparts->size);
LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index, pparts->start, pparts->size);
region_conf.base = pparts->start;
region_conf.attr =
_get_region_attr_by_conf(pparts->attr,
Expand All @@ -348,12 +351,12 @@ void arm_core_mpu_configure_mem_partition(u32_t part_index,
_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
struct arm_mpu_region region_conf;

SYS_LOG_DBG("configure partition index: %u", part_index);
LOG_DBG("configure partition index: %u", part_index);

if (part &&
(region_index + part_index < _get_num_regions())) {
SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index + part_index, part->start, part->size);
LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index + part_index, part->start, part->size);
region_conf.attr =
_get_region_attr_by_conf(part->attr, part->size);
region_conf.base = part->start;
Expand Down Expand Up @@ -477,7 +480,7 @@ static int arm_mpu_init(struct device *arg)
return -1;
}

SYS_LOG_DBG("total region count: %d", _get_num_regions());
LOG_DBG("total region count: %d", _get_num_regions());

arm_core_mpu_disable();

Expand Down
34 changes: 16 additions & 18 deletions arch/arm/core/cortex_m/mpu/nxp_mpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
#include <soc.h>
#include <arch/arm/cortex_m/cmsis.h>
#include <arch/arm/cortex_m/mpu/nxp_mpu.h>
#include <logging/sys_log.h>
#include <misc/__assert.h>
#include <linker/linker-defs.h>

#define LOG_MODULE_NAME nxp_mpu
#define LOG_LEVEL CONFIG_ARCH_LOG_LEVEL
#include <logging/log.h>
LOG_MODULE_REGISTER();

/* NXP MPU Enabled state */
static u8_t nxp_mpu_enabled;

Expand Down Expand Up @@ -92,7 +96,7 @@ static void _region_init(u32_t index, u32_t region_base,
SYSMPU->WORD[index][3] = SYSMPU_WORD_VLD_MASK;
}

SYS_LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x", index,
LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x", index,
SYSMPU->WORD[index][0],
SYSMPU->WORD[index][1],
SYSMPU->WORD[index][2],
Expand Down Expand Up @@ -225,7 +229,7 @@ void arm_core_mpu_disable(void)
*/
void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
{
SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
LOG_DBG("Region info: 0x%x 0x%x", base, size);
u32_t region_index = _get_region_index_by_type(type);
u32_t region_attr = _get_region_attr_by_type(type);

Expand Down Expand Up @@ -265,11 +269,11 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
struct k_mem_partition *pparts;

if (mem_domain) {
SYS_LOG_DBG("configure domain: %p", mem_domain);
LOG_DBG("configure domain: %p", mem_domain);
num_partitions = mem_domain->num_partitions;
pparts = mem_domain->partitions;
} else {
SYS_LOG_DBG("disable domain partition regions");
LOG_DBG("disable domain partition regions");
num_partitions = 0;
pparts = NULL;
}
Expand All @@ -280,15 +284,15 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
*/
for (; region_index < _get_num_usable_regions(); region_index++) {
if (num_partitions && pparts->size) {
SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index, pparts->start, pparts->size);
region_attr = pparts->attr;
_region_init(region_index, pparts->start,
ENDADDR_ROUND(pparts->start+pparts->size),
region_attr);
num_partitions--;
} else {
SYS_LOG_DBG("disable region 0x%x", region_index);
LOG_DBG("disable region 0x%x", region_index);
/* Disable region */
SYSMPU->WORD[region_index][0] = 0;
SYSMPU->WORD[region_index][1] = 0;
Expand All @@ -312,17 +316,17 @@ void arm_core_mpu_configure_mem_partition(u32_t part_index,
_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
u32_t region_attr;

SYS_LOG_DBG("configure partition index: %u", part_index);
LOG_DBG("configure partition index: %u", part_index);

if (part) {
SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
LOG_DBG("set region 0x%x 0x%x 0x%x",
region_index + part_index, part->start, part->size);
region_attr = part->attr;
_region_init(region_index + part_index, part->start,
ENDADDR_ROUND(part->start + part->size),
region_attr);
} else {
SYS_LOG_DBG("disable region 0x%x", region_index);
LOG_DBG("disable region 0x%x", region_index);
/* Disable region */
SYSMPU->WORD[region_index + part_index][0] = 0;
SYSMPU->WORD[region_index + part_index][1] = 0;
Expand All @@ -341,7 +345,7 @@ void arm_core_mpu_mem_partition_remove(u32_t part_index)
u32_t region_index =
_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);

SYS_LOG_DBG("disable region 0x%x", region_index);
LOG_DBG("disable region 0x%x", region_index);
/* Disable region */
SYSMPU->WORD[region_index + part_index][0] = 0;
SYSMPU->WORD[region_index + part_index][1] = 0;
Expand Down Expand Up @@ -424,7 +428,7 @@ static void _nxp_mpu_config(void)

__ASSERT(mpu_config.num_regions <= _get_num_regions(),
"too many static MPU regions defined");
SYS_LOG_DBG("total region count: %d", _get_num_regions());
LOG_DBG("total region count: %d", _get_num_regions());

/* Disable MPU */
SYSMPU->CESR &= ~SYSMPU_CESR_VLD_MASK;
Expand Down Expand Up @@ -491,11 +495,5 @@ static int nxp_mpu_init(struct device *arg)
return 0;
}

#if defined(CONFIG_SYS_LOG)
/* To have logging the driver needs to be initialized later */
SYS_INIT(nxp_mpu_init, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#else
SYS_INIT(nxp_mpu_init, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#endif