Skip to content

hosttools: fix qemu_xtensa sample_controller32 #914

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

Merged
merged 1 commit into from
May 18, 2025
Merged

hosttools: fix qemu_xtensa sample_controller32 #914

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
36 changes: 36 additions & 0 deletions ...cipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001
From: Anas Nashif <[email protected]>
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

1 change: 1 addition & 0 deletions meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
"
Expand Down
Loading