target/xtensa: use background MPU map from overlay
cover target/xtensa: use background MPU map from overlay
Hello,
this series changes target/xtensa/import_core.sh script to import one more header from the configuration overlay: the one with default address space map for the core and uses information in this header to generate background MPU map.
Max Filippov (2):
target/xtensa: import xtensa/config/core-isa.h target/xtensa: use MPU background map from core configuration
target/xtensa/import_core.sh | 6 ++++-- target/xtensa/overlay_tool.h | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 target/xtensa: import xtensa/config/core-isa.h
Import core-isa.h from its canonical place in the configuration overlay. Drop --xform option from the tar command line.
--- target/xtensa/import_core.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/xtensa/import_core.sh +2 -2
@@ -19,8 +19,8 @@ exit [ $# -ge 3 ] && FREQ="$3" mkdir -p "$TARGET" -tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \ - --xform='s/core/core-isa/' config/core.h +tar -xf "$OVERLAY" -C "$TARGET" --strip-components=2 \ + xtensa/config/core-isa.h tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \ sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c #
Signature · 1 line
2.20.1
PATCH 2/2 target/xtensa: use MPU background map from core configuration
In reply to Max FilippovConfiguration overlay may define MPU background map. Import core-matmap.h from the overlay and use XCHAL_MPU_BACKGROUND_MAP macro if it's defined.
--- target/xtensa/import_core.sh | 4 +++- target/xtensa/overlay_tool.h | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-)
target/xtensa/import_core.sh +3 -1
@@ -20,7 +20,8 @@ exit [ $# -ge 3 ] && FREQ="$3" mkdir -p "$TARGET" tar -xf "$OVERLAY" -C "$TARGET" --strip-components=2 \ - xtensa/config/core-isa.h + xtensa/config/core-isa.h \ + xtensa/config/core-matmap.h tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \ sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c #
@@ -44,6 +45,7 @@ cat <<EOF > "${TARGET}.c" #include "qemu/host-utils.h" #include "core-$NAME/core-isa.h" +#include "core-$NAME/core-matmap.h" #include "overlay_tool.h" #define xtensa_modules xtensa_modules_$NAME
target/xtensa/overlay_tool.h +14 -1
@@ -373,15 +373,28 @@#elif XCHAL_HAVE_MPU #ifndef XTENSA_MPU_BG_MAP +#ifdef XCHAL_MPU_BACKGROUND_MAP +#define XCHAL_MPU_BGMAP(s, vaddr_start, vaddr_last, rights, memtype, x...) \ + { .vaddr = (vaddr_start), .attr = ((rights) << 8) | ((memtype) << 12), }, + +#define XTENSA_MPU_BG_MAP (xtensa_mpu_entry []){\ + XCHAL_MPU_BACKGROUND_MAP(0) \ +} + +#define XTENSA_MPU_BG_MAP_ENTRIES XCHAL_MPU_BACKGROUND_ENTRIES +#else #define XTENSA_MPU_BG_MAP (xtensa_mpu_entry []){\ { .vaddr = 0, .attr = 0x00006700, }, \ } + +#define XTENSA_MPU_BG_MAP_ENTRIES 1 +#endif #endif #define TLB_SECTION \ .mpu_align = XCHAL_MPU_ALIGN, \ .n_mpu_fg_segments = XCHAL_MPU_ENTRIES, \ - .n_mpu_bg_segments = 1, \ + .n_mpu_bg_segments = XTENSA_MPU_BG_MAP_ENTRIES, \ .mpu_bg = XTENSA_MPU_BG_MAP#ifndef XCHAL_SYSROM0_PADDR
Signature · 1 line
2.20.1