From patchwork Sat Oct 1 10:05:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 677299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3smPK71wdZz9s3v for ; Sat, 1 Oct 2016 20:13:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fBD3pWMZ; dkim-atps=neutral Received: from localhost ([::1]:54951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqHIN-0002ue-Uy for incoming@patchwork.ozlabs.org; Sat, 01 Oct 2016 06:13:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqHCO-000630-FN for qemu-devel@nongnu.org; Sat, 01 Oct 2016 06:07:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bqHCM-0007bD-Av for qemu-devel@nongnu.org; Sat, 01 Oct 2016 06:07:15 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqHCL-0007ad-NG for qemu-devel@nongnu.org; Sat, 01 Oct 2016 06:07:14 -0400 Received: by mail-wm0-x244.google.com with SMTP id b201so1581201wmb.1 for ; Sat, 01 Oct 2016 03:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k3Z7qk3ZgUerJWU69sz3HDY6kMbpsUW2Tgzh+LLsY1c=; b=fBD3pWMZb8kyoG5T3l8Q3TG6w2b+EI9nzmXKF/0GudkAaahacGCI9HdUnJ7IBLwRHk qFpX+j10YR+81DorOT5CDV+AZgUeHHa2bei1H1mnV0gAartC/CkTKYeKKNU2tYHgBEvB 35o0PLo4vTRxFDX0dzypBggMXBHD0jxA5Tsc4YZqbZksTVFDNt9H0WF4NkIBwIAL1tnA 2mgu62ZTFzgSIv18P16fU0g/IdJWFqCcQ80s8ZJ+GI+TAOMFwrikT37CxceP4ab3A/S4 Ei8kinVHYRKdd3HOtABgIBPELOQwrYxxLHmIp88aN9b6/sj0T9MJ7ZEH8Ddgn0vaceFW Meag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k3Z7qk3ZgUerJWU69sz3HDY6kMbpsUW2Tgzh+LLsY1c=; b=gUjCQiZUKlomqOdBiCPOBZaAUsjEW4FzGrz29Qjo6OADJ73WoJE9eeiJeVsiLJP8c3 YyqS77BA6H2MN5AZM17+Aldt1oNGXFVgn45Wu3a7uAVzoesEvV/HAI+eEUgP3cUB63qi hUuuUUG/7HKAZo6l1zV7hMllhq2DfInNqr+8EBDUQnyLNHe5Ly9Hc/Y7HsdYlzrXHmBz NVmxbjoNDD1u6byQj4cYzZe02QN3Osr8QV0A/nJjHKIkbAF15/K4vC+JgNFlc5CjiBqA OQctNHri3v6o0DdGQfJ/WUMwdT3YENO9/It+V0IPLrJ4BQgzPCXVb3oI/17cIQHwEIKy MpgQ== X-Gm-Message-State: AA6/9RkmaQcwji8sH7NxOLiWla4XDCcErt2iRLl0ULxTK3657QYfDTjJI4C+wV7HG3dPlQ== X-Received: by 10.28.230.203 with SMTP id e72mr1864763wmi.13.1475316433140; Sat, 01 Oct 2016 03:07:13 -0700 (PDT) Received: from localhost (x55b4da19.dyn.telefonica.de. [85.180.218.25]) by smtp.gmail.com with ESMTPSA id f10sm23824817wje.14.2016.10.01.03.07.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Oct 2016 03:07:12 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 1 Oct 2016 12:05:11 +0200 Message-Id: <1475316333-9776-8-git-send-email-atar4qemu@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1475316333-9776-1-git-send-email-atar4qemu@gmail.com> References: <1475316333-9776-1-git-send-email-atar4qemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 07/29] target-sparc: implement UA2005 scratchpad registers 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Artyom Tarasenko --- target-sparc/asi.h | 1 + target-sparc/cpu.h | 1 + target-sparc/ldst_helper.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/target-sparc/asi.h b/target-sparc/asi.h index c9a1849..d8d6284 100644 --- a/target-sparc/asi.h +++ b/target-sparc/asi.h @@ -211,6 +211,7 @@ #define ASI_AFSR 0x4c /* Async fault status register */ #define ASI_AFAR 0x4d /* Async fault address register */ #define ASI_EC_TAG_DATA 0x4e /* E-cache tag/valid ram diag acc */ +#define ASI_HYP_SCRATCHPAD 0x4f /* (4V) Hypervisor scratchpad */ #define ASI_IMMU 0x50 /* Insn-MMU main register space */ #define ASI_IMMU_TSB_8KB_PTR 0x51 /* Insn-MMU 8KB TSB pointer reg */ #define ASI_IMMU_TSB_64KB_PTR 0x52 /* Insn-MMU 64KB TSB pointer reg */ diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index ff2e053..0b5c79f 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -512,6 +512,7 @@ struct CPUSPARCState { uint32_t gl; // UA2005 /* UA 2005 hyperprivileged registers */ uint64_t hpstate, htstate[MAXTL_MAX], hintp, htba, hver, hstick_cmpr, ssr; + uint64_t scratch[8]; CPUTimer *hstick; // UA 2005 /* Interrupt vector registers */ uint64_t ivec_status; diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 7607128..5fb9024 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -1610,6 +1610,18 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr, } break; } + case ASI_SCRATCHPAD: /* UA2005 privileged scratchpad */ + if (unlikely((addr >= 0x20) && (addr < 0x30))) { + /* Hyperprivileged access only */ + cpu_unassigned_access(cs, addr, false, false, 1, size); + } + /* fall through */ + case ASI_HYP_SCRATCHPAD: /* UA2005 hyperprivileged scratchpad */ + { + unsigned int i = (addr >> 3) & 0x7; + ret = env->scratch[i]; + break; + } case ASI_DCACHE_DATA: /* D-cache data */ case ASI_DCACHE_TAG: /* D-cache tag access */ case ASI_ESTATE_ERROR_EN: /* E-cache error enable */ @@ -2056,6 +2068,9 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val, return; case ASI_INTR_RECEIVE: /* Interrupt data receive */ env->ivec_status = val & 0x20; + if (!env->ivec_status) { + cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); + } return; case ASI_NUCLEUS_QUAD_LDD: /* Nucleus quad LDD 128 bit atomic */ case ASI_NUCLEUS_QUAD_LDD_L: /* Nucleus quad LDD 128 bit atomic LE */ @@ -2075,6 +2090,19 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val, /* Only stda allowed */ helper_raise_exception(env, TT_ILL_INSN); return; + case ASI_SCRATCHPAD: /* UA2005 privileged scratchpad */ + if (unlikely((addr >= 0x20) && (addr < 0x30))) { + /* Hyperprivileged access only */ + cpu_unassigned_access(cs, addr, true, false, 1, size); + } + /* fall through */ + case ASI_HYP_SCRATCHPAD: /* UA2005 hyperprivileged scratchpad */ + { + unsigned int i = (addr >> 3) & 0x7; + env->scratch[i] = val; + return; + } + case ASI_DCACHE_DATA: /* D-cache data */ case ASI_DCACHE_TAG: /* D-cache tag access */ case ASI_ESTATE_ERROR_EN: /* E-cache error enable */