qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
	borntraeger@de.ibm.com, rth@twiddle.net, agraf@suse.de,
	david@redhat.com, thuth@redhat.com,
	Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PULL 10/29] s390x/tcg: implement TEST PENDING INTERRUPTION
Date: Fri,  9 Feb 2018 10:25:05 +0100	[thread overview]
Message-ID: <20180209092524.31348-11-cohuck@redhat.com> (raw)
In-Reply-To: <20180209092524.31348-1-cohuck@redhat.com>

From: David Hildenbrand <david@redhat.com>

Use s390_cpu_virt_mem_write() so we can actually revert what we did
(re-inject the dequeued IO interrupt).

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180129125623.21729-10-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/helper.h      |  1 +
 target/s390x/insn-data.def |  1 +
 target/s390x/misc_helper.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 target/s390x/translate.c   |  8 +++++++
 4 files changed, 64 insertions(+)

diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 59a1d9869b..05d52ff309 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -170,6 +170,7 @@ DEF_HELPER_4(schm, void, env, i64, i64, i64)
 DEF_HELPER_3(ssch, void, env, i64, i64)
 DEF_HELPER_2(stcrw, void, env, i64)
 DEF_HELPER_3(stsch, void, env, i64, i64)
+DEF_HELPER_2(tpi, i32, env, i64)
 DEF_HELPER_3(tsch, void, env, i64, i64)
 DEF_HELPER_2(chsc, void, env, i64)
 #endif
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
index 11ee43dcbc..c06c3884c0 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -1063,6 +1063,7 @@
     C(0xb233, SSCH,    S,     Z,   0, insn, 0, 0, ssch, 0)
     C(0xb239, STCRW,   S,     Z,   0, insn, 0, 0, stcrw, 0)
     C(0xb234, STSCH,   S,     Z,   0, insn, 0, 0, stsch, 0)
+    C(0xb236, TPI ,    S,     Z,   la2, 0, 0, 0, tpi, 0)
     C(0xb235, TSCH,    S,     Z,   0, insn, 0, 0, tsch, 0)
     /* ??? Not listed in PoO ninth edition, but there's a linux driver that
        uses it: "A CHSC subchannel is usually present on LPAR only."  */
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 86da6aab7e..6ee7e8a64a 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -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_flic.h"
 #endif
 
 /* #define DEBUG_HELPER */
@@ -429,6 +430,59 @@ void HELPER(stsch)(CPUS390XState *env, uint64_t r1, uint64_t inst)
     qemu_mutex_unlock_iothread();
 }
 
+uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr)
+{
+    const uintptr_t ra = GETPC();
+    S390CPU *cpu = s390_env_get_cpu(env);
+    QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());
+    QEMUS390FlicIO *io = NULL;
+    LowCore *lowcore;
+
+    if (addr & 0x3) {
+        s390_program_interrupt(env, PGM_SPECIFICATION, 4, ra);
+    }
+
+    qemu_mutex_lock_iothread();
+    io = qemu_s390_flic_dequeue_io(flic, env->cregs[6]);
+    if (!io) {
+        qemu_mutex_unlock_iothread();
+        return 0;
+    }
+
+    if (addr) {
+        struct {
+            uint16_t id;
+            uint16_t nr;
+            uint32_t parm;
+        } intc = {
+            .id = cpu_to_be16(io->id),
+            .nr = cpu_to_be16(io->nr),
+            .parm = cpu_to_be32(io->parm),
+        };
+
+        if (s390_cpu_virt_mem_write(cpu, addr, 0, &intc, sizeof(intc))) {
+            /* writing failed, reinject and properly clean up */
+            s390_io_interrupt(io->id, io->nr, io->parm, io->word);
+            qemu_mutex_unlock_iothread();
+            g_free(io);
+            s390_cpu_virt_mem_handle_exc(cpu, ra);
+            return 0;
+        }
+    } else {
+        /* no protection applies */
+        lowcore = cpu_map_lowcore(env);
+        lowcore->subchannel_id = cpu_to_be16(io->id);
+        lowcore->subchannel_nr = cpu_to_be16(io->nr);
+        lowcore->io_int_parm = cpu_to_be32(io->parm);
+        lowcore->io_int_word = cpu_to_be32(io->word);
+        cpu_unmap_lowcore(lowcore);
+    }
+
+    g_free(io);
+    qemu_mutex_unlock_iothread();
+    return 1;
+}
+
 void HELPER(tsch)(CPUS390XState *env, uint64_t r1, uint64_t inst)
 {
     S390CPU *cpu = s390_env_get_cpu(env);
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index df0b41606d..81abe40673 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4199,6 +4199,14 @@ static ExitStatus op_stcrw(DisasContext *s, DisasOps *o)
     return NO_EXIT;
 }
 
+static ExitStatus op_tpi(DisasContext *s, DisasOps *o)
+{
+    check_privileged(s);
+    gen_helper_tpi(cc_op, cpu_env, o->addr1);
+    set_cc_static(s);
+    return NO_EXIT;
+}
+
 static ExitStatus op_tsch(DisasContext *s, DisasOps *o)
 {
     check_privileged(s);
-- 
2.13.6

  parent reply	other threads:[~2018-02-09  9:25 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09  9:24 [Qemu-devel] [PULL 00/29] s390x: assorted updates Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 01/29] Fix configure for s390 qemu on alpine and other busybox environments Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 02/29] s390x/tcg: deliver multiple interrupts in a row Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 03/29] s390x/flic: simplify flic initialization Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 04/29] s390x/tcg: simplify lookup of flic Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 05/29] s390x/tcg: simplify machine check handling Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 06/29] s390x/flic: factor out injection of floating interrupts Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 07/29] s390x/flic: no need to call s390_io_interrupt() from flic Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 08/29] s390x/tcg: tolerate wrong wakeups due to floating interrupts Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 09/29] s390x/flic: make floating interrupts on TCG actually floating Cornelia Huck
2018-02-09  9:25 ` Cornelia Huck [this message]
2018-02-09  9:25 ` [Qemu-devel] [PULL 11/29] s390x/flic: implement qemu_s390_clear_io_flic() Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 12/29] s390x/flic: optimize CPU wakeup for TCG Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 13/29] s390x: fix size + content of STSI blocks Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 14/29] s390x/tcg: STSI overhaul Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 15/29] s390x/tcg: remove SMP warning Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 16/29] configure: s390x supports mttcg now Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 17/29] s390x/tcg: cache the qemu flic in a central function Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 18/29] s390x/kvm: cache the kvm " Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 19/29] s390x/flic: cache the common flic class " Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 20/29] s390x/sclp: fix event mask handling Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 21/29] s390x/tcg: wire up pci instructions Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 22/29] s390x/cpumodel: allow zpci features in qemu model Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 23/29] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 24/29] s390x/pci: fixup the code walking IOMMU tables Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 25/29] s390x/pci: fixup global refresh Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 26/29] s390x/pci: use the right pal and pba in reg_ioat() Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 27/29] MAINTAINERS: add myself as overall s390x maintainer Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 28/29] MAINTAINERS: reorganize s390-ccw bios maintainership Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 29/29] MAINTAINERS: add David as additional tcg/s390 maintainer Cornelia Huck
2018-02-09  9:59 ` [Qemu-devel] [PULL 00/29] s390x: assorted updates no-reply
2018-02-09 13:27 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180209092524.31348-11-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=david@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).