qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jia Liu <proljc@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 08/15] Openrisc: add programmable interrupt controller support
Date: Thu, 17 May 2012 16:35:51 +0800	[thread overview]
Message-ID: <1337243758-11802-9-git-send-email-proljc@gmail.com> (raw)
In-Reply-To: <1337243758-11802-1-git-send-email-proljc@gmail.com>

add the openrisc programmable interrupt controller support.

Signed-off-by: Jia Liu <proljc@gmail.com>
---
 cpu-exec.c        |   17 +++++++++++++++++
 hw/openrisc_pic.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/cpu-exec.c b/cpu-exec.c
index ba10db1..845b2ae 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -375,6 +375,23 @@ int cpu_exec(CPUArchState *env)
                         do_interrupt(env);
                         next_tb = 0;
                     }
+#elif defined(TARGET_OPENRISC)
+                    {
+                        int idx = -1;
+                        if ((interrupt_request & CPU_INTERRUPT_HARD)
+                            && (env->sr & SR_IEE)) {
+                            idx = EXCP_INT;
+                        }
+                        if ((interrupt_request & CPU_INTERRUPT_TIMER)
+                            && (env->sr & SR_TEE)) {
+                            idx = EXCP_TICK;
+                        }
+                        if (idx >= 0) {
+                            env->exception_index = idx;
+                            do_interrupt(env);
+                            next_tb = 0;
+                        }
+                    }
 #elif defined(TARGET_SPARC)
                     if (interrupt_request & CPU_INTERRUPT_HARD) {
                         if (cpu_interrupts_enabled(env) &&
diff --git a/hw/openrisc_pic.c b/hw/openrisc_pic.c
index 0abdd50..52e48ec 100644
--- a/hw/openrisc_pic.c
+++ b/hw/openrisc_pic.c
@@ -29,3 +29,51 @@ void cpu_openrisc_pic_reset(CPUOPENRISCState *env)
     env->picmr = 0x00000000;
     env->picsr = 0x00000000;
 }
+
+/* openrisc pic handler */
+static void openrisc_pic_cpu_handler(void *opaque, int irq, int level)
+{
+    CPUOPENRISCState *env = (CPUOPENRISCState *)opaque;
+    int i;
+    uint32_t irq_bit = 1 << irq;
+
+    if (irq > 31 || irq < 0) {
+        return;
+    }
+
+    if (level) {
+        env->picsr |= irq_bit;
+    } else {
+        env->picsr &= ~irq_bit;
+    }
+
+    for (i = 0; i < 32; i++) {
+        if ((env->picsr && (1 << i)) && (env->picmr && (1 << i))) {
+            cpu_interrupt(env, CPU_INTERRUPT_HARD);
+        } else {
+            cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
+            env->picsr &= ~(1 << i);
+        }
+    }
+}
+
+void cpu_openrisc_pic_init(CPUOPENRISCState *env)
+{
+    int i;
+    qemu_irq *qi;
+    qi = qemu_allocate_irqs(openrisc_pic_cpu_handler, env, NR_IRQS);
+
+    for (i = 0; i < NR_IRQS; i++) {
+        env->irq[i] = qi[i];
+    }
+}
+
+void cpu_openrisc_store_picmr(CPUOPENRISCState *env, uint32_t value)
+{
+    env->picmr |= value;
+}
+
+void cpu_openrisc_store_picsr(CPUOPENRISCState *env, uint32_t value)
+{
+    env->picsr &= ~value;
+}
-- 
1.7.9.5

  parent reply	other threads:[~2012-05-17  8:38 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17  8:35 [Qemu-devel] [PATCH 00/15] Qemu Openrisc support Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 01/15] Openrisc: add target stub Jia Liu
2012-05-17  9:38   ` 陳韋任
2012-05-17 14:14   ` Andreas Färber
2012-05-18  1:34     ` Jia Liu
2012-05-18  2:30       ` 陳韋任
2012-05-18  2:56       ` 陳韋任
2012-05-20 14:14         ` Andreas Färber
2012-05-21  3:01     ` Jia Liu
2012-05-19  8:51   ` Blue Swirl
2012-05-20 14:11     ` Andreas Färber
2012-05-21  6:25     ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 02/15] Openrisc: add MMU support Jia Liu
2012-05-19  7:41   ` Blue Swirl
2012-05-21  6:24     ` Jia Liu
2012-05-21  9:03       ` 陳韋任
2012-05-21 17:41         ` Blue Swirl
2012-05-17  8:35 ` [Qemu-devel] [PATCH 03/15] Openrisc: add instructions translation Jia Liu
2012-05-17 12:11   ` Max Filippov
2012-05-18  1:04     ` Jia Liu
2012-05-18  3:53       ` 陳韋任
2012-05-18 10:33       ` Max Filippov
2012-05-19 10:02   ` Blue Swirl
2012-05-19 10:57     ` Peter Maydell
2012-05-19 11:29       ` Blue Swirl
2012-05-23  6:11     ` Jia Liu
2012-05-23 18:59       ` Blue Swirl
2012-05-25 23:50         ` Jia Liu
2012-05-26  0:37         ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 04/15] Openrisc: add interrupt support Jia Liu
2012-05-19  7:30   ` Blue Swirl
2012-05-23  7:06     ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 05/15] Openrisc: add exception support Jia Liu
2012-05-19  7:22   ` Blue Swirl
2012-05-23  7:09     ` Jia Liu
2012-05-23 19:11       ` Blue Swirl
2012-05-25  1:25         ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 06/15] Openrisc: add int instruction helpers Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 07/15] Openrisc: add float " Jia Liu
2012-05-19  8:29   ` Blue Swirl
2012-05-23  7:21     ` Jia Liu
2012-05-17  8:35 ` Jia Liu [this message]
2012-05-19  8:33   ` [Qemu-devel] [PATCH 08/15] Openrisc: add programmable interrupt controller support Blue Swirl
2012-05-17  8:35 ` [Qemu-devel] [PATCH 09/15] Openrisc: add timer support Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 10/15] Openrisc: add a simulation board Jia Liu
2012-05-19  7:51   ` Blue Swirl
2012-05-23  7:54     ` Jia Liu
2012-05-23 19:17       ` Blue Swirl
2012-05-25  2:31         ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 11/15] Openrisc: add system instruction helpers Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 12/15] Openrisc: add gdb stub support Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 13/15] Openrisc: add linux syscall, signal and termbits Jia Liu
2012-05-19  7:17   ` Blue Swirl
2012-05-19  8:57     ` Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 14/15] Openrisc: add linux user support Jia Liu
2012-05-17  8:35 ` [Qemu-devel] [PATCH 15/15] Openrisc: add testcases Jia Liu

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=1337243758-11802-9-git-send-email-proljc@gmail.com \
    --to=proljc@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /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).