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

Add the DT_MEMORY_ATTR_ defines #60874

Closed
wants to merge 2 commits into from
Closed

Add the DT_MEMORY_ATTR_ defines #60874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a1508
dt-bindings: Add memory-attr DT defines
carlocaione Jul 27, 2023
66bfbb7
shared_multi_heap: Use the DT_MEMORY_ATTR_* defines
carlocaione Jul 27, 2023
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
3 changes: 3 additions & 0 deletions dts/bindings/base/zephyr,memory-attr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

include: [base.yaml]

# XXX: This list MUST be kept in sync with
# include/zephyr/dt-bindings/memory-attr/memory-attr.h

properties:
zephyr,memory-attr:
type: string
Expand Down
25 changes: 25 additions & 0 deletions include/zephyr/dt-bindings/memory-attr/memory-attr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (c) 2023 Carlo Caione <ccaione@baylibre.com>
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_H_
#define ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_H_

/* Ideally we'd generate this enum to match what's coming out of the YAML,
* however, we dont have a good way to know how to name such an enum from the
* generation point of view, so for now we just hand code the enum. This
* enum is expected to match the order in the yaml (dts/bindings/base/zephyr,memory-attr.yaml)
*/

enum dt_memory_attr {
DT_MEMORY_ATTR_RAM,
DT_MEMORY_ATTR_RAM_NOCACHE,
DT_MEMORY_ATTR_FLASH,
DT_MEMORY_ATTR_PPB,
Copy link
Collaborator

Choose a reason for hiding this comment

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

ppb? maybe add a comment, since I've got no clue what PPB is ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@galak replying here also for the other comment.

Agree, naming and description is a big issue here. @manuargue will be taking care of that soon, see #60049 (review) and #60049 (comment) but I think we are forced to live with it for a little while, but cleaning up is already planned I swear :)

DT_MEMORY_ATTR_IO,
DT_MEMORY_ATTR_EXTMEM,
Copy link
Collaborator

Choose a reason for hiding this comment

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

what is extmem suppose to mean? How does it differ from RAM?

DT_MEMORY_ATTR_UNKNOWN, /* must be last */
};

#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_H_ */
13 changes: 7 additions & 6 deletions tests/kernel/mem_heap/shared_multi_heap/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <zephyr/ztest.h>
#include <zephyr/linker/linker-defs.h>
#include <zephyr/sys/mem_manage.h>
#include <zephyr/dt-bindings/memory-attr/memory-attr.h>

#include <zephyr/multi_heap/shared_multi_heap.h>

Expand All @@ -28,7 +29,7 @@ struct region_map {
.addr = (uintptr_t) DT_INST_REG_ADDR(n), \
.size = DT_INST_REG_SIZE(n), \
.attr = DT_INST_ENUM_IDX_OR(n, zephyr_memory_attr, \
SMH_REG_ATTR_NUM), \
DT_MEMORY_ATTR_UNKNOWN), \
}, \
},

Expand Down Expand Up @@ -66,7 +67,7 @@ static struct region_map *get_region_map(void *v_addr)
return NULL;
}

static inline enum shared_multi_heap_attr mpu_to_reg_attr(int mpu_attr)
static inline enum shared_multi_heap_attr mpu_to_reg_attr(enum dt_memory_attr dt_attr)
{
/*
* All the memory regions defined in the DT with the MPU property `RAM`
Expand All @@ -82,10 +83,10 @@ static inline enum shared_multi_heap_attr mpu_to_reg_attr(int mpu_attr)
* RAM -> SMH_REG_ATTR_CACHEABLE
* RAM_NOCACHE -> SMH_REG_ATTR_NON_CACHEABLE
*/
switch (mpu_attr) {
case 0: /* RAM */
switch (dt_attr) {
case DT_MEMORY_ATTR_RAM:
return SMH_REG_ATTR_CACHEABLE;
case 1: /* RAM_NOCACHE */
case DT_MEMORY_ATTR_RAM_NOCACHE:
return SMH_REG_ATTR_NON_CACHEABLE;
default:
/* How ? */
Expand All @@ -104,7 +105,7 @@ static void fill_multi_heap(void)
reg_map = &map[idx];

/* zephyr,memory-attr property not found. Skip it. */
if (reg_map->region.attr == SMH_REG_ATTR_NUM) {
if (reg_map->region.attr == DT_MEMORY_ATTR_UNKNOWN) {
continue;
}

Expand Down
Loading