5682929111
A few more bug fixes from upstream. Also stop using system membarriers, and revert a recent xen migration fix (not the right one). OBS-URL: https://build.opensuse.org/request/show/768144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=528
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From: Jeff Kubascik <jeff.kubascik@dornerworks.com>
|
|
Date: Fri, 17 Jan 2020 14:09:31 +0000
|
|
Subject: target/arm: Return correct IL bit in merge_syn_data_abort
|
|
|
|
Git-commit: 30d544839e278dc76017b9a42990c41e84a34377
|
|
|
|
The IL bit is set for 32-bit instructions, thus passing false
|
|
with the is_16bit parameter to syn_data_abort_with_iss() makes
|
|
a syn mask that always has the IL bit set.
|
|
|
|
Pass is_16bit as true to make the initial syn mask have IL=0,
|
|
so that the final IL value comes from or'ing template_syn.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: aaa1f954d4ca ("target-arm: A64: Create Instruction Syndromes for Data Aborts")
|
|
Signed-off-by: Jeff Kubascik <jeff.kubascik@dornerworks.com>
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-id: 20200117004618.2742-2-richard.henderson@linaro.org
|
|
[rth: Extracted this as a self-contained bug fix from a larger patch]
|
|
Signed-off-by: Richard Henderson <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/tlb_helper.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c
|
|
index 5feb3129417a5c55bdbe6b77b540..e63f8bda29636d8b23eead31004a 100644
|
|
--- a/target/arm/tlb_helper.c
|
|
+++ b/target/arm/tlb_helper.c
|
|
@@ -44,7 +44,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t template_syn,
|
|
syn = syn_data_abort_with_iss(same_el,
|
|
0, 0, 0, 0, 0,
|
|
ea, 0, s1ptw, is_write, fsc,
|
|
- false);
|
|
+ true);
|
|
/* Merge the runtime syndrome with the template syndrome. */
|
|
syn |= template_syn;
|
|
}
|