From patchwork Wed Jan 11 20:19:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 9511437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A63A60710 for ; Wed, 11 Jan 2017 21:11:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D9702869D for ; Wed, 11 Jan 2017 21:11:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6236C2869F; Wed, 11 Jan 2017 21:11:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E666F2869E for ; Wed, 11 Jan 2017 21:11:04 +0000 (UTC) Received: from localhost ([::1]:57126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRQAi-0008G6-39 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Jan 2017 16:11:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRPOC-0006c8-NR for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRPOA-00010M-LM for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:56 -0500 Received: from mail-wj0-x242.google.com ([2a00:1450:400c:c01::242]:34022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cRPOA-00010C-FG for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:54 -0500 Received: by mail-wj0-x242.google.com with SMTP id qs7so54529543wjc.1 for ; Wed, 11 Jan 2017 12:20:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=REd0pjPl+hrpG0ko9uqbdSEXZZj6gkFIrcZYUKXVOAE=; b=QdiF8ZP+rCCzCi/yPhE2HvksN19+xVEI4JGJpQKelYEOPNi/ZPDqTRrqA1XrC1+GYZ UH/p2LJQARcoCROn7bgXdiqAdkQXn/lCwJ1nSN5l3rOvFxfn4OTaz1Eob8HSvgfpKdPi V+8cSHMsizNEFiGuH+i7wfrAvTGvtU0NERLhMuiAf77J6NNi3kZQbt611I4z+NBc6zU1 HIcJLrh8oWim6vC6uElhDK/mQ6rm1RU4DiqHVZlYQtAO3Xk3EmWMjbwwMcqt/K4CrY0O AtpCIHCDIOmW4i3vOiB9m5vHvgv9U6NakmhEGUDtrbA99gCxlK9bfQ8VYv5dKAlPzQmy yvdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=REd0pjPl+hrpG0ko9uqbdSEXZZj6gkFIrcZYUKXVOAE=; b=IQVgL3W8vKf2fa1I54dxZUqYA+A01Gof/pZZ9xmZodh6Bza/YIHlbfh/avT0oNCrtR Xxsp5JaY3S1U278X1kUX35PZP3IX3LcOWW28/fe/4sduNX0mBcGmehwk/1+Y/rY9nMoK WBG1lKPvts0UCKAUG5VoMroipm7eCBLeTDp38EoR7gTSAbvIgkq9l9Mm+Fg1QutediHJ FGMbQOSgjZ1KFD7XM7ykxTjNon7ZD6O1BmW15hB0MhF+u4yTWTA5eLycZSwxjTdUX9nB q/2y/8KXERJzGAEKoi6dg3xJtpm/6/zDnxdt74CmEh5BbKkRhrXCnLZbWL9l5RFn7yUb dyBQ== X-Gm-Message-State: AIkVDXLAEFgJl9WI43dhXZCXH+ZlHmv8DXSiQUgmrTwebde4MzTXfMh8H5rFSqyMzeHrRA== X-Received: by 10.194.179.198 with SMTP id di6mr7787973wjc.148.1484166053434; Wed, 11 Jan 2017 12:20:53 -0800 (PST) Received: from localhost (x55b4b54a.dyn.telefonica.de. [85.180.181.74]) by smtp.gmail.com with ESMTPSA id y3sm10101868wjy.34.2017.01.11.12.20.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2017 12:20:52 -0800 (PST) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Wed, 11 Jan 2017 21:19:42 +0100 Message-Id: <7edada4d1c26562843de80c9eb2339ca591f883b.1484165352.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c01::242 Subject: [Qemu-devel] [PATCH v2 11/30] target-sparc: implement UA2005 hypervisor traps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Artyom Tarasenko --- target/sparc/cpu.h | 1 + target/sparc/int64_helper.c | 37 ++++++++++++++++++++++++++++++++----- target/sparc/win_helper.c | 6 ++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 4f709e1..f26fdcf 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -79,6 +79,7 @@ #define TT_FILL 0xc0 #define TT_WOTHER (1 << 5) #define TT_TRAP 0x100 +#define TT_HTRAP 0x180 #endif #define PSR_NEG_SHIFT 23 diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c index 29360fa..8300eb4 100644 --- a/target/sparc/int64_helper.c +++ b/target/sparc/int64_helper.c @@ -78,8 +78,10 @@ void sparc_cpu_do_interrupt(CPUState *cs) static int count; const char *name; - if (intno < 0 || intno >= 0x180) { + if (intno < 0 || intno >= 0x1ff) { name = "Unknown"; + } else if (intno >= 0x180) { + name = "Hyperprivileged Trap Instruction"; } else if (intno >= 0x100) { name = "Trap Instruction"; } else if (intno >= 0xc0) { @@ -135,16 +137,36 @@ void sparc_cpu_do_interrupt(CPUState *cs) tsptr->tnpc = env->npc; tsptr->tt = intno; + if (cpu_has_hypervisor(env)) { + env->htstate[env->tl] = env->hpstate; + /* XXX OpenSPARC T1 - UltraSPARC T3 have MAXPTL=2 + but this may change in the future */ + if (env->tl > 2) { + env->hpstate |= HS_PRIV; + } + } + switch (intno) { case TT_IVEC: - cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_IG); + if (!cpu_has_hypervisor(env)) { + cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_IG); + } break; case TT_TFAULT: case TT_DFAULT: case TT_TMISS ... TT_TMISS + 3: case TT_DMISS ... TT_DMISS + 3: case TT_DPROT ... TT_DPROT + 3: - cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_MG); + if (cpu_has_hypervisor(env)) { + env->hpstate |= HS_PRIV; + env->pstate = PS_PEF | PS_PRIV; + } else { + cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_MG); + } + break; + case TT_INSN_REAL_TRANSLATION_MISS ... TT_DATA_REAL_TRANSLATION_MISS: + case TT_HTRAP ... TT_HTRAP + 127: + env->hpstate |= HS_PRIV; break; default: cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_AG); @@ -158,8 +180,13 @@ void sparc_cpu_do_interrupt(CPUState *cs) } else if ((intno & 0x1c0) == TT_FILL) { cpu_set_cwp(env, cpu_cwp_inc(env, env->cwp + 1)); } - env->pc = env->tbr & ~0x7fffULL; - env->pc |= ((env->tl > 1) ? 1 << 14 : 0) | (intno << 5); + + if (cpu_hypervisor_mode(env)) { + env->pc = (env->htba & ~0x3fffULL) | (intno << 5); + } else { + env->pc = env->tbr & ~0x7fffULL; + env->pc |= ((env->tl > 1) ? 1 << 14 : 0) | (intno << 5); + } env->npc = env->pc + 4; cs->exception_index = -1; } diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c index 2d5b546..45ee4e6 100644 --- a/target/sparc/win_helper.c +++ b/target/sparc/win_helper.c @@ -366,6 +366,9 @@ void helper_done(CPUSPARCState *env) env->asi = (tsptr->tstate >> 24) & 0xff; cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f); cpu_put_cwp64(env, tsptr->tstate & 0xff); + if (cpu_has_hypervisor(env)) { + env->hpstate = env->htstate[env->tl]; + } env->tl--; trace_win_helper_done(env->tl); @@ -387,6 +390,9 @@ void helper_retry(CPUSPARCState *env) env->asi = (tsptr->tstate >> 24) & 0xff; cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f); cpu_put_cwp64(env, tsptr->tstate & 0xff); + if (cpu_has_hypervisor(env)) { + env->hpstate = env->htstate[env->tl]; + } env->tl--; trace_win_helper_retry(env->tl);