Skip to contentSkip to conversation

s390x: support zpci in tcg

RFC PATCH Superseded Cornelia Huck 2 participants 8 messages Jan 29, 2018 – Jan 31, 2018

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover s390x: support zpci in tcg

This patch set (available at git://github.com/cohuck/qemu pci-tcg) wires up zpci under tcg. A guest started with

qemu-system-s390x -M s390-ccw-virtio,accel=tcg -cpu qemu,zpci=on -device virtio-net-pci (...)

and a 4.15 kernel in the guest (needed because the requirement for ais was dropped with

commit 48070c73058be6de9c0d754d441ed7092dfc8f12

Author: Christian Borntraeger <[email protected]>
Date:   Mon Oct 30 14:38:58 2017 +0100

s390/pci: do not require AIS facility

and we don't have a working ais with tcg yet), I get sensible output out of lspci.

RFC because I'm not sure that I put up the tcg wires in the best way.

Cornelia Huck (2):
s390x/tcg: wire up pci instructions s390x/cpumodel: allow zpci features in qemu model

 target/s390x/gen-features.c |   3 ++
 target/s390x/helper.h       |   9 ++++
 target/s390x/insn-data.def  |  13 +++++
 target/s390x/misc_helper.c  | 123 ++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c    | 123 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 271 insertions(+)
Signature · 1 line
2.13.6
#1 lore raw

RFC PATCH 1/2 s390x/tcg: wire up pci instructions

On s390x, pci support is implemented via a set of instructions (no mmio). Unfortunately, none of them are documented in the PoP; the code is based upon the existing implementation for KVM and the Linux zpci driver.

---
 target/s390x/helper.h      |   9 ++++
 target/s390x/insn-data.def |  13 +++++
 target/s390x/misc_helper.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c   | 123 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
target/s390x/helper.h +9 -0
index 59a1d9869b..9887efbb3a 100644
@@ -172,4 +172,13 @@ DEF_HELPER_2(stcrw, void, env, i64)
 DEF_HELPER_3(stsch, void, env, i64, i64)
 DEF_HELPER_3(tsch, void, env, i64, i64)
 DEF_HELPER_2(chsc, void, env, i64)
+
+DEF_HELPER_2(clp, void, env, i32)
+DEF_HELPER_3(pcilg, void, env, i32, i32)
+DEF_HELPER_3(pcistg, void, env, i32, i32)
+DEF_HELPER_4(stpcifc, void, env, i32, i64, i32)
+DEF_HELPER_3(sic, void, env, i64, i64)
+DEF_HELPER_3(rpcit, void, env, i32, i32)
+DEF_HELPER_5(pcistb, void, env, i32, i32, i64, i32)
+DEF_HELPER_4(mpcifc, void, env, i32, i64, i32)
 #endif
target/s390x/insn-data.def +13 -0
index 11ee43dcbc..2ffc051072 100644
@@ -1067,4 +1067,17 @@
     /* ??? Not listed in PoO ninth edition, but there's a linux driver that
        uses it: "A CHSC subchannel is usually present on LPAR only."  */
     C(0xb25f, CHSC,  RRE,     Z,   0, insn, 0, 0, chsc, 0)
+
+/* zPCI Instructions */
+    /* None of these instructions are documented in the PoP, so this is all
+       based upon target/s390x/kvm.c and Linux code and likely incomplete */
+    C(0xebd0, PCISTB, RSY_a, PCI, 0, 0, 0, 0, pcistb, 0)
+    C(0xebd1, SIC, RSY_a, PCI, 0, 0, 0, 0, sic, 0)
+    C(0xb9a0, CLP, RRF_c, PCI, 0, 0, 0, 0, clp, 0)
+    C(0xb9d0, PCISTG, RRE, PCI, 0, 0, 0, 0, pcistg, 0)
+    C(0xb9d2, PCILG, RRE, PCI, 0, 0, 0, 0, pcilg, 0)
+    C(0xb9d3, RPCIT, RRE, PCI, 0, 0, 0, 0, rpcit, 0)
+    C(0xe3d0, MPCIFC, RXY_a, PCI, 0, 0, 0, 0, mpcifc, 0)
+    C(0xe3d4, STPCIFC, RXY_a, PCI, 0, 0, 0, 0, stpcifc, 0)
+
 #endif /* CONFIG_USER_ONLY */
target/s390x/misc_helper.c +123 -0

132 lines not on this page · raw message

target/s390x/translate.c +123 -0

135 lines not on this page · raw message

Signature · 1 line
2.13.6
#2 lore raw

Re: [Qemu-devel] [PATCH RFC 1/2] s390x/tcg: wire up pci instructions

Quoted 74 lines · Cornelia Huck

On s390x, pci support is implemented via a set of instructions (no mmio). Unfortunately, none of them are documented in the PoP; the code is based upon the existing implementation for KVM and the Linux zpci driver.

---
 target/s390x/helper.h      |   9 ++++
 target/s390x/insn-data.def |  13 +++++
 target/s390x/misc_helper.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c   | 123 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
target/s390x/helper.h +9 -0
index 59a1d9869b..9887efbb3a 100644
@@ -172,4 +172,13 @@ DEF_HELPER_2(stcrw, void, env, i64)
 DEF_HELPER_3(stsch, void, env, i64, i64)
 DEF_HELPER_3(tsch, void, env, i64, i64)
 DEF_HELPER_2(chsc, void, env, i64)
+
+DEF_HELPER_2(clp, void, env, i32)
+DEF_HELPER_3(pcilg, void, env, i32, i32)
+DEF_HELPER_3(pcistg, void, env, i32, i32)
+DEF_HELPER_4(stpcifc, void, env, i32, i64, i32)
+DEF_HELPER_3(sic, void, env, i64, i64)
+DEF_HELPER_3(rpcit, void, env, i32, i32)
+DEF_HELPER_5(pcistb, void, env, i32, i32, i64, i32)
+DEF_HELPER_4(mpcifc, void, env, i32, i64, i32)
 #endif
target/s390x/insn-data.def +13 -0
index 11ee43dcbc..2ffc051072 100644
@@ -1067,4 +1067,17 @@
     /* ??? Not listed in PoO ninth edition, but there's a linux driver that
        uses it: "A CHSC subchannel is usually present on LPAR only."  */
     C(0xb25f, CHSC,  RRE,     Z,   0, insn, 0, 0, chsc, 0)
+
+/* zPCI Instructions */
+    /* None of these instructions are documented in the PoP, so this is all
+       based upon target/s390x/kvm.c and Linux code and likely incomplete */
+    C(0xebd0, PCISTB, RSY_a, PCI, 0, 0, 0, 0, pcistb, 0)
+    C(0xebd1, SIC, RSY_a, PCI, 0, 0, 0, 0, sic, 0)
+    C(0xb9a0, CLP, RRF_c, PCI, 0, 0, 0, 0, clp, 0)
+    C(0xb9d0, PCISTG, RRE, PCI, 0, 0, 0, 0, pcistg, 0)
+    C(0xb9d2, PCILG, RRE, PCI, 0, 0, 0, 0, pcilg, 0)
+    C(0xb9d3, RPCIT, RRE, PCI, 0, 0, 0, 0, rpcit, 0)
+    C(0xe3d0, MPCIFC, RXY_a, PCI, 0, 0, 0, 0, mpcifc, 0)
+    C(0xe3d4, STPCIFC, RXY_a, PCI, 0, 0, 0, 0, stpcifc, 0)
+
 #endif /* CONFIG_USER_ONLY */
target/s390x/misc_helper.c +6 -0
index 86da6aab7e..1271106628 100644
@@ -36,6 +36,7 @@
 #include "hw/s390x/ebcdic.h"
 #include "hw/s390x/s390-virtio-hcall.h"
 #include "hw/s390x/sclp.h"
+#include "hw/s390x/s390-pci-inst.h"
 #endif
 
 /* #define DEBUG_HELPER */
@@ -560,3 +561,125 @@ uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr)
     env->regs[0] = deposit64(env->regs[0], 0, 8, (max_bytes / 8) - 1);
     return count_bytes >= max_bytes ? 0 : 3;
 }
+
+#ifndef CONFIG_USER_ONLY
+void HELPER(clp)(CPUS390XState *env, uint32_t r2)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);

target/s390x/misc_helper.c uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr) · line 578

Quoted 10 lines
target/s390x/misc_helper.c +10 -0
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = clp_service_call(cpu, r2, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }

Hmmm, this handling should not be necessary for TCG. All we should need is:

qemu_mutex_lock_iothread();
r = clp_service_call(cpu, r2, GETPC());
qemu_mutex_unlock_iothread();

We will handle

a) pci not configured in patch nr2 via the CPU model (will propose something there).

b) we will handle !s390_has_feat(S390_FEAT_ZPCI) although available later just as other instructions via the "PCI" flag you attached to the instructions (Richard once posted a patch to do that).

Quoted 115 lines
target/s390x/misc_helper.c +107 -0
+}
+
+void HELPER(pcilg)(CPUS390XState *env, uint32_t r1, uint32_t r2)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = pcilg_service_call(cpu, r1, r2, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(pcistg)(CPUS390XState *env, uint32_t r1, uint32_t r2)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = pcistg_service_call(cpu, r1, r2, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba,
+                     uint32_t ar)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = stpcifc_service_call(cpu, r1, fiba, ar, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3)
+{
+    int r;
+
+    qemu_mutex_lock_iothread();
+    r = css_do_sic(env, r1 & 0xffff, (r3 >> 27) & 0x7);
+    qemu_mutex_unlock_iothread();
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(rpcit)(CPUS390XState *env, uint32_t r1, uint32_t r2)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = rpcit_service_call(cpu, r1, r2, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(pcistb)(CPUS390XState *env, uint32_t r1, uint32_t r3,
+                    uint64_t gaddr, uint32_t ar)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = pcistb_service_call(cpu, r1, r3, gaddr, ar, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+
+void HELPER(mpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba,
+                    uint32_t ar)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = mpcifc_service_call(cpu, r1, fiba, ar, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }
+}
+#endif
target/s390x/translate.c +0 -0
index df0b41606d..b73f7143db 100644
@@ -4777,6 +4777,128 @@ static ExitStatus op_zero2(DisasContext *s, DisasOps *o)
     return NO_EXIT;
 }
 

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4789

Quoted 10 lines
target/s390x/translate.c +9 -0
 
+
+static ExitStatus op_stpcifc(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+

You can simply drop b2, d2 and addr, and instead use in1_la2 for the input value specification:

C(0xe3d4, STPCIFC, RXY_a, PCI, la2, 0, 0, 0, stpcifc, 0)

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4829

Quoted 4 lines
target/s390x/translate.c +4 -0
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);
+    gen_helper_stpcifc(cpu_env, r1, addr, ar);

gen_helper_stpcifc(cpu_env, r1, o->addr1, ar);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4841

Quoted 12 lines
target/s390x/translate.c +12 -0
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
+static ExitStatus op_sic(DisasContext *s, DisasOps *o)
+{
+    int r1 = get_field(s->fields, r1);
+    int r3 = get_field(s->fields, r3);
+

(these two can be const)
you could use in1_r1 and in2_r3

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4807

Quoted 2 lines
target/s390x/translate.c +2 -0
+    check_privileged(s);
+    gen_helper_sic(cpu_env, regs[r1], regs[r3]);

gen_helper_sic(cpu_env, o->in1, o->in2);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4808

Quoted 1 line
target/s390x/translate.c +1 -0
+    set_cc_static(s);

Are you sure this instruction modifies the cc? Can't spot a set_cc when following the kvm code.

Quoted 12 lines
target/s390x/translate.c +12 -0
+    return NO_EXIT;
+}
+
+static ExitStatus op_rpcit(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2));
+
+    check_privileged(s);
+    gen_helper_rpcit(cpu_env, r1, r2);
+    tcg_temp_free_i32(r1);
+    tcg_temp_free_i32(r2);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4866

Quoted 10 lines
target/s390x/translate.c +10 -0
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
+static ExitStatus op_pcistb(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);

Dito, use in1_la2

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4828

Quoted 6 lines
target/s390x/translate.c +6 -0
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);

And you can initialize this directly then

TCGv_i32 ar = tcg_const_i32(get_field(s->fields, b2));

... also applies to the others

Quoted 7 lines
target/s390x/translate.c +7 -0
+    gen_helper_pcistb(cpu_env, r1, r3, addr, ar);
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    tcg_temp_free_i32(r3);
+    set_cc_static(s);
+    return NO_EXIT;

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4889

Quoted 10 lines
target/s390x/translate.c +10 -0
+}
+
+static ExitStatus op_mpcifc(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+

dito

Quoted 17 lines
target/s390x/translate.c +12 -0
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);
+    gen_helper_mpcifc(cpu_env, r1, addr, ar);
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+#endif
+
 /* ====================================================================== */
 /* The "Cc OUTput" generators.  Given the generated output (and in some cases
    the original inputs), update the various cc data structures in order to

target/s390x/translate.c enum DisasInsnEnum { · line 5836

Quoted 7 lines
target/s390x/translate.c +1 -0
@@ -5708,6 +5830,7 @@ enum DisasInsnEnum {
 #define FAC_MSA4        S390_FEAT_MSA_EXT_4 /* msa-extension-4 facility */
 #define FAC_MSA5        S390_FEAT_MSA_EXT_5 /* msa-extension-5 facility */
 #define FAC_ECT         S390_FEAT_EXTRACT_CPU_TIME
+#define FAC_PCI         S390_FEAT_ZPCI /* z/PCI facility */
 
 static const DisasInsn insn_info[] = {
 #include "insn-data.def"

Thanks!

Signature · 3 lines
Thanks,

David / dhildenb
#3 lore raw

Re: [Qemu-devel] [PATCH RFC 1/2] s390x/tcg: wire up pci instructions

Quoted 14 lines · On Tue, 30 Jan 2018 14:00:12 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 13 lines · Cornelia Huck

On s390x, pci support is implemented via a set of instructions (no mmio). Unfortunately, none of them are documented in the PoP; the code is based upon the existing implementation for KVM and the Linux zpci driver.

---
 target/s390x/helper.h      |   9 ++++
 target/s390x/insn-data.def |  13 +++++
 target/s390x/misc_helper.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c   | 123 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)

(...)

Quoted 38 lines
Quoted 21 lines
target/s390x/misc_helper.c +6 -0
index 86da6aab7e..1271106628 100644
@@ -36,6 +36,7 @@
 #include "hw/s390x/ebcdic.h"
 #include "hw/s390x/s390-virtio-hcall.h"
 #include "hw/s390x/sclp.h"
+#include "hw/s390x/s390-pci-inst.h"
 #endif
 
 /* #define DEBUG_HELPER */
@@ -560,3 +561,125 @@ uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr)
     env->regs[0] = deposit64(env->regs[0], 0, 8, (max_bytes / 8) - 1);
     return count_bytes >= max_bytes ? 0 : 3;
 }
+
+#ifndef CONFIG_USER_ONLY
+void HELPER(clp)(CPUS390XState *env, uint32_t r2)
+{
+    S390CPU *cpu = s390_env_get_cpu(env);

target/s390x/misc_helper.c uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr) · line 578

Quoted 10 lines
target/s390x/misc_helper.c +10 -0
+    int r = -1;
+
+    if (s390_has_feat(S390_FEAT_ZPCI)) {
+        qemu_mutex_lock_iothread();
+        r = clp_service_call(cpu, r2, GETPC());
+        qemu_mutex_unlock_iothread();
+    }
+    if (r) {
+        s390_program_interrupt(env, PGM_OPERATION, 4, GETPC());
+    }  

Hmmm, this handling should not be necessary for TCG. All we should need is:

qemu_mutex_lock_iothread();
r = clp_service_call(cpu, r2, GETPC());
qemu_mutex_unlock_iothread();

Quoted 8 lines

We will handle

a) pci not configured in patch nr2 via the CPU model (will propose something there).

b) we will handle !s390_has_feat(S390_FEAT_ZPCI) although available later just as other instructions via the "PCI" flag you attached to the instructions (Richard once posted a patch to do that).

Even better if that works. (Although I don't quite understand how the FAC_xxx defines interact with the facilities.)

Quoted 2 lines
Quoted 2 lines
target/s390x/misc_helper.c +1 -0
+}

(...)

Quoted 51 lines
Quoted 8 lines
target/s390x/translate.c +0 -0
index df0b41606d..b73f7143db 100644
@@ -4777,6 +4777,128 @@ static ExitStatus op_zero2(DisasContext *s, DisasOps *o)
     return NO_EXIT;
 }
 

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4789

Quoted 10 lines
target/s390x/translate.c +9 -0
 
+
+static ExitStatus op_stpcifc(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+  

You can simply drop b2, d2 and addr, and instead use in1_la2 for the input value specification:

C(0xe3d4, STPCIFC, RXY_a, PCI, la2, 0, 0, 0, stpcifc, 0)

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4829

Quoted 4 lines
target/s390x/translate.c +4 -0
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);
+    gen_helper_stpcifc(cpu_env, r1, addr, ar);  

gen_helper_stpcifc(cpu_env, r1, o->addr1, ar);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4841

Quoted 12 lines
target/s390x/translate.c +12 -0
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
+static ExitStatus op_sic(DisasContext *s, DisasOps *o)
+{
+    int r1 = get_field(s->fields, r1);
+    int r3 = get_field(s->fields, r3);
+  

(these two can be const)
you could use in1_r1 and in2_r3

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4807

Quoted 2 lines
target/s390x/translate.c +2 -0
+    check_privileged(s);
+    gen_helper_sic(cpu_env, regs[r1], regs[r3]);  
Quoted 6 lines

gen_helper_sic(cpu_env, o->in1, o->in2);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4808

Quoted 1 line
target/s390x/translate.c +1 -0
+    set_cc_static(s);  

Are you sure this instruction modifies the cc? Can't spot a set_cc when following the kvm code.

Ah, you're right. The kernel insn agrees as well.

Quoted 50 lines
Quoted 13 lines
target/s390x/translate.c +12 -0
+    return NO_EXIT;
+}
+
+static ExitStatus op_rpcit(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2));
+
+    check_privileged(s);
+    gen_helper_rpcit(cpu_env, r1, r2);
+    tcg_temp_free_i32(r1);
+    tcg_temp_free_i32(r2);

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4866

Quoted 10 lines
target/s390x/translate.c +10 -0
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
+static ExitStatus op_pcistb(DisasContext *s, DisasOps *o)
+{
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);  

Dito, use in1_la2

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4828

Quoted 6 lines
target/s390x/translate.c +6 -0
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);  

And you can initialize this directly then

TCGv_i32 ar = tcg_const_i32(get_field(s->fields, b2));

... also applies to the others

Quoted 11 lines
target/s390x/translate.c +11 -0
+    gen_helper_pcistb(cpu_env, r1, r3, addr, ar);
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    tcg_temp_free_i32(r3);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
+static ExitStatus op_mpcifc(DisasContext *s, DisasOps *o)
+{
Quoted 8 lines

target/s390x/translate.c static ExitStatus op_zero2(DisasContext *s, DisasOps *o) · line 4825

Quoted 6 lines
target/s390x/translate.c +6 -0
+    TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+    int b2 = get_field(s->fields, b2);
+    int d2 = get_field(s->fields, d2);
+    TCGv_i64 addr;
+    TCGv_i32 ar;
+  

dito

OK, I'll update all these.

Quoted 22 lines
Quoted 22 lines
target/s390x/translate.c +13 -0
+    check_privileged(s);
+    addr = get_address(s, 0, b2, d2);
+    ar = tcg_const_i32(b2);
+    gen_helper_mpcifc(cpu_env, r1, addr, ar);
+    tcg_temp_free_i64(addr);
+    tcg_temp_free_i32(ar);
+    tcg_temp_free_i32(r1);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+#endif
+
 /* ====================================================================== */
 /* The "Cc OUTput" generators.  Given the generated output (and in some cases
    the original inputs), update the various cc data structures in order to
@@ -5708,6 +5830,7 @@ enum DisasInsnEnum {
 #define FAC_MSA4        S390_FEAT_MSA_EXT_4 /* msa-extension-4 facility */
 #define FAC_MSA5        S390_FEAT_MSA_EXT_5 /* msa-extension-5 facility */
 #define FAC_ECT         S390_FEAT_EXTRACT_CPU_TIME
+#define FAC_PCI         S390_FEAT_ZPCI /* z/PCI facility */
 
Quoted 5 lines

target/s390x/translate.c enum DisasInsnEnum { · line 5836

Quoted 3 lines
target/s390x/translate.c +0 -0
 static const DisasInsn insn_info[] = {
 #include "insn-data.def"

Thanks!

No, thanks from me :)

#4 lore raw

Re: [Qemu-devel] [PATCH RFC 1/2] s390x/tcg: wire up pci instructions

In reply to David Hildenbrand
Quoted 42 lines · On Tue, 30 Jan 2018 14:00:12 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 26 lines · Cornelia Huck

On s390x, pci support is implemented via a set of instructions (no mmio). Unfortunately, none of them are documented in the PoP; the code is based upon the existing implementation for KVM and the Linux zpci driver.

---
 target/s390x/helper.h      |   9 ++++
 target/s390x/insn-data.def |  13 +++++
 target/s390x/misc_helper.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c   | 123 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
target/s390x/insn-data.def +4 -0
index 11ee43dcbc..2ffc051072 100644
@@ -1067,4 +1067,17 @@
     /* ??? Not listed in PoO ninth edition, but there's a linux driver that
        uses it: "A CHSC subchannel is usually present on LPAR only."  */
     C(0xb25f, CHSC,  RRE,     Z,   0, insn, 0, 0, chsc, 0)
+
+/* zPCI Instructions */
+    /* None of these instructions are documented in the PoP, so this is all
+       based upon target/s390x/kvm.c and Linux code and likely incomplete */

target/s390x/insn-data.def line 1083

Quoted 10 lines
target/s390x/insn-data.def +9 -0
+    C(0xebd0, PCISTB, RSY_a, PCI, 0, 0, 0, 0, pcistb, 0)
+    C(0xebd1, SIC, RSY_a, PCI, 0, 0, 0, 0, sic, 0)
+    C(0xb9a0, CLP, RRF_c, PCI, 0, 0, 0, 0, clp, 0)
+    C(0xb9d0, PCISTG, RRE, PCI, 0, 0, 0, 0, pcistg, 0)
+    C(0xb9d2, PCILG, RRE, PCI, 0, 0, 0, 0, pcilg, 0)
+    C(0xb9d3, RPCIT, RRE, PCI, 0, 0, 0, 0, rpcit, 0)
+    C(0xe3d0, MPCIFC, RXY_a, PCI, 0, 0, 0, 0, mpcifc, 0)
+    C(0xe3d4, STPCIFC, RXY_a, PCI, 0, 0, 0, 0, stpcifc, 0)
+
 #endif /* CONFIG_USER_ONLY */

b) we will handle !s390_has_feat(S390_FEAT_ZPCI) although available later just as other instructions via the "PCI" flag you attached to the instructions (Richard once posted a patch to do that).

Quoted 5 lines

target/s390x/insn-data.def enum DisasInsnEnum { · line 5833

Quoted 5 lines
target/s390x/insn-data.def +1 -0
@@ -5708,6 +5830,7 @@ enum DisasInsnEnum {
 #define FAC_MSA4        S390_FEAT_MSA_EXT_4 /* msa-extension-4 facility */
 #define FAC_MSA5        S390_FEAT_MSA_EXT_5 /* msa-extension-5 facility */
 #define FAC_ECT         S390_FEAT_EXTRACT_CPU_TIME
+#define FAC_PCI         S390_FEAT_ZPCI /* z/PCI facility */

Thinking again: We should probably not attach the PCI flag to SIC, it is independent of it (although only in use for pci adapters right now).

#5 lore raw

RFC PATCH 2/2 s390x/cpumodel: allow zpci features in qemu model

In reply to Cornelia Huck

AEN can be provided unconditionally, ZPCI has to be turned on manually (it should really depend on CONFIG_PCI).

With -cpu qemu,zpci=on, a 4.15 guest kernel can now successfully detect virtio-pci devices under tcg.

---
 target/s390x/gen-features.c | 3 +++
 1 file changed, 3 insertions(+)
target/s390x/gen-features.c +3 -0
index 0570f597ec..db7ac965a0 100644
@@ -574,6 +574,7 @@ static uint16_t qemu_LATEST[] = {
     S390_FEAT_INTERLOCKED_ACCESS_2,
     S390_FEAT_MSA_EXT_4,
     S390_FEAT_MSA_EXT_3,
+    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
 };
 
 /* add all new definitions before this point */
@@ -582,6 +583,8 @@ static uint16_t qemu_MAX[] = {
     S390_FEAT_STFLE_53,
     /* generates a dependency warning, leave it out for now */
     S390_FEAT_MSA_EXT_5,
+    /* should be conditional on CONFIG_PCI */
+    S390_FEAT_ZPCI,
 };
 
 /****** END FEATURE DEFS ******/
Signature · 1 line
2.13.6
#6 lore raw

Re: [Qemu-devel] [PATCH RFC 2/2] s390x/cpumodel: allow zpci features in qemu model

Quoted 24 lines · Cornelia Huck

AEN can be provided unconditionally, ZPCI has to be turned on manually (it should really depend on CONFIG_PCI).

With -cpu qemu,zpci=on, a 4.15 guest kernel can now successfully detect virtio-pci devices under tcg.

---
 target/s390x/gen-features.c | 3 +++
 1 file changed, 3 insertions(+)
target/s390x/gen-features.c +1 -0
index 0570f597ec..db7ac965a0 100644
@@ -574,6 +574,7 @@ static uint16_t qemu_LATEST[] = {
     S390_FEAT_INTERLOCKED_ACCESS_2,
     S390_FEAT_MSA_EXT_4,
     S390_FEAT_MSA_EXT_3,
+    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
 };
 
 /* add all new definitions before this point */

target/s390x/gen-features.c static uint16_t qemu_MAX[] = { · line 589

Quoted 7 lines
target/s390x/gen-features.c +2 -0
@@ -582,6 +583,8 @@ static uint16_t qemu_MAX[] = {
     S390_FEAT_STFLE_53,
     /* generates a dependency warning, leave it out for now */
     S390_FEAT_MSA_EXT_5,
+    /* should be conditional on CONFIG_PCI */
+    S390_FEAT_ZPCI,
 };
 

What about something in addition like that, should work for now

target/s390x/cpu_models.c +7 -0
index 212a5f0697..62fc8d538d 100644
@@ -23,6 +23,7 @@
 #include "qapi/qmp/qbool.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/arch_init.h"
+#include "hw/pci/pci.h"
 #endif
 
 #define CPUDEF_INIT(_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \
@@ -1271,6 +1272,12 @@ static void register_types(void)
 
     /* init all bitmaps from gnerated data initially */
     s390_init_feat_bitmap(qemu_max_cpu_feat_init, qemu_max_cpu_feat);
+#ifndef CONFIG_USER_ONLY
+    if (!pci_available) {
+        clear_bit(S390_FEAT_ZPCI, qemu_max_cpu_feat);
+    }
+#endif
+
     for (i = 0; i < ARRAY_SIZE(s390_cpu_defs); i++) {
         s390_init_feat_bitmap(s390_cpu_defs[i].base_init,
                               s390_cpu_defs[i].base_feat);
Quoted 2 lines
target/s390x/gen-features.c +0 -0
 /****** END FEATURE DEFS ******/
Signature · 3 lines
Thanks,

David / dhildenb
#7 lore raw

Re: [Qemu-devel] [PATCH RFC 2/2] s390x/cpumodel: allow zpci features in qemu model

Quoted 3 lines · On Tue, 30 Jan 2018 14:09:43 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 2 lines · Cornelia Huck

AEN can be provided unconditionally, ZPCI has to be turned on manually (it should really depend on CONFIG_PCI).

I think we should keep it non-default even with your suggested change.

Quoted 49 lines
Quoted 22 lines

With -cpu qemu,zpci=on, a 4.15 guest kernel can now successfully detect virtio-pci devices under tcg.

---
 target/s390x/gen-features.c | 3 +++
 1 file changed, 3 insertions(+)
target/s390x/gen-features.c +1 -0
index 0570f597ec..db7ac965a0 100644
@@ -574,6 +574,7 @@ static uint16_t qemu_LATEST[] = {
     S390_FEAT_INTERLOCKED_ACCESS_2,
     S390_FEAT_MSA_EXT_4,
     S390_FEAT_MSA_EXT_3,
+    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
 };
 
 /* add all new definitions before this point */

target/s390x/gen-features.c static uint16_t qemu_MAX[] = { · line 589

Quoted 7 lines
target/s390x/gen-features.c +2 -0
@@ -582,6 +583,8 @@ static uint16_t qemu_MAX[] = {
     S390_FEAT_STFLE_53,
     /* generates a dependency warning, leave it out for now */
     S390_FEAT_MSA_EXT_5,
+    /* should be conditional on CONFIG_PCI */
+    S390_FEAT_ZPCI,
 };
 

What about something in addition like that, should work for now

target/s390x/cpu_models.c +1 -0
index 212a5f0697..62fc8d538d 100644
@@ -23,6 +23,7 @@
 #include "qapi/qmp/qbool.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/arch_init.h"
+#include "hw/pci/pci.h"
 #endif
 
 #define CPUDEF_INIT(_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \
@@ -1271,6 +1272,12 @@ static void register_types(void)
 
     /* init all bitmaps from gnerated data initially */

target/s390x/cpu_models.c static void register_types(void) · line 1283

Quoted 10 lines
target/s390x/cpu_models.c +6 -0
     s390_init_feat_bitmap(qemu_max_cpu_feat_init, qemu_max_cpu_feat);
+#ifndef CONFIG_USER_ONLY
+    if (!pci_available) {
+        clear_bit(S390_FEAT_ZPCI, qemu_max_cpu_feat);
+    }
+#endif
+
     for (i = 0; i < ARRAY_SIZE(s390_cpu_defs); i++) {
         s390_init_feat_bitmap(s390_cpu_defs[i].base_init,
                               s390_cpu_defs[i].base_feat);

That makes sense, added. Thanks!

Quoted 5 lines
Quoted 3 lines
target/s390x/gen-features.c +0 -0
 /****** END FEATURE DEFS ******/