From 04b0a29d9f49c006b1101f6a81c2e9db551daec9 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 16 May 2025 18:02:29 -0400 Subject: [PATCH] hosttools: fix qemu_xtensa sample_controller32 Revert upstream commit breaking mpu. Signed-off-by: Anas Nashif --- ...ensa-Make-use-of-segment-in-pptlb-he.patch | 36 +++++++++++++++++++ .../qemu/qemu-zephyr_9.2.3.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-zephyr-sdk/recipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch b/meta-zephyr-sdk/recipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch new file mode 100644 index 00000000..c400dbe3 --- /dev/null +++ b/meta-zephyr-sdk/recipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch @@ -0,0 +1,36 @@ +From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001 +From: Anas Nashif +Date: Fri, 16 May 2025 17:58:04 -0400 +Subject: [PATCH] Revert "target/xtensa: Make use of 'segment' in pptlb helper + less confusing" + +This reverts commit b42ba4ea4322357fcbfcb0e6e613d79ede84de64. +--- + target/xtensa/mmu_helper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c +index 29b84d5dbf..997b21d389 100644 +--- a/target/xtensa/mmu_helper.c ++++ b/target/xtensa/mmu_helper.c +@@ -991,7 +991,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s) + uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v) + { + unsigned nhits; +- unsigned segment; ++ unsigned segment = XTENSA_MPU_PROBE_B; + unsigned bg_segment; + + nhits = xtensa_mpu_lookup(env->mpu_fg, env->config->n_mpu_fg_segments, +@@ -1005,7 +1005,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v) + xtensa_mpu_lookup(env->config->mpu_bg, + env->config->n_mpu_bg_segments, + v, &bg_segment); +- return env->config->mpu_bg[bg_segment].attr | XTENSA_MPU_PROBE_B; ++ return env->config->mpu_bg[bg_segment].attr | segment; + } + } + +-- +2.43.0 + diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb index f5fecbd8..4768dc7b 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb +++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb @@ -55,6 +55,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0003-tests-tcg-xtensa-tidy-test-linker-script.patch \ file://0004-tests-tcg-xtensa-fix-SR-test-for-configs-with-MPU.patch \ file://0005-target-xtensa-fix-sample_controller32-build-for-QEMU.patch \ + file://0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ "