From patchwork Fri Dec 14 05:23:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153746 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1674307ljp; Thu, 13 Dec 2018 21:30:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/UvjUBB0VQkbDiwEL8SfZThRiWcHUYfv+HK7+yTbn12258nkYj65MmVZN7IiL65dbCbyume X-Received: by 2002:a37:97c1:: with SMTP id z184mr1386436qkd.39.1544765418739; Thu, 13 Dec 2018 21:30:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544765418; cv=none; d=google.com; s=arc-20160816; b=CsP7cA2Dj6uy692aghQH0+Abyud0CT3SiduDuyUSNK4plYkA5b2AhfSkuLBt1jssM8 asICdeWDXPEF916woaR8FQcEaq4lseF9B7ZTpJYi5Jg+d9YeReQiExL11hmpUa0l9H0k OnuCXD7MtxGwZVOci9C3lhK975B0nJPQASVXqZPJSX+DvpyuqIm2OHWlsGVQtNhPEj7x N9dGiS5PityvGuxgLjM76oknuhWEojXIY1wy5zUekk8TvcJUgzkADPl8U9JnzgdfsxCN wORYkZCnJW2j2bc3e9Mg9NRTcpdmZWSVKAj/14LfzAQLoHJewNYccxp9+ltD2zVYrYpk RFmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=5o/z5l3bO66wgkYApWu4JJ3RvuJtCbD8lHdwebj4GOg=; b=T9cT1xnTJZb4MBOSOsN+CxC26Z0VYCAEbrbjJB5H39gtgZn51t8XVeka9uxfwkGw8A j0SRKX/mQ7kEPGTcs+CTujysF66aPP5i0OBHqUoMjkJ9WykkrYx/OhGd8S165EBlPZJi rtmnznT07UNtZSlzp9RJzcKj/ARaRUCHv0sDyA7rJn88QfOUxD9joBoXEL/2l9TCPFKM MA0uJMjp/oN5HpFeAoT3w990Y0bm6C5bdToOOpcjrvlcLDGWg+5uqrjZa1KlEQ9xD8Vy APeTPEwvHGsMLJtQUA0zDHwROhCoTrpH4HgOq9Pm8DLsVGSJ6mKuuG9AXb6mcTNfDDzp 00CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WaVcDcpL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 73si1915547qtg.288.2018.12.13.21.30.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 21:30:18 -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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WaVcDcpL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXg3G-0000Nr-4m for patch@linaro.org; Fri, 14 Dec 2018 00:30:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXfxW-0004Op-C7 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXfxT-0005KM-Gi for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:21 -0500 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:40562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXfxS-0005JJ-Bi for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:19 -0500 Received: by mail-oi1-x241.google.com with SMTP id t204so3623834oie.7 for ; Thu, 13 Dec 2018 21:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5o/z5l3bO66wgkYApWu4JJ3RvuJtCbD8lHdwebj4GOg=; b=WaVcDcpLToY7RlpKqt7MxET+FThWVNXbidx/DZSZIi5L8xlobIwxC28vs0ejbK9skO m5WJ0477dr8Hy2njZYC0OHeqedfWANVr4VflyHXvIpAAeSaDaWf1GrBIdOZBq8xIwrv1 Q2heZeYkpGQLFs36VtMzl/LQwnUrAQ29cdycE= 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; bh=5o/z5l3bO66wgkYApWu4JJ3RvuJtCbD8lHdwebj4GOg=; b=ZKqlZstSW+tbDfyCZFfxlDuS44dHLk1PlypjFpzDZC0mSm4E2BrUauyG9Ftp+RMLjY Wzm2XfYYE6UgEIYIMGPjBK7TlN0/w1TQuXZ979hFrlf5TkIZ+8PQwj8ffmsR9YEqpulq tKFPEbcPIbPliH0ZvZCKuDQwx8NMqb1S+9nXMUDgiMei+zoB9C0azGxvcsK0fTj05bVk eP6eXnUC2HaGDlGcTEuLTjOA9FdPwqnUx271/kjzB0RcvJOSwoY329KPo3rZaC+vd88B 3cRQCU5rxg1j53RKQC5YOjlZvbmXROiGr2tXow5xfjR5hH0z5NgKe50szcnERQVsFcmb NjUg== X-Gm-Message-State: AA+aEWbLqn/6ZrSoxkx/gmAyYnCXc7l1l5q1svOarSidmwp+VdSQsVHf Fr+lBe2DbTxi98H/hrfos7c5LmrE4X9suA== X-Received: by 2002:aca:4a56:: with SMTP id x83mr918775oia.11.1544765055657; Thu, 13 Dec 2018 21:24:15 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id r1sm1845379oti.44.2018.12.13.21.24.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 21:24:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 23:23:45 -0600 Message-Id: <20181214052410.11863-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214052410.11863-1-richard.henderson@linaro.org> References: <20181214052410.11863-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::241 Subject: [Qemu-devel] [PATCH v2 02/27] target/arm: Add SCTLR bits through ARMv8.5 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Post v8.4 bits taken from SysReg_v85_xml-00bet8. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson ---- v2: Review fixups from Peter. --- target/arm/cpu.h | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 39d4afdfe6..cd2519d43e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -989,12 +989,15 @@ void pmccntr_sync(CPUARMState *env); #define SCTLR_A (1U << 1) #define SCTLR_C (1U << 2) #define SCTLR_W (1U << 3) /* up to v6; RAO in v7 */ -#define SCTLR_SA (1U << 3) +#define SCTLR_nTLSMD_32 (1U << 3) /* v8.2-LSMAOC, AArch32 only */ +#define SCTLR_SA (1U << 3) /* AArch64 only */ #define SCTLR_P (1U << 4) /* up to v5; RAO in v6 and v7 */ +#define SCTLR_LSMAOE_32 (1U << 4) /* v8.2-LSMAOC, AArch32 only */ #define SCTLR_SA0 (1U << 4) /* v8 onward, AArch64 only */ #define SCTLR_D (1U << 5) /* up to v5; RAO in v6 */ #define SCTLR_CP15BEN (1U << 5) /* v7 onward */ #define SCTLR_L (1U << 6) /* up to v5; RAO in v6 and v7; RAZ in v8 */ +#define SCTLR_nAA (1U << 6) /* when v8.4-LSE is implemented */ #define SCTLR_B (1U << 7) /* up to v6; RAZ in v7 */ #define SCTLR_ITD (1U << 7) /* v8 onward */ #define SCTLR_S (1U << 8) /* up to v6; RAZ in v7 */ @@ -1002,35 +1005,53 @@ void pmccntr_sync(CPUARMState *env); #define SCTLR_R (1U << 9) /* up to v6; RAZ in v7 */ #define SCTLR_UMA (1U << 9) /* v8 onward, AArch64 only */ #define SCTLR_F (1U << 10) /* up to v6 */ -#define SCTLR_SW (1U << 10) /* v7 onward */ -#define SCTLR_Z (1U << 11) +#define SCTLR_SW (1U << 10) /* v7, RES0 in v8 */ +#define SCTLR_Z (1U << 11) /* in v7, RES1 in v8 */ +#define SCTLR_EOS (1U << 11) /* v8.5-ExS */ #define SCTLR_I (1U << 12) -#define SCTLR_V (1U << 13) +#define SCTLR_V (1U << 13) /* AArch32 only */ +#define SCTLR_EnDB (1U << 13) /* v8.3, AArch64 only */ #define SCTLR_RR (1U << 14) /* up to v7 */ #define SCTLR_DZE (1U << 14) /* v8 onward, AArch64 only */ #define SCTLR_L4 (1U << 15) /* up to v6; RAZ in v7 */ #define SCTLR_UCT (1U << 15) /* v8 onward, AArch64 only */ #define SCTLR_DT (1U << 16) /* up to ??, RAO in v6 and v7 */ #define SCTLR_nTWI (1U << 16) /* v8 onward */ -#define SCTLR_HA (1U << 17) +#define SCTLR_HA (1U << 17) /* up to v7, RES0 in v8 */ #define SCTLR_BR (1U << 17) /* PMSA only */ #define SCTLR_IT (1U << 18) /* up to ??, RAO in v6 and v7 */ #define SCTLR_nTWE (1U << 18) /* v8 onward */ #define SCTLR_WXN (1U << 19) #define SCTLR_ST (1U << 20) /* up to ??, RAZ in v6 */ -#define SCTLR_UWXN (1U << 20) /* v7 onward */ -#define SCTLR_FI (1U << 21) -#define SCTLR_U (1U << 22) +#define SCTLR_UWXN (1U << 20) /* v7 onward, AArch32 only */ +#define SCTLR_FI (1U << 21) /* up to v7, v8 RES0 */ +#define SCTLR_IESB (1U << 21) /* v8.2-IESB, AArch64 only */ +#define SCTLR_U (1U << 22) /* up to v6, RAO in v7 */ +#define SCTLR_EIS (1U << 22) /* v8.5-ExS */ #define SCTLR_XP (1U << 23) /* up to v6; v7 onward RAO */ +#define SCTLR_SPAN (1U << 23) /* v8.1-PAN */ #define SCTLR_VE (1U << 24) /* up to v7 */ #define SCTLR_E0E (1U << 24) /* v8 onward, AArch64 only */ #define SCTLR_EE (1U << 25) #define SCTLR_L2 (1U << 26) /* up to v6, RAZ in v7 */ #define SCTLR_UCI (1U << 26) /* v8 onward, AArch64 only */ -#define SCTLR_NMFI (1U << 27) -#define SCTLR_TRE (1U << 28) -#define SCTLR_AFE (1U << 29) -#define SCTLR_TE (1U << 30) +#define SCTLR_NMFI (1U << 27) /* up to v7, RAZ in v7VE and v8 */ +#define SCTLR_EnDA (1U << 27) /* v8.3, AArch64 only */ +#define SCTLR_TRE (1U << 28) /* AArch32 only */ +#define SCTLR_nTLSMD_64 (1U << 28) /* v8.2-LSMAOC, AArch64 only */ +#define SCTLR_AFE (1U << 29) /* AArch32 only */ +#define SCTLR_LSMAOE_64 (1U << 29) /* v8.2-LSMAOC, AArch64 only */ +#define SCTLR_TE (1U << 30) /* AArch32 only */ +#define SCTLR_EnIB (1U << 30) /* v8.3, AArch64 only */ +#define SCTLR_EnIA (1U << 31) /* v8.3, AArch64 only */ +#define SCTLR_BT0 (1ULL << 35) /* v8.5-BTI */ +#define SCTLR_BT1 (1ULL << 36) /* v8.5-BTI */ +#define SCTLR_ITFSB (1ULL << 37) /* v8.5-MemTag */ +#define SCTLR_TCF0 (3ULL << 38) /* v8.5-MemTag */ +#define SCTLR_TCF (3ULL << 40) /* v8.5-MemTag */ +#define SCTLR_ATA0 (1ULL << 42) /* v8.5-MemTag */ +#define SCTLR_ATA (1ULL << 43) /* v8.5-MemTag */ +#define SCTLR_DSSBS (1ULL << 44) /* v8.5 */ #define CPTR_TCPAC (1U << 31) #define CPTR_TTA (1U << 20)