Skip to content

Commit 9d68e49

Browse files
committed
hosttools: fix qemu_xtensa sample_controller32
Revert upstream commit breaking mpu. Signed-off-by: Anas Nashif <[email protected]>
1 parent 133462d commit 9d68e49

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001
2+
From: Anas Nashif <[email protected]>
3+
Date: Fri, 16 May 2025 17:58:04 -0400
4+
Subject: [PATCH] Revert "target/xtensa: Make use of 'segment' in pptlb helper
5+
less confusing"
6+
7+
This reverts commit b42ba4ea4322357fcbfcb0e6e613d79ede84de64.
8+
---
9+
target/xtensa/mmu_helper.c | 4 ++--
10+
1 file changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
13+
index 29b84d5dbf..997b21d389 100644
14+
--- a/target/xtensa/mmu_helper.c
15+
+++ b/target/xtensa/mmu_helper.c
16+
@@ -991,7 +991,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
17+
uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
18+
{
19+
unsigned nhits;
20+
- unsigned segment;
21+
+ unsigned segment = XTENSA_MPU_PROBE_B;
22+
unsigned bg_segment;
23+
24+
nhits = xtensa_mpu_lookup(env->mpu_fg, env->config->n_mpu_fg_segments,
25+
@@ -1005,7 +1005,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
26+
xtensa_mpu_lookup(env->config->mpu_bg,
27+
env->config->n_mpu_bg_segments,
28+
v, &bg_segment);
29+
- return env->config->mpu_bg[bg_segment].attr | XTENSA_MPU_PROBE_B;
30+
+ return env->config->mpu_bg[bg_segment].attr | segment;
31+
}
32+
}
33+
34+
--
35+
2.43.0
36+

meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
5555
file://0003-tests-tcg-xtensa-tidy-test-linker-script.patch \
5656
file://0004-tests-tcg-xtensa-fix-SR-test-for-configs-with-MPU.patch \
5757
file://0005-target-xtensa-fix-sample_controller32-build-for-QEMU.patch \
58+
file://0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch \
5859
file://qemu-guest-agent.init \
5960
file://qemu-guest-agent.udev \
6061
"

0 commit comments

Comments
 (0)