From patchwork Mon Nov 17 16:47:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40963 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D65CD24035 for ; Mon, 17 Nov 2014 17:00:02 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf3381953lam.2 for ; Mon, 17 Nov 2014 09:00:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=iwwi0ehsdjvfMpNiN8fhYo0L6CliQoOVJkTPUYGoNkU=; b=ccASQtbwRhWCcafpi+j1waEX9udGTiqqXPip8/AON3DhtwYnV8USctvFw2wUHzsbu9 C5KcLjEzfYT7WJNfXoLnymrysIWWnnamK8q3+gZWmP9FMsl4jhyMPrH/cbFxZX/IhVel erpea4gcoWOioctX5oe3S6y2ao4iekWWP6zDyGfXvwf1cJfs0jZrSIl+2LAOdqGn0cPC FiTQlx47QQvXubVzSoqd9dMHRpo4KHa1DsVXbZlnRPXOChrAesJtOPPbyj287frkIBjO LKwT2+LZJsNDiFzsdHNE8ayYqWiqvzbE7nvcgOZHea9qlP0YAV15nXWkCfSCVIUuC4e9 dBfA== X-Gm-Message-State: ALoCoQmU6rmmN2fTxYHVOzJgeLYk4Q7x0zJPdYPyHpjeQeHG5ZYsTrAKUSOZjYjK8lv4YjmtLV7G X-Received: by 10.180.182.164 with SMTP id ef4mr4640167wic.0.1416243601619; Mon, 17 Nov 2014 09:00:01 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.170 with SMTP id p10ls92075lal.35.gmail; Mon, 17 Nov 2014 09:00:01 -0800 (PST) X-Received: by 10.112.200.34 with SMTP id jp2mr29282748lbc.1.1416243601459; Mon, 17 Nov 2014 09:00:01 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id po9si35640848lbb.10.2014.11.17.09.00.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 09:00:01 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id gm9so1991688lab.18 for ; Mon, 17 Nov 2014 09:00:01 -0800 (PST) X-Received: by 10.112.235.196 with SMTP id uo4mr28763265lbc.66.1416243601324; Mon, 17 Nov 2014 09:00:01 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1188837lbc; Mon, 17 Nov 2014 09:00:00 -0800 (PST) X-Received: by 10.236.1.70 with SMTP id 46mr3690646yhc.78.1416243599681; Mon, 17 Nov 2014 08:59:59 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k10si64519140qae.72.2014.11.17.08.59.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:59:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:48932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPeg-00054H-N9 for patch@linaro.org; Mon, 17 Nov 2014 11:59:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTb-0001b7-L3 for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPTW-0007CF-OG for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:31 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:43693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTW-0007CB-Jm for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:26 -0500 Received: by mail-pa0-f53.google.com with SMTP id kq14so3661073pab.40 for ; Mon, 17 Nov 2014 08:48:26 -0800 (PST) X-Received: by 10.68.174.131 with SMTP id bs3mr30644861pbc.20.1416242905985; Mon, 17 Nov 2014 08:48:25 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id r2sm18499056pdi.60.2014.11.17.08.48.24 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:48:25 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Mon, 17 Nov 2014 10:47:43 -0600 Message-Id: <1416242878-876-12-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1416242878-876-1-git-send-email-greg.bellows@linaro.org> References: <1416242878-876-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.53 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v11 11/26] target-arm: add SDER definition 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Added CP register defintions for SDER and SDER32_EL3 as well as cp15.sder for register storage. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v8 -> v9 - Fixed declaration order of the SDER register components v7 -> v8 - Added SDER32_EL3 register definition - Changed sder name from c1_sder to sder - Changed sder from uint32_t to uint64_t. --- target-arm/cpu.h | 1 + target-arm/helper.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 2afe93a..12bd6ec 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -181,6 +181,7 @@ typedef struct CPUARMState { uint64_t c1_sys; /* System control register. */ uint64_t c1_coproc; /* Coprocessor access register. */ uint32_t c1_xscaleauxcr; /* XScale auxiliary control register. */ + uint64_t sder; /* Secure debug enable register. */ uint32_t nsacr; /* Non-secure access control register. */ uint64_t ttbr0_el1; /* MMU translation table base 0. */ uint64_t ttbr1_el1; /* MMU translation table base 1. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 691bb8e..284f255 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2344,6 +2344,14 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 0, .access = PL3_RW, .fieldoffset = offsetoflow32(CPUARMState, cp15.scr_el3), .resetfn = arm_cp_reset_ignore, .writefn = scr_write }, + { .name = "SDER32_EL3", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 1, .opc2 = 1, + .access = PL3_RW, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.sder) }, + { .name = "SDER", + .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 1, + .access = PL3_RW, .resetvalue = 0, + .fieldoffset = offsetoflow32(CPUARMState, cp15.sder) }, /* TODO: Implement NSACR trapping of secure EL1 accesses to EL3 */ { .name = "NSACR", .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 2, .access = PL3_W | PL1_R, .resetvalue = 0,