rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 306676 from home:algraf:branches:Virtualization

Browse Source 
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
- Fix illegal instruction for s390x SLE12 guest binaries
* Patches added:
  0040-s390x-Add-interlocked-access-facili.patch
- Disable dependency on libnuma for s390x (not available in SLE12)

OBS-URL: https://build.opensuse.org/request/show/306676
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=258
This commit is contained in:
Andreas Färber 2015-05-13 00:20:26 +00:00 committed by Git OBS Bridge
parent 0e57e328c1
commit c42732f882
10 changed files with 154 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
0040-s390x-Add-interlocked-access-facili.patch Normal file
View File

@ -0,0 +1,109 @@
From 9c5c8b0716f6c5526a5bd5abe13937321d95de26 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 8 May 2015 03:07:53 +0200
Subject: [PATCH] s390x: Add interlocked access facility 1 instructions
We're currently missing all instructions defined by the "interlocked-access
facility 1" which is part of zEC12. This patch implements all of them except
for LPD and LPDG.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
target-s390x/insn-data.def | 16 ++++++++++++++++
target-s390x/translate.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 8d8e47e..a36c366 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -338,6 +338,21 @@
C(0xe371, LAY, RXY_a, LD, 0, a2, 0, r1, mov2, 0)
/* LOAD ADDRESS RELATIVE LONG */
C(0xc000, LARL, RIL_b, Z, 0, ri2, 0, r1, mov2, 0)
+/* LOAD AND ADD */
+ C(0xebf8, LAA, RSY_a, ILA, r3_32s, m2_32s_atomic, new, m2_32_r1_atomic, add, adds32)
+ C(0xebe8, LAAG, RSY_a, ILA, r3, m2_64_atomic, new, m2_64_r1_atomic, add, adds64)
+/* LOAD AND ADD LOGICAL */
+ C(0xebfa, LAAL, RSY_a, ILA, r3_32s, m2_32s_atomic, new, m2_32_r1_atomic, add, addu32)
+ C(0xebea, LAALG, RSY_a, ILA, r3, m2_64_atomic, new, m2_64_r1_atomic, add, addu64)
+/* LOAD AND AND */
+ C(0xebf4, LAN, RSY_a, ILA, r3_32s, m2_32s_atomic, new, m2_32_r1_atomic, and, nz32)
+ C(0xebe4, LANG, RSY_a, ILA, r3, m2_64_atomic, new, m2_64_r1_atomic, and, nz64)
+/* LOAD AND EXCLUSIVE OR */
+ C(0xebf7, LAX, RSY_a, ILA, r3_32s, m2_32s_atomic, new, m2_32_r1_atomic, xor, nz32)
+ C(0xebe7, LAXG, RSY_a, ILA, r3, m2_64_atomic, new, m2_64_r1_atomic, xor, nz64)
+/* LOAD AND OR */
+ C(0xebf6, LAO, RSY_a, ILA, r3_32s, m2_32s_atomic, new, m2_32_r1_atomic, or, nz32)
+ C(0xebe6, LAOG, RSY_a, ILA, r3, m2_64_atomic, new, m2_64_r1_atomic, or, nz64)
/* LOAD AND TEST */
C(0x1200, LTR, RR_a, Z, 0, r2_o, 0, cond_r1r2_32, mov2, s32)
C(0xb902, LTGR, RRE, Z, 0, r2_o, 0, r1, mov2, s64)
@@ -417,6 +432,7 @@
C(0xb9e2, LOCGR, RRF_c, LOC, r1, r2, r1, 0, loc, 0)
C(0xebf2, LOC, RSY_b, LOC, r1, m2_32u, new, r1_32, loc, 0)
C(0xebe2, LOCG, RSY_b, LOC, r1, m2_64, r1, 0, loc, 0)
+/* LOAD PAIR DISJOINT TODO */
/* LOAD POSITIVE */
C(0x1000, LPR, RR_a, Z, 0, r2_32s, new, r1_32, abs, abs32)
C(0xb900, LPGR, RRE, Z, 0, r2, r1, 0, abs, abs64)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 8ae4912..07794fb 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1118,6 +1118,7 @@ typedef enum DisasFacility {
FAC_PC, /* population count */
FAC_SCF, /* store clock fast */
FAC_SFLE, /* store facility list extended */
+ FAC_ILA, /* interlocked access facility 1 */
} DisasFacility;
struct DisasInsn {
@@ -4065,6 +4066,22 @@ static void wout_m2_32(DisasContext *s, DisasFields *f, DisasOps *o)
}
#define SPEC_wout_m2_32 0
+static void wout_m2_32_r1_atomic(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ /* XXX release reservation */
+ tcg_gen_qemu_st32(o->out, o->addr1, get_mem_index(s));
+ store_reg32_i64(get_field(f, r1), o->in2);
+}
+#define SPEC_wout_m2_32_r1_atomic 0
+
+static void wout_m2_64_r1_atomic(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ /* XXX release reservation */
+ tcg_gen_qemu_st64(o->out, o->addr1, get_mem_index(s));
+ store_reg(get_field(f, r1), o->in2);
+}
+#define SPEC_wout_m2_64_r1_atomic 0
+
/* ====================================================================== */
/* The "INput 1" generators. These load the first operand to an insn. */
@@ -4486,6 +4503,24 @@ static void in2_mri2_64(DisasContext *s, DisasFields *f, DisasOps *o)
}
#define SPEC_in2_mri2_64 0
+static void in2_m2_32s_atomic(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ /* XXX should reserve the address */
+ in1_la2(s, f, o);
+ o->in2 = tcg_temp_new_i64();
+ tcg_gen_qemu_ld32s(o->in2, o->addr1, get_mem_index(s));
+}
+#define SPEC_in2_m2_32s_atomic 0
+
+static void in2_m2_64_atomic(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ /* XXX should reserve the address */
+ in1_la2(s, f, o);
+ o->in2 = tcg_temp_new_i64();
+ tcg_gen_qemu_ld64(o->in2, o->addr1, get_mem_index(s));
+}
+#define SPEC_in2_m2_64_atomic 0
+
static void in2_i2(DisasContext *s, DisasFields *f, DisasOps *o)
{
o->in2 = tcg_const_i64(get_field(f, i2));

7
libcacard.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 12 22:43:56 UTC 2015 - agraf@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
* Patches added:
0040-s390x-Add-interlocked-access-facili.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de

2
libcacard.spec
View File

@ -64,6 +64,7 @@ Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch
Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch
Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
# Please do not add patches manually here, run update_git.sh. # Please do not add patches manually here, run update_git.sh.
# this is to make lint happy # this is to make lint happy
Source300: qemu-rpmlintrc Source300: qemu-rpmlintrc
@ -162,6 +163,7 @@ This sub-package contains development files for the Smartcard library.
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1 %patch0039 -p1
%patch0040 -p1
%build %build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

8
qemu-linux-user.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 12 22:43:53 UTC 2015 - agraf@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
- Fix illegal instruction for s390x SLE12 guest binaries
* Patches added:
0040-s390x-Add-interlocked-access-facili.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 10 14:55:31 UTC 2015 - afaerber@suse.de Sun May 10 14:55:31 UTC 2015 - afaerber@suse.de

2
qemu-linux-user.spec
View File

@ -64,6 +64,7 @@ Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch
Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch
Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
# Please do not add patches manually here, run update_git.sh. # Please do not add patches manually here, run update_git.sh.
# this is to make lint happy # this is to make lint happy
Source300: qemu-rpmlintrc Source300: qemu-rpmlintrc
@ -156,6 +157,7 @@ run cross-architecture builds.
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1 %patch0039 -p1
%patch0040 -p1
%build %build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

8
qemu-testsuite.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 12 22:43:49 UTC 2015 - agraf@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
* Patches added:
0040-s390x-Add-interlocked-access-facili.patch
- Disable dependency on libnuma for s390x (not available in SLE12)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de

6
qemu-testsuite.spec
View File

@ -95,6 +95,7 @@ Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch
Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch
Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
# Please do not add QEMU patches manually here. # Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue. # Run update_git.sh to regenerate this queue.
@ -155,7 +156,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%else %else
%ifnarch %arm %ifnarch %arm s390x
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%endif %endif
@ -594,6 +595,7 @@ This package provides a service file for starting and stopping KSM.
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1 %patch0039 -p1
%patch0040 -p1
%if %{build_x86_fw_from_source} %if %{build_x86_fw_from_source}
pushd roms/seabios pushd roms/seabios
@ -673,7 +675,7 @@ done
--disable-numa \ --disable-numa \
%endif %endif
%else %else
%ifarch %arm %ifarch %arm s390x
--disable-numa \ --disable-numa \
%else %else
--enable-numa \ --enable-numa \

8
qemu.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 12 22:43:49 UTC 2015 - agraf@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
* Patches added:
0040-s390x-Add-interlocked-access-facili.patch
- Disable dependency on libnuma for s390x (not available in SLE12)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de

6
qemu.spec
View File

@ -95,6 +95,7 @@ Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch
Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch
Patch0039: 0039-s390x-Fix-stoc-direction.patch Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
# Please do not add QEMU patches manually here. # Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue. # Run update_git.sh to regenerate this queue.
@ -155,7 +156,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%else %else
%ifnarch %arm %ifnarch %arm s390x
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%endif %endif
@ -594,6 +595,7 @@ This package provides a service file for starting and stopping KSM.
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1 %patch0039 -p1
%patch0040 -p1
%if %{build_x86_fw_from_source} %if %{build_x86_fw_from_source}
pushd roms/seabios pushd roms/seabios
@ -673,7 +675,7 @@ done
--disable-numa \ --disable-numa \
%endif %endif
%else %else
%ifarch %arm %ifarch %arm s390x
--disable-numa \ --disable-numa \
%else %else
--enable-numa \ --enable-numa \

4
qemu.spec.in
View File

@ -117,7 +117,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%else %else
%ifnarch %arm %ifnarch %arm s390x
BuildRequires: libnuma-devel BuildRequires: libnuma-devel
%endif %endif
%endif %endif
@ -597,7 +597,7 @@ done
--disable-numa \ --disable-numa \
%endif %endif
%else %else
%ifarch %arm %ifarch %arm s390x
--disable-numa \ --disable-numa \
%else %else
--enable-numa \ --enable-numa \