From nobody Tue Nov 18 15:29:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611290836; cv=none; d=zohomail.com; s=zohoarc; b=U9VZ/SWkiX+X+1h65RGevHpg19dq5U7KgNk+fIX8q0LWXuKW1vXAOkNbPQSMiSoi9itZJKiaW5EYsZ5HeiQTtyQAqrXZj4RP0dxufiGx0pzc9m3dzyWRYa3Nj2zspaem9wv4qKWa7lAmRAZakN81Ta5PoLSV/WV1cT7kn7ocMUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611290836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UqZ8UhKAARsMaNumLlP53he0mq/0Zh4f5MBCpErsUgA=; b=Zj42FrupVcqYHNajaPwAo2IjJJ1Z3fdRhP5r98GCm0lKIxBJDTaNsdbkonE5YhQt5TfKZuVu65aiwz4T0mg3Z1AR16bUUDtCbcAgK47nehwXLyFNj28ze9ftZ3THnCec8f79AMA5l6/AiD5TP2D4z5aQ75CdA/6o51ONNoTL6MM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611290836752330.7618726289353; Thu, 21 Jan 2021 20:47:16 -0800 (PST) Received: from localhost ([::1]:43354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2oLr-00072y-NP for importer@patchew.org; Thu, 21 Jan 2021 23:47:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2oKX-0005RH-TO for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:53 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:52258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2oKV-0000hW-VG for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:53 -0500 Received: by mail-pj1-x102f.google.com with SMTP id kx7so3014036pjb.2 for ; Thu, 21 Jan 2021 20:45:51 -0800 (PST) Received: from cube.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id b10sm7050494pgh.15.2021.01.21.20.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 20:45:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UqZ8UhKAARsMaNumLlP53he0mq/0Zh4f5MBCpErsUgA=; b=YKbIN/uEc1iLe37low8Kf8kHb9z/62zixr+ClK5bneSY3s6YqlmvI4YTA4PAsGGGOa tilK2sjUU0yLWUfX5wlynrcqKa2AD7BCV4MPdZPC4EAJCGivRBtoKBS43frJlcvPGm5h yggqDYKsnrG0evE6JmkafFfN1XsCZkjb1Ey/CD0P0J74+4XsRWuoGAuqELGTvtytMTDJ e6ROZZzv6AZqXx+dizJmkTQo5MOXmEMtf5xaO459gdSb92YosUr39RwXBQR9VeWm2obz 9ZzJWftvp3HqIz3Saww/NK6c6slM2CH1oNon8pDGpNGqmB/VQJQSkVccmMYMUmE5Bc3F uOPg== 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:mime-version:content-transfer-encoding; bh=UqZ8UhKAARsMaNumLlP53he0mq/0Zh4f5MBCpErsUgA=; b=b8rCqMAH8hS+bref0UzLvzKPWfOH7SwsY2CvFWcO2pu0I7tuqZfIVcGlhZ5gQMN98G YDxkysx6hMlQf0azlp4T5B25TnVyrwCBt80cY/4ZkW66O1MsgWrzNUC5H8WpSf3z8ZiF Qc0jzuXIWd/DAyq55lnfn2QrjAs27XqKIXLZaGNCgBaw86gmBgkbP5lRIa93kKnl4rpq qctSh7PCObLYMPhVb0dM8mGagt5hHoADmLsDGkNVBMnx5W03c0UNGoyqy4UzChsdk01S g9yCzz5qM11XOPAp7WQKEreMM95zi60JkD1f+iem8ecw/9eB4MyvT2YUfwxTJoMCfxfM CngA== X-Gm-Message-State: AOAM5314/4S5VXOsy/KmLIQZlXz6QcOsFmchxJJRQIa8HNrpJ958PJPI AjrbFm/p4L96vkz2qv5oP2Val6J9ugyvZaVXelTyK9aVEniJqOHSLs7oLOG4WLfjbjBWx9NXn59 S8JlG01Xsx4YYJvU/8PIAdtA0YirmWWHUATBxeL3jGKb1q7NlV0r7eYtztdbBEQ40TLwMzC0idQ == X-Google-Smtp-Source: ABdhPJzPO9qIxPJ99owOwj3bLW7ObR1Iz7gmnTwiECnZriZMjA4gJcpvmI/SO27GY5tIzVD7t7dvtw== X-Received: by 2002:a17:90a:520e:: with SMTP id v14mr3177394pjh.233.1611290750253; Thu, 21 Jan 2021 20:45:50 -0800 (PST) From: Rebecca Cran To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] target/arm: Remove PSTATE_SS from cpsr and move it into env->pstate. Date: Thu, 21 Jan 2021 21:45:35 -0700 Message-Id: <20210122044537.1823-2-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122044537.1823-1-rebecca@nuviainc.com> References: <20210122044537.1823-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=rebecca@nuviainc.com; helo=mail-pj1-x102f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rebecca Cran , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" cpsr has been treated as being the same as spsr, but it isn't. Since PSTATE_SS isn't in cpsr, remove it and move it into env->pstate. Signed-off-by: Rebecca Cran --- target/arm/helper-a64.c | 4 +--- target/arm/helper.c | 4 ++-- target/arm/op_helper.c | 9 +-------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index c426c23d2c4e..0d2ac7bb7ee3 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -1000,9 +1000,7 @@ void HELPER(exception_return)(CPUARMState *env, uint6= 4_t new_pc) */ mask =3D aarch32_cpsr_valid_mask(env->features, &env_archcpu(env)-= >isar); cpsr_write(env, spsr, mask, CPSRWriteRaw); - if (!arm_singlestep_active(env)) { - env->uncached_cpsr &=3D ~PSTATE_SS; - } + env->pstate &=3D ~PSTATE_SS; aarch64_sync_64_to_32(env); =20 if (spsr & CPSR_T) { diff --git a/target/arm/helper.c b/target/arm/helper.c index d2ead3fcbdbd..01b50316046b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9402,8 +9402,8 @@ static void take_aarch32_exception(CPUARMState *env, = int new_mode, * For exceptions taken to AArch32 we must clear the SS bit in both * PSTATE and in the old-state value we save to SPSR_, so zero i= t now. */ - env->uncached_cpsr &=3D ~PSTATE_SS; - env->spsr =3D cpsr_read(env); + env->pstate &=3D ~PSTATE_SS; + env->spsr &=3D ~PSTATE_SS; /* Clear IT bits. */ env->condexec_bits =3D 0; /* Switch to the new mode, and to the correct instruction set. */ diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 5e0f123043b5..65cb37d088f8 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -389,14 +389,7 @@ void HELPER(exception_bkpt_insn)(CPUARMState *env, uin= t32_t syndrome) =20 uint32_t HELPER(cpsr_read)(CPUARMState *env) { - /* - * We store the ARMv8 PSTATE.SS bit in env->uncached_cpsr. - * This is convenient for populating SPSR_ELx, but must be - * hidden from aarch32 mode, where it is not visible. - * - * TODO: ARMv8.4-DIT -- need to move SS somewhere else. - */ - return cpsr_read(env) & ~(CPSR_EXEC | PSTATE_SS); + return cpsr_read(env) & ~CPSR_EXEC; } =20 void HELPER(cpsr_write)(CPUARMState *env, uint32_t val, uint32_t mask) --=20 2.26.2 From nobody Tue Nov 18 15:29:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611290839; cv=none; d=zohomail.com; s=zohoarc; b=BKgxYWNjHDNndzYPOsFL40nRFp5MjtOdr+EcM7DoRhBb4gl9ENWSEt+97VUk4SxkLop2L0ZqSagF+qXoD8e7lbHYjUN/1iBVhAAfWhnH75WUTfu/BvXtiutB56RWhGrtAgtQ5yQ1VSOpeC4FDUF3SG0QXkwsFlLS+bYgC7BmqRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611290839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L5W98BS+qePyetQ3JdC9YY4Ow4oVa1fLbZ1axvKmbAI=; b=YheJv9MOSJswHVRlAk6caAzGECFmuobxur4AFps0Wi/NsOZNjqspJYBspvFbr2JjJWLQCZqaDgu2s03mzc8H/otr2mkJFs2JZipPXFW0W0H76yGWSMeQvNATP7aAuKj16uaoYFlRugGc4Ruaq7N6TQORaD1yIpPrbb2Lb95PLyY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611290839619943.8023638546194; Thu, 21 Jan 2021 20:47:19 -0800 (PST) Received: from localhost ([::1]:43704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2oLu-0007Be-DX for importer@patchew.org; Thu, 21 Jan 2021 23:47:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2oKa-0005Wc-L4 for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:56 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:39872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2oKY-0000iK-1H for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:56 -0500 Received: by mail-pl1-x629.google.com with SMTP id x18so2539442pln.6 for ; Thu, 21 Jan 2021 20:45:53 -0800 (PST) Received: from cube.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id b10sm7050494pgh.15.2021.01.21.20.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 20:45:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L5W98BS+qePyetQ3JdC9YY4Ow4oVa1fLbZ1axvKmbAI=; b=ph5Fy2q5Of/n+MO8HX0cu2zNnGTqZWQwxvuk55hPsH3O+GpEo+O0Ufk7DdVqwM6MuO +RiDPOn/a+dUo3eS5M/jgihtWfbCVWB4lYCo9vx9Vlt3P9AoTBrPUr0fDIfs4LcPvg4O Y0kmZZrj5QjEucWuNcEkTfH/mvVUzEbiCD+HqTSSyY4Ck6spFA8BBOKtQ52BS0vzrzo4 JfS8glGBHN2NPO85TWE63lbRByTj6oDnq2M5nGYziCPImUJIMCxDmxYLU6JM57bIiqfp /wyn36WglLiKcBKtDjNdXgJUa0kKYEt8+9XOILFuak2gz4jE+pcAu6qnb6RUrTGu4g8F VnDw== 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:mime-version:content-transfer-encoding; bh=L5W98BS+qePyetQ3JdC9YY4Ow4oVa1fLbZ1axvKmbAI=; b=ZPA0gkQxc78BnaOfwx3jsQZnZzr2PisKmgQRAyGzVQEdSwPLJpORHedUOHuoqObjqa P2EnXCYCnD2zMJdy0V4vYyWHrW9Pb+xzaylHAZ7sHvO8xF/2z0IuFrwv5kzs/P43PZM0 ku7saePLwwF0UeqbdV/QU1/b1fETakYuRi1khGcKIGKDEnnStMXrPJ+Wv1I0fLIEMGIB NZC8yaUCzIAP8S5hI0US86X4yePypo+Lp8QdVX6EFAO4hTu1fB7GTR2M4ZUk7yXrpQZ6 gbBi9Ef9dYrHxil4wgy4tzsLX2LHOKyc75ExlRxwxSaMJqCqHDWuuvIn31te66t+rsDU 5yeQ== X-Gm-Message-State: AOAM530bZgcZHpTrJIOUCVz17YFdyl/siAb+3xJOsL4DThsTBqcyl3I8 1hZ8zoSaroJQMP86Rk8u04eYq9C030h+045uYOKfcJjyed1v3tMMWKJlVihoRXFclKOlFOfqtBp uwXqlbHp63DZ9tfOVPA6//Gh4VpFoKBvs7jIsYtw9cOiz0pt+ZWEKc1LlgamyYFBd7DLPJh/IRw == X-Google-Smtp-Source: ABdhPJxEyBjMVTb9uWwvdl82ZvWBxldFrwsywwiXJhXf4m0VODbfwsWhovj+MicvfuQ6E92bgO+DiA== X-Received: by 2002:a17:90a:5509:: with SMTP id b9mr3184390pji.230.1611290752264; Thu, 21 Jan 2021 20:45:52 -0800 (PST) From: Rebecca Cran To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] target/arm: Add support for FEAT_DIT, Data Independent Timing Date: Thu, 21 Jan 2021 21:45:36 -0700 Message-Id: <20210122044537.1823-3-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122044537.1823-1-rebecca@nuviainc.com> References: <20210122044537.1823-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=rebecca@nuviainc.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rebecca Cran , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add support for FEAT_DIT. DIT (Data Independent Timing) is a required feature for ARMv8.4. Since virtual machine execution is largely nondeterministic and TCG is outside of the security domain, it's implemented as a NOP. Signed-off-by: Rebecca Cran Reviewed-by: Richard Henderson --- target/arm/cpu.h | 12 +++++++++++ target/arm/helper.c | 22 ++++++++++++++++++++ target/arm/internals.h | 6 ++++++ target/arm/translate-a64.c | 12 +++++++++++ 4 files changed, 52 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index df0d6778330f..56b1053dfdec 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1242,6 +1242,7 @@ void pmu_init(ARMCPU *cpu); #define CPSR_IT_2_7 (0xfc00U) #define CPSR_GE (0xfU << 16) #define CPSR_IL (1U << 20) +#define CPSR_DIT (1U << 21) #define CPSR_PAN (1U << 22) #define CPSR_J (1U << 24) #define CPSR_IT_0_1 (3U << 25) @@ -1309,6 +1310,7 @@ void pmu_init(ARMCPU *cpu); #define PSTATE_SS (1U << 21) #define PSTATE_PAN (1U << 22) #define PSTATE_UAO (1U << 23) +#define PSTATE_DIT (1U << 24) #define PSTATE_TCO (1U << 25) #define PSTATE_V (1U << 28) #define PSTATE_C (1U << 29) @@ -3875,6 +3877,11 @@ static inline bool isar_feature_aa32_tts2uxn(const A= RMISARegisters *id) return FIELD_EX32(id->id_mmfr4, ID_MMFR4, XNX) !=3D 0; } =20 +static inline bool isar_feature_aa32_dit(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_pfr0, ID_PFR0, DIT) !=3D 0; +} + /* * 64-bit feature tests via id registers. */ @@ -4119,6 +4126,11 @@ static inline bool isar_feature_aa64_tts2uxn(const A= RMISARegisters *id) return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, XNX) !=3D 0; } =20 +static inline bool isar_feature_aa64_dit(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64pfr0, ID_AA64PFR0, DIT) !=3D 0; +} + /* * Feature tests for "does this exist in either 32-bit or 64-bit?" */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 01b50316046b..c1e8ba5bd177 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4419,6 +4419,24 @@ static const ARMCPRegInfo uao_reginfo =3D { .readfn =3D aa64_uao_read, .writefn =3D aa64_uao_write }; =20 +static uint64_t aa64_dit_read(CPUARMState *env, const ARMCPRegInfo *ri) +{ + return env->pstate & PSTATE_DIT; +} + +static void aa64_dit_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + env->pstate =3D (env->pstate & ~PSTATE_DIT) | (value & PSTATE_DIT); +} + +static const ARMCPRegInfo dit_reginfo =3D { + .name =3D "DIT", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 3, .crn =3D 4, .crm =3D 2, .opc2 =3D 5, + .type =3D ARM_CP_NO_RAW, .access =3D PL0_RW, + .readfn =3D aa64_dit_read, .writefn =3D aa64_dit_write +}; + static CPAccessResult aa64_cacheop_poc_access(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) @@ -8203,6 +8221,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_one_arm_cp_reg(cpu, &uao_reginfo); } =20 + if (cpu_isar_feature(aa64_dit, cpu)) { + define_one_arm_cp_reg(cpu, &dit_reginfo); + } + if (arm_feature(env, ARM_FEATURE_EL2) && cpu_isar_feature(aa64_vh, cpu= )) { define_arm_cp_regs(cpu, vhe_reginfo); } diff --git a/target/arm/internals.h b/target/arm/internals.h index 853fa88fd616..3d11e42d8e1b 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1222,6 +1222,9 @@ static inline uint32_t aarch32_cpsr_valid_mask(uint64= _t features, if (isar_feature_aa32_pan(id)) { valid |=3D CPSR_PAN; } + if (isar_feature_aa32_dit(id)) { + valid |=3D CPSR_DIT; + } =20 return valid; } @@ -1240,6 +1243,9 @@ static inline uint32_t aarch64_pstate_valid_mask(cons= t ARMISARegisters *id) if (isar_feature_aa64_uao(id)) { valid |=3D PSTATE_UAO; } + if (isar_feature_aa64_dit(id)) { + valid |=3D PSTATE_DIT; + } if (isar_feature_aa64_mte(id)) { valid |=3D PSTATE_TCO; } diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index ffc060e5d70c..1c4b8d02f3b8 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1700,6 +1700,18 @@ static void handle_msr_i(DisasContext *s, uint32_t i= nsn, tcg_temp_free_i32(t1); break; =20 + case 0x1a: /* DIT */ + if (!dc_isar_feature(aa64_dit, s)) { + goto do_unallocated; + } + if (crm & 1) { + set_pstate_bits(PSTATE_DIT); + } else { + clear_pstate_bits(PSTATE_DIT); + } + /* There's no need to rebuild hflags because DIT is a nop */ + break; + case 0x1e: /* DAIFSet */ t1 =3D tcg_const_i32(crm); gen_helper_msr_i_daifset(cpu_env, t1); --=20 2.26.2 From nobody Tue Nov 18 15:29:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611290843; cv=none; d=zohomail.com; s=zohoarc; b=UqKQV4DRTZJ3o/WUGpL2S/EjZP4AmjUtMSMtlt2sUIo5ccGaB/Wq2PbTRMuTT/CzSqgapi6OoyDSIwdAE1h2TLYl95mH67H/SruwIBMMsP8rxU/yU9Zu2L+QSPhpiAWvd2/lKXHDWsao35WaAqJgbYUstMGP/U/WADXqfRbPKro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611290843; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JAFdn6IbZBNqvP6S0gWLCOyNml8OyzsyVzQVR6rXHRA=; b=X22o7N1Dnv9KrppUSvoVdUsWP7fBIO4Z4rMB/9tzUV82UpUdqRYl3v1j4RCDUFoKM4MQ7XZZf52RIA8wOOCVqFtEiFP1B1h7nmiKMhLbALZYCTGpZ82k1NmxnsPBwpo864f90mAO4q8cXfqRPtVGxlBKJbE/l4Iv10K+zH7TrA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611290843002735.4703652086289; Thu, 21 Jan 2021 20:47:23 -0800 (PST) Received: from localhost ([::1]:43906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2oLw-0007GN-Cc for importer@patchew.org; Thu, 21 Jan 2021 23:47:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2oKb-0005YS-Gi for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:57 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:33161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2oKa-0000jL-14 for qemu-devel@nongnu.org; Thu, 21 Jan 2021 23:45:57 -0500 Received: by mail-pj1-x1029.google.com with SMTP id lw17so5882719pjb.0 for ; Thu, 21 Jan 2021 20:45:55 -0800 (PST) Received: from cube.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id b10sm7050494pgh.15.2021.01.21.20.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 20:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JAFdn6IbZBNqvP6S0gWLCOyNml8OyzsyVzQVR6rXHRA=; b=dVjPlpHpA5gjaOyrN9kTiPPqEmETELaA7Z3ud0mmVP4BnMOZKRsw72EXI/hLOmkjky M1XRzQk4e/6kA7kKFCflufvguEW5dJbKP/5irQ912+H5/Dg54O3Nge9xNXZPc5uYUB4i Fp4AwalbU/uFqfYtkp2r3QtdUcmxzn1KzXwcwqbVeD1dYeUMWWL8duZE8HYvDxHczGQK fKKGB1R9TN3bdrjnulmYMS7DdtbwTftIXpqWtbquxlgRIfVupgLkkcPflrDYRg8X/JGH eneGGelUyfT+DvidTR0uqNUmxW4mNYWgkVurChts34yw3mv99d+x3+WI7RlleFvXR+NV lr8A== 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:mime-version:content-transfer-encoding; bh=JAFdn6IbZBNqvP6S0gWLCOyNml8OyzsyVzQVR6rXHRA=; b=nZ6WIYehvJ70Ul5NNVK8W7ZUtMHz8a0qSnZ7nlp47dR93wqvS9uXcK4IxYQ3BTiNLp cp6TaPfsX+rjNjI0F/Wp9n8xyRT5iWGAHhY2z/OGiwlKhGVKRlA4NSIJ0ol2An0epOhZ SaB6p6D1W2aapN/Dg7W0ai+SwRvh0OfOE7V2yFOI0EitAYx2uwI7GCD777kS7jgY3A59 c0+tchrBxzOuOjlq6k+WSoee4ItS0WMZZc+LjpFyAgCmeQxGkjo6tfy7MBWS80km+1p5 TtrFA+QYdTTPCmnZiCXUQhc9dVtk7XanV3gqTL5q97C0e6+f/4OBRGiuQv3D6gslLnK7 W/Wg== X-Gm-Message-State: AOAM533TuElwMSpN2ZnrYXBEpletkPblhifVnVOKQmQf+tuKuE+z6BTO kJNCkjX5mxoWRp04gDqho6JHa/EJdBAmRH2C+381hFWeMy/bKvVlQsiM0wMO/Px/bjMB8aWMMTn HvDPn12wvZCuPzxmiPyDxjyWjeGIa6wi4gdfHHL0e8zSLaMIlguluOgmL7hI/aeO+ukA7rHCRMw == X-Google-Smtp-Source: ABdhPJxcsHfIw8B18Z+z9mtitcvuzuPst8o2kouB5MzxKs4Or0bwsaZVvzv57GZ3Mec7YbxMf9siBQ== X-Received: by 2002:a17:90b:34b:: with SMTP id fh11mr3088150pjb.225.1611290754385; Thu, 21 Jan 2021 20:45:54 -0800 (PST) From: Rebecca Cran To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] target/arm: Set ID_AA64PFR0.DIT and ID_PFR0.DIT to 1 for "max" AA64 CPU Date: Thu, 21 Jan 2021 21:45:37 -0700 Message-Id: <20210122044537.1823-4-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122044537.1823-1-rebecca@nuviainc.com> References: <20210122044537.1823-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=rebecca@nuviainc.com; helo=mail-pj1-x1029.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rebecca Cran , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Enable FEAT_DIT for the "max" AARCH64 CPU. Signed-off-by: Rebecca Cran Reviewed-by: Richard Henderson --- target/arm/cpu64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 5e851028c592..9a5cfd4fc632 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -666,6 +666,7 @@ static void aarch64_max_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64PFR0, FP, 1); t =3D FIELD_DP64(t, ID_AA64PFR0, ADVSIMD, 1); t =3D FIELD_DP64(t, ID_AA64PFR0, SEL2, 1); + t =3D FIELD_DP64(t, ID_AA64PFR0, DIT, 1); cpu->isar.id_aa64pfr0 =3D t; =20 t =3D cpu->isar.id_aa64pfr1; @@ -715,6 +716,10 @@ static void aarch64_max_initfn(Object *obj) u =3D FIELD_DP32(u, ID_ISAR6, SPECRES, 1); cpu->isar.id_isar6 =3D u; =20 + u =3D cpu->isar.id_pfr0; + u =3D FIELD_DP32(u, ID_PFR0, DIT, 1); + cpu->isar.id_pfr0 =3D u; + u =3D cpu->isar.id_mmfr3; u =3D FIELD_DP32(u, ID_MMFR3, PAN, 2); /* ATS1E1 */ cpu->isar.id_mmfr3 =3D u; --=20 2.26.2