From nobody Mon Feb 9 12:00:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linux.microsoft.com ARC-Seal: i=1; a=rsa-sha256; t=1672958874; cv=none; d=zohomail.com; s=zohoarc; b=NUKf/3nLFe/OZx305/+itNNgjV7cKL7+JlAhlzSaQNAHjlWO41DoRsV5HmbNoz5onWXkuq0XSF0eAMW9aeMwqSfppo49ewUJEGmnbC5uBjyJwKwPurWAO4tWBiC9kWeC9kvoLDlGStiW+XbFS5TBaWYU6iUGtJ9b7h2aA3wbGQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672958874; 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=3xTNu8Cn5pLkQiBZj1i8qn+BWwLvT1/xbvKGDj2Yv7U=; b=KvXpfxlcX2W3Vg5x1Gt6Ik/JRRUhyVpwlmjvH/rS8tLVv0JE8VtWs3uSu6h9b5NWiac/dHvzC8YQQn2hixj+q8kFbzxgAHYVxlffJMYY8D0nSS5lUjFvBH/WxyywJfY461uTaZgIERdrA+YraKtztNbGW5BQh+EnLPFeYSEGSNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672958874124254.87052568082174; Thu, 5 Jan 2023 14:47:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYzx-0001PJ-Ar; Thu, 05 Jan 2023 17:46:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDYTu-0006h6-4N; Thu, 05 Jan 2023 17:13:02 -0500 Received: from linux.microsoft.com ([13.77.154.182]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYTs-00022m-CH; Thu, 05 Jan 2023 17:13:01 -0500 Received: from localhost.localdomain (unknown [77.64.253.186]) by linux.microsoft.com (Postfix) with ESMTPSA id ED32D20B92AA; Thu, 5 Jan 2023 14:12:57 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com ED32D20B92AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1672956778; bh=3xTNu8Cn5pLkQiBZj1i8qn+BWwLvT1/xbvKGDj2Yv7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UlJ5zOdPmFH5noNgqx3ytjm1peVk3zT/TbPE/B4ylFHfGvNoxZQ5qYmdzgrYaRyiV UbcdTXQxZN9mVdN1jtnph+aAUFNLAuO8d722SCG8P/IVl7+1JlOKYqq1ncNDCO8DGk m9qjT0pSvTRSItrpt/EXIo6yT5qWvDUMAzg0QLT8= From: Evgeny Iakovlev To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PATCH 1/3] target/arm: implement DBGCLAIM registers Date: Thu, 5 Jan 2023 23:12:49 +0100 Message-Id: <20230105221251.17896-2-eiakovlev@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230105221251.17896-1-eiakovlev@linux.microsoft.com> References: <20230105221251.17896-1-eiakovlev@linux.microsoft.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=13.77.154.182; envelope-from=eiakovlev@linux.microsoft.com; helo=linux.microsoft.com X-Spam_score_int: -197 X-Spam_score: -19.8 X-Spam_bar: ------------------- X-Spam_report: (-19.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 05 Jan 2023 17:46:05 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.microsoft.com) X-ZM-MESSAGEID: 1672958875691100001 Content-Type: text/plain; charset="utf-8" The architecture does not define any functionality for the CLAIM tag bits. So we will just keep the raw bits, as per spec. Helps Hyper-V boot on aarch64-tcg because it context-switches DBGCLAIM on EL2 entry/exit. Signed-off-by: Evgeny Iakovlev --- target/arm/cpu.h | 1 + target/arm/debug_helper.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 2b4bd20f9d..eddec155b0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -494,6 +494,7 @@ typedef struct CPUArchState { uint64_t dbgbcr[16]; /* breakpoint control registers */ uint64_t dbgwvr[16]; /* watchpoint value registers */ uint64_t dbgwcr[16]; /* watchpoint control registers */ + uint64_t dbgclaim; /* DBGCLAIM bits */ uint64_t mdscr_el1; uint64_t oslsr_el1; /* OS Lock Status */ uint64_t osdlr_el1; /* OS DoubleLock status */ diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index c21739242c..b244e146e2 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -629,6 +629,18 @@ static void osdlr_write(CPUARMState *env, const ARMCPR= egInfo *ri, } } =20 +static void dbgclaimset_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + env->cp15.dbgclaim |=3D (value & 0xFF); +} + +static void dbgclaimclr_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + env->cp15.dbgclaim &=3D ~(value & 0xFF); +} + static const ARMCPRegInfo debug_cp_reginfo[] =3D { /* * DBGDRAR, DBGDSAR: always RAZ since we don't implement memory mapped @@ -712,6 +724,21 @@ static const ARMCPRegInfo debug_cp_reginfo[] =3D { .cp =3D 14, .opc0 =3D 2, .opc1 =3D 0, .crn =3D 0, .crm =3D 2, .opc2 = =3D 0, .access =3D PL1_RW, .accessfn =3D access_tda, .type =3D ARM_CP_NOP }, + /* + * Dummy DBGCLAIM registers. + * "The architecture does not define any functionality for the CLAIM t= ag bits.", + * so we only keep the raw bits + */ + { .name =3D "DBGCLAIMSET_EL1", .state =3D ARM_CP_STATE_BOTH, + .cp =3D 14, .opc0 =3D 2, .opc1 =3D 0, .crn =3D 7, .crm =3D 8, .opc2 = =3D 6, + .access =3D PL1_RW, .accessfn =3D access_tda, + .writefn =3D dbgclaimset_write, + .fieldoffset =3D offsetof(CPUARMState, cp15.dbgclaim) }, + { .name =3D "DBGCLAIMCLR_EL1", .state =3D ARM_CP_STATE_BOTH, + .cp =3D 14, .opc0 =3D 2, .opc1 =3D 0, .crn =3D 7, .crm =3D 9, .opc2 = =3D 6, + .access =3D PL1_RW, .accessfn =3D access_tda, + .writefn =3D dbgclaimclr_write, + .fieldoffset =3D offsetof(CPUARMState, cp15.dbgclaim) }, }; =20 static const ARMCPRegInfo debug_lpae_cp_reginfo[] =3D { --=20 2.34.1 From nobody Mon Feb 9 12:00:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linux.microsoft.com ARC-Seal: i=1; a=rsa-sha256; t=1672958838; cv=none; d=zohomail.com; s=zohoarc; b=OB8aFScnN3iP0ox4TM+/XPQBeMsTrc5kLwqWI1IeQkFLJwiwRMBdA3etO9riJv2aAhIAcYFGu6JWrJdQOEUPwR1O4LsLHpebsrJaZIe35I7xgYZxgHacGyltEWmxcpz1fDhrHDcDE4G3sgaS4fioR3LUZl5fVQUWXTvK6DNRhIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672958838; 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=QoqemqlNpSGkv32PNTdWXHZygAH80j0ySECS7DqLe2c=; b=KxtY2p2d8Jmh76qXERQB6MLvPh9kn/0gkp2bA8gJrNZjrHQLbX7s83ApNox1chuflzjPqxKPcrEy0dPaOG5TBi3d6MYrxFOjvzrA4dgdoV1xwSm7qcDHOI72pHHC05dcyQJa9UOS63UjCHlcVnc4eNqCxHXN3g0RP4z4a4AWhNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672958838328516.547262539605; Thu, 5 Jan 2023 14:47:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYzx-0001PL-B0; Thu, 05 Jan 2023 17:46:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDYTv-0006hb-8E; Thu, 05 Jan 2023 17:13:03 -0500 Received: from linux.microsoft.com ([13.77.154.182]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYTt-00023F-Me; Thu, 05 Jan 2023 17:13:03 -0500 Received: from localhost.localdomain (unknown [77.64.253.186]) by linux.microsoft.com (Postfix) with ESMTPSA id 3DA1120B92AC; Thu, 5 Jan 2023 14:12:59 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3DA1120B92AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1672956780; bh=QoqemqlNpSGkv32PNTdWXHZygAH80j0ySECS7DqLe2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dm0XrfA7sEJ7mgxambZnxzQ2PxLlHm0Cwt2kLQSN4k0EuvG7Hxod37UGMuDwHpMrk N9DzDLF/LcIv/xuSMDLGI6x0kDYM/P+ZHTJH04yxu5EQRL3x/w1jxhnjX+V3/45VTx +dpoaLfrefwYa38v+P7knXqvxF2Vy6Sq6Y+sAdEE= From: Evgeny Iakovlev To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PATCH 2/3] target/arm: provide RAZ/WI stubs for more DCC registers Date: Thu, 5 Jan 2023 23:12:50 +0100 Message-Id: <20230105221251.17896-3-eiakovlev@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230105221251.17896-1-eiakovlev@linux.microsoft.com> References: <20230105221251.17896-1-eiakovlev@linux.microsoft.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=13.77.154.182; envelope-from=eiakovlev@linux.microsoft.com; helo=linux.microsoft.com X-Spam_score_int: -197 X-Spam_score: -19.8 X-Spam_bar: ------------------- X-Spam_report: (-19.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 05 Jan 2023 17:46:05 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.microsoft.com) X-ZM-MESSAGEID: 1672958839560100003 Content-Type: text/plain; charset="utf-8" Qemu doesn't implement Debug Communication Channel, however when running Microsoft Hyper-V in software-emulated ARM64 as a guest, it tries to access some of the DCM registers during an EL2 context switch. Provide RAZ/WI stubs for OSDTRRX_EL1, OSDTRTX_EL1 and OSECCR_EL1 registers in the same way the rest of DCM is currently done. Do account for access traps though with access_tda. Signed-off-by: Evgeny Iakovlev Reviewed-by: Peter Maydell --- target/arm/debug_helper.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index b244e146e2..2a7c3d7e38 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -673,6 +673,18 @@ static const ARMCPRegInfo debug_cp_reginfo[] =3D { .opc0 =3D 2, .opc1 =3D 3, .crn =3D 0, .crm =3D 1, .opc2 =3D 0, .access =3D PL0_R, .accessfn =3D access_tda, .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, + { .name =3D "OSDTRRX_EL1", .state =3D ARM_CP_STATE_BOTH, .cp =3D 14, + .opc0 =3D 2, .opc1 =3D 0, .crn =3D 0, .crm =3D 0, .opc2 =3D 2, + .access =3D PL1_RW, .accessfn =3D access_tda, + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, + { .name =3D "OSDTRTX_EL1", .state =3D ARM_CP_STATE_BOTH, .cp =3D 14, + .opc0 =3D 2, .opc1 =3D 0, .crn =3D 0, .crm =3D 3, .opc2 =3D 2, + .access =3D PL1_RW, .accessfn =3D access_tda, + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, + { .name =3D "OSECCR_EL1", .state =3D ARM_CP_STATE_BOTH, .cp =3D 14, + .opc0 =3D 2, .opc1 =3D 0, .crn =3D 0, .crm =3D 6, .opc2 =3D 2, + .access =3D PL1_RW, .accessfn =3D access_tda, + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, /* * DBGDSCRint[15,12,5:2] map to MDSCR_EL1[15,12,5:2]. Map all bits as * it is unlikely a guest will care. --=20 2.34.1 From nobody Mon Feb 9 12:00:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linux.microsoft.com ARC-Seal: i=1; a=rsa-sha256; t=1672958830; cv=none; d=zohomail.com; s=zohoarc; b=WWb0UXEXkJRhdsAiSjxmHCl/c2eOFKzG7IagtRL/RmGqP6VgGhaz2bWsP8XqPROXwNa5g9/sy3prthB2R2pB14IhgdMCx6+pD/u6FaYj8x30Jq0quNu1BF+rDg8olNMPSMECM7TeG4/8/oJt9idlBdARdpxE6qyGUTIYQ/3MSlo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672958830; 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=0vqipwJO687PYjgTT1xXJiaZkuc8ITjjIBNOXxLxqcY=; b=ckDdJ/f56L2iJtZkAFfgB0FD3X179BBtz7hG5xZzUYdxRAa3zkznMQw8Rw9Pl4TeNQSdO1CZqEGf+0Vzlizjyh/CkocODLDe9+Pt7ig2EX4k8TQ9ZcGbe6o2eJ0PzvhSj65bEHgzBxJaL88lfdmuL7gipuqIWkHbsZ7HfjbdjNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672958830242291.22179519235203; Thu, 5 Jan 2023 14:47:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYzv-0001NK-3U; Thu, 05 Jan 2023 17:46:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDYTv-0006i4-VM; Thu, 05 Jan 2023 17:13:03 -0500 Received: from linux.microsoft.com ([13.77.154.182]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDYTu-00023S-Eu; Thu, 05 Jan 2023 17:13:03 -0500 Received: from localhost.localdomain (unknown [77.64.253.186]) by linux.microsoft.com (Postfix) with ESMTPSA id 807E320B92AE; Thu, 5 Jan 2023 14:13:00 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 807E320B92AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1672956781; bh=0vqipwJO687PYjgTT1xXJiaZkuc8ITjjIBNOXxLxqcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UCqlOsYAK5YdJHFhB95Nzae/kf/JV37Rwq4gOH+A6n/D35ucLqVL3OmKDcLarRuaY vW5HTKkZX0utZKdk79zXLeM71vLQwOqVx5U7En8xPrxze1KP/IlvIlBgsdurd8AAXq Xtt7YerXGs6Qwt+FSIZVHQBta222vNxpwcrzv86Q= From: Evgeny Iakovlev To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PATCH 3/3] target/arm: allow writes to SCR_EL3.HXEn bit when FEAT_HCX is enabled Date: Thu, 5 Jan 2023 23:12:51 +0100 Message-Id: <20230105221251.17896-4-eiakovlev@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230105221251.17896-1-eiakovlev@linux.microsoft.com> References: <20230105221251.17896-1-eiakovlev@linux.microsoft.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=13.77.154.182; envelope-from=eiakovlev@linux.microsoft.com; helo=linux.microsoft.com X-Spam_score_int: -197 X-Spam_score: -19.8 X-Spam_bar: ------------------- X-Spam_report: (-19.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 05 Jan 2023 17:46:05 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.microsoft.com) X-ZM-MESSAGEID: 1672958831787100001 Content-Type: text/plain; charset="utf-8" ARM trusted firmware, when built with FEAT_HCX support, sets SCR_EL3.HXEn b= it to allow EL2 to modify HCRX_EL2 register without trapping it in EL3. Qemu uses a valid mask to clear unsupported SCR_EL3 bits when emulating SCR_EL3 write, and that mask doesn't include SCR_EL3.HXEn bit even if FEAT_HCX is enabled and exposed to the guest. As a result EL3 writes of that bit are ignored. Signed-off-by: Evgeny Iakovlev Reviewed-by: Peter Maydell --- target/arm/helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index bac2ea62c4..962affdd52 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1844,6 +1844,9 @@ static void scr_write(CPUARMState *env, const ARMCPRe= gInfo *ri, uint64_t value) if (cpu_isar_feature(aa64_sme, cpu)) { valid_mask |=3D SCR_ENTP2; } + if (cpu_isar_feature(aa64_hcx, cpu)) { + valid_mask |=3D SCR_HXEN; + } } else { valid_mask &=3D ~(SCR_RW | SCR_ST); if (cpu_isar_feature(aa32_ras, cpu)) { --=20 2.34.1