From patchwork Wed Jun 27 09:54:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia Liu X-Patchwork-Id: 167588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF03EB6FF7 for ; Wed, 27 Jun 2012 19:56:04 +1000 (EST) Received: from localhost ([::1]:54035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sjoyg-0005oC-OD for incoming@patchwork.ozlabs.org; Wed, 27 Jun 2012 05:56:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sjoxq-0003gb-R4 for qemu-devel@nongnu.org; Wed, 27 Jun 2012 05:55:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sjoxj-00040m-Tg for qemu-devel@nongnu.org; Wed, 27 Jun 2012 05:55:10 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:54183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sjoxj-0003SV-L4 for qemu-devel@nongnu.org; Wed, 27 Jun 2012 05:55:03 -0400 Received: by mail-pz0-f45.google.com with SMTP id n2so1239941dad.4 for ; Wed, 27 Jun 2012 02:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :content-type; bh=ly8K3Sn0BesqUEnWjnCndqlU84hc+8L2Kqnj5VNfuJU=; b=JsV3aDwGG4a24SSqHsrvutyDqiW8Fm2Aw6Pwcd81CUiFsHbfKhvOkL30sw4RH40FWK w/dwHwDLRbrtDmb48q1vEscEnJHOjaa3aZk1R539iq8WQv+iae11ubQWq3ilOVYrvroT L2B61PcIKQUWcXrXOyisegQS9wDhwCGEB0kgYC+253pqkfjCV5/+Xd45vCaxPfTGN7gX CyFJtA9eVnVk67T+8VYMIH0eGnpC1GRLkhsS2tHUwJWYrEt9177klrn+nRg2xUtpYEnt O6VfRo5noWiRHrkG8aIp57RoiR++iPhme6kMCoChzitWlGmobaq1crglQN+mPCvKt9tE HVKA== Received: by 10.68.200.138 with SMTP id js10mr45046808pbc.23.1340790902567; Wed, 27 Jun 2012 02:55:02 -0700 (PDT) Received: from localhost ([1.202.183.51]) by mx.google.com with ESMTPS id rg10sm664684pbc.54.2012.06.27.02.54.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jun 2012 02:55:01 -0700 (PDT) From: Jia Liu To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2012 17:54:02 +0800 Message-Id: <1340790854-15580-5-git-send-email-proljc@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340790854-15580-1-git-send-email-proljc@gmail.com> References: <1340790854-15580-1-git-send-email-proljc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH v7 04/16] target-or32: Add interrupt support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add OpenRISC interrupt support. Signed-off-by: Jia Liu --- cpu-exec.c | 17 +++++++++++++ target-openrisc/Makefile.objs | 2 +- target-openrisc/cpu.h | 9 ++++++- target-openrisc/helper.h | 25 +++++++++++++++++++ target-openrisc/intrpt.c | 44 +++++++++++++++++++++++++++++++++ target-openrisc/intrpt_helper.c | 52 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 target-openrisc/helper.h create mode 100644 target-openrisc/intrpt_helper.c diff --git a/cpu-exec.c b/cpu-exec.c index 7d0d87b..1d2fe6b 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -378,6 +378,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/target-openrisc/Makefile.objs b/target-openrisc/Makefile.objs index 21b76b2..65f9391 100644 --- a/target-openrisc/Makefile.objs +++ b/target-openrisc/Makefile.objs @@ -1,3 +1,3 @@ obj-$(CONFIG_SOFTMMU) += machine.o obj-y += cpu.o intrpt.o mmu.o translate.o -obj-y += mmu_helper.o +obj-y += intrpt_helper.o mmu_helper.o diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index dbb3f17..d499dc4 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -66,6 +66,10 @@ enum { /* Internal flags, delay slot flag */ #define D_FLAG 1 +/* Interrupt */ +#define NR_IRQS 32 +#define PIC_MASK 0xFFFFFFFF + /* Verison Register */ #define SPR_VR 0xFFFF003F @@ -304,6 +308,7 @@ struct CPUOpenRISCState { uint32_t picsr; /* Interrupt contrl register*/ #endif uint32_t feature; /* CPU Capabilities */ + void *irq[32]; /* Interrupt irq input */ }; #define TYPE_OPENRISC_CPU "or32-cpu" @@ -415,9 +420,11 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env) return (env->sr & SR_SM) == 0 ? MMU_USER_IDX : MMU_SUPERVISOR_IDX; } +#define CPU_INTERRUPT_TIMER CPU_INTERRUPT_TGT_INT_0 static inline bool cpu_has_work(CPUOpenRISCState *env) { - return true; + return env->interrupt_request & (CPU_INTERRUPT_HARD | + CPU_INTERRUPT_TIMER); } #include "exec-all.h" diff --git a/target-openrisc/helper.h b/target-openrisc/helper.h new file mode 100644 index 0000000..16d99b6 --- /dev/null +++ b/target-openrisc/helper.h @@ -0,0 +1,25 @@ +/* + * OpenRISC helper defines + * + * Copyright (c) 2011-2012 Jia Liu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "def-helper.h" + +/* interrupt */ +DEF_HELPER_FLAGS_1(rfe, 0, void, env) + +#include "def-helper.h" diff --git a/target-openrisc/intrpt.c b/target-openrisc/intrpt.c index a3bb7f8..9b02618 100644 --- a/target-openrisc/intrpt.c +++ b/target-openrisc/intrpt.c @@ -27,4 +27,48 @@ void do_interrupt(CPUOpenRISCState *env) { +#ifndef CONFIG_USER_ONLY + if (env->flags & D_FLAG) { /* Delay Slot insn */ + env->flags &= ~D_FLAG; + env->sr |= SR_DSX; + if (env->exception_index == EXCP_TICK || + env->exception_index == EXCP_INT || + env->exception_index == EXCP_SYSCALL || + env->exception_index == EXCP_FPE) { + env->epcr = env->jmp_pc; + } else { + env->epcr = env->pc - 4; + } + } else { + if (env->exception_index == EXCP_TICK || + env->exception_index == EXCP_INT || + env->exception_index == EXCP_SYSCALL || + env->exception_index == EXCP_FPE) { + env->epcr = env->npc; + } else { + env->epcr = env->pc; + } + } + + /* For machine-state changed between user-mode and supervisor mode, + we need flush TLB when we enter&exit EXCP. */ + tlb_flush(env, 1); + + env->esr = env->sr; + env->sr &= ~SR_DME; + env->sr &= ~SR_IME; + env->sr |= SR_SM; + env->sr &= ~SR_IEE; + env->sr &= ~SR_TEE; + env->tlb->map_address_data = &get_phys_nommu; + env->tlb->map_address_code = &get_phys_nommu; + + if (env->exception_index > 0 && env->exception_index < EXCP_NR) { + env->pc = (env->exception_index << 8); + } else { + cpu_abort(env, "Unhandled exception 0x%x\n", env->exception_index); + } +#endif + + env->exception_index = -1; } diff --git a/target-openrisc/intrpt_helper.c b/target-openrisc/intrpt_helper.c new file mode 100644 index 0000000..fca0202 --- /dev/null +++ b/target-openrisc/intrpt_helper.c @@ -0,0 +1,52 @@ +/* + * OpenRISC interrupt helper routines + * + * Copyright (c) 2011-2012 Jia Liu + * Feng Gao + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "cpu.h" +#include "helper.h" + +void HELPER(rfe)(CPUOpenRISCState *env) +{ +#ifndef CONFIG_USER_ONLY + int need_flush_tlb = (env->sr & (SR_SM | SR_IME | SR_DME)) ^ + (env->esr & (SR_SM | SR_IME | SR_DME)); +#endif + env->pc = env->epcr; + env->npc = env->epcr; + env->sr = env->esr; + +#ifndef CONFIG_USER_ONLY + if (env->sr & SR_DME) { + env->tlb->map_address_data = &get_phys_data; + } else { + env->tlb->map_address_data = &get_phys_nommu; + } + + if (env->sr & SR_IME) { + env->tlb->map_address_code = &get_phys_code; + } else { + env->tlb->map_address_code = &get_phys_nommu; + } + + if (need_flush_tlb) { + tlb_flush(env, 1); + } +#endif + env->interrupt_request |= CPU_INTERRUPT_EXITTB; +}