a8263c0693
- Include upstream patches designated as stable material and reviewed for applicability to include here block-Separate-blk_is_writable-and-blk_s.patch hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch hw-net-lan9118-Fix-RX-Status-FIFO-PEEK-v.patch hw-timer-slavio_timer-Allow-64-bit-acces.patch net-Fix-handling-of-id-in-netdev_add-and.patch target-arm-Don-t-decode-insns-in-the-XSc.patch target-arm-Fix-MTE0_ACTIVE.patch target-arm-Introduce-PREDDESC-field-defi.patch target-arm-Update-PFIRST-PNEXT-for-pred_.patch target-arm-Update-REV-PUNPK-for-pred_des.patch target-arm-Update-ZIP-UZP-TRN-for-pred_d.patch tcg-Use-memset-for-large-vector-byte-rep.patch ui-vnc-Add-missing-lock-for-send_color_m.patch virtio-move-use-disabled-flag-property-t.patch - binutils v2.36 has changed the handling of the assembler's -mx86-used-note, resulting in a build failure. To compensate, we now explicitly specify -mx86-used-note=no in the seabios Makefile (boo#1181775) build-be-explicit-about-mx86-used-note-n.patch OBS-URL: https://build.opensuse.org/request/show/869843 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=614
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From: Richard Henderson <richard.henderson@linaro.org>
|
|
Date: Mon, 21 Dec 2020 12:44:26 -0800
|
|
Subject: target/arm: Fix MTE0_ACTIVE
|
|
|
|
Git-commit: cc97b0019bb590b9b3c2a623e9ebee48831e0ce3
|
|
|
|
In 50244cc76abc we updated mte_check_fail to match the ARM
|
|
pseudocode, using the correct EL to select the TCF field.
|
|
But we failed to update MTE0_ACTIVE the same way, which led
|
|
to g_assert_not_reached().
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Buglink: https://bugs.launchpad.net/bugs/1907137
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-id: 20201221204426.88514-1-richard.henderson@linaro.org
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/arm/helper.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/target/arm/helper.c b/target/arm/helper.c
|
|
index 38cd35c049292d40df5a35854f4b..194d752763b2a74af2e4e45e0a96 100644
|
|
--- a/target/arm/helper.c
|
|
+++ b/target/arm/helper.c
|
|
@@ -12927,7 +12927,7 @@ static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el,
|
|
if (FIELD_EX32(flags, TBFLAG_A64, UNPRIV)
|
|
&& tbid
|
|
&& !(env->pstate & PSTATE_TCO)
|
|
- && (sctlr & SCTLR_TCF0)
|
|
+ && (sctlr & SCTLR_TCF)
|
|
&& allocation_tag_access_enabled(env, 0, sctlr)) {
|
|
flags = FIELD_DP32(flags, TBFLAG_A64, MTE0_ACTIVE, 1);
|
|
}
|