From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471451; cv=none; d=zohomail.com; s=zohoarc; b=EXKtSoyT1tu6FhXCcpi03RsdowbDmrtZiwZSzMsGo/jnX+YOSkAcMxNo6gNeeXyKwFA0f04EKaRnXyMmJyw/g8+KrfW8e1IJ6kTTm0Xqyr/4/h6ey2/R7S6kKAYilxGCtAKrb7FSFft1R5B7Qcl7q25eloRYw/ae7+m3n1gCvxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471451; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xGTdg/LZzblv6K2MzSpCOwRjS6tslAbCgjOSWDOaa5k=; b=Q8Ps7yD0vAEKHjGz13uYHXvSiMS/WK6E1zi1VDB7I4+PSD9MSeTjBwE6ODmoZC+7ERpDOn7+vSowcygofz8Qk2ZNEEGgrq+zOurFZ3jz4uZ2fEn4FmVStsVqpZES1uJKOrkFhdt3oVEiA5joMTAh1+QpiOGz9Z/+T/Rs9XYXjjc= 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 1760471451597663.934500643616; Tue, 14 Oct 2025 12:50:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2T-0001Yr-IX; Tue, 14 Oct 2025 15:50:29 -0400 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 1v8l2S-0001YU-8R for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:28 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2P-0003P7-R6 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:27 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-78af3fe5b17so4584978b3a.2 for ; Tue, 14 Oct 2025 12:50:23 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471421; x=1761076221; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xGTdg/LZzblv6K2MzSpCOwRjS6tslAbCgjOSWDOaa5k=; b=yA5URG6Khrp2V4l6c0BA87kKsfbLwRdnhG8UMBwFi2NhruGUhR/tBp0n2zCZ9MPdNK HZM+DQS+ffjdNwbxJ+6QItbabHhpz1MvfRvtrF/CpVvjlB+gnRm+9bmsHlM0W4t+3PgN 6g3odFrD0xdfuxa2lr1jenV3ZUmLj0V9u0gAUsnVa8yxDNUu1YjIcn/shSuJKsLhZue2 2TQUXaMFiHPrXNjbF+otZeWt/oglbXh/i2Ph8eWixPOUtbFbVEMn+v1CpR6mLmgsXpM+ C6qSiEGbar4XSq6zCJx5TsN38bswQEkfEoeHOv35k8D8xb+R1hthqQ8sGAXMMeARCxz8 C9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471421; x=1761076221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xGTdg/LZzblv6K2MzSpCOwRjS6tslAbCgjOSWDOaa5k=; b=jr7z0hOX8pxMHZoE+gYmol3TFrFqee3vwtSiEhR+tdRDs0akIHGA6QEeOD93yaJsac t3J5UKPjXneGwzLFYnJyv22V6AWq+hBMEOwGZsrjiFuNUusUs09LmNcPsELHR38oc84d dSwQQBixqqvGXkMcYFkq4eHfKcQ4M87hgHd7D9EwqNCSxCt2WV4Yplg57founhOJZLfO JfG2wX37P4KCuxcU20LRSc75mB8EvUVkpwo6SzbX0QZjYu+SZ+esekSmdRb8Qc2mAocn FIdRpKt9asfg+SXcpLMiw8zGyIwH3UCt+aiuYkLoduYeCqSFfFtcZDCd56++xdt0mKr4 UfDA== X-Gm-Message-State: AOJu0YwJLFC3m6FX+wxcNvL+DSQ2JuLODMn+thw+3prEdOms0me0tuT7 zg5+QZXb2vLPX3lnb/BNpsoMeq/9uDHRO7cL6vlq9cLhScFURa5hZ7zoxcKnUIHX9gXmQZqfR2Y Dt0ENGEw= X-Gm-Gg: ASbGncvZdM2FWyzvya+YOg7jSfywwMEs8zFv390GrCurVIck9T/0U4GEl1kaLmJ495W XZs1cSz6LubUl2V9J45LsMefljm6750uH6gxIEnY6ZXpIrgVNuv6p7XPc7UzCax868ZyoNPVbWn fHiqt0rN/SAW4JpIGqaiDUYSHsRs8hvrMVdLXu4A6/PswfL+gDJvpgFXOejIKoz1ha7QwnbbOfM karFdRFGDIb9E/QeGjrBcnhTjTCtzBfCDPXMr+P4GwB9gk6UmNzgLxRh6E6XtE4K0om3Qgez7Xy 2UZycAAkzteOwW2S8IbwHhLocdBP9qN8yBgsMY+vwVlGXGNTRk0rRKQs9bvL/0ErMZZBjM0c+s1 Xh8yKTcKCWRPFWu4HAg7H6tSEn9xKESyU6otA92HXz4AhZ44bYzbWeNAUHfHpLQ== X-Google-Smtp-Source: AGHT+IEiEvqMccmlfePAMgsCcVR72mKZ9Ooac0GY0sPl2ZlopqvQGzBVt+5elNFTVTF9YtCRNITNOQ== X-Received: by 2002:a05:6a00:3e27:b0:781:2582:822a with SMTP id d2e1a72fcca58-79385ed2f30mr31473473b3a.8.1760471421102; Tue, 14 Oct 2025 12:50:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 1/7] target/arm: Add isar feature test for FEAT_AIE Date: Tue, 14 Oct 2025 12:50:11 -0700 Message-ID: <20251014195017.421681-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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.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 @linaro.org) X-ZM-MESSAGEID: 1760471454204158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu-features.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 37f1eca3af..579fa8f8f4 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1364,6 +1364,11 @@ static inline bool isar_feature_aa64_s2pie(const ARM= ISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64MMFR3, S2PIE) !=3D 0; } =20 +static inline bool isar_feature_aa64_aie(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64MMFR3, AIE) !=3D 0; +} + static inline bool isar_feature_aa64_mec(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64MMFR3, MEC) !=3D 0; --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471526; cv=none; d=zohomail.com; s=zohoarc; b=M+nC1LogT1r+MluiDg6TUfL23VO+zbyhI5BFGTO8RfH/yG5UBn9PhITwvPvtq8IIDNP+SWcrQwpVNhqkaYWZmYiZz2S+QeRCfL2+W/4ojfqTPiyLh4Ac84zq/r0HQ8GJWSsZVgdWUD17ksr7Mb/mKJLuLnczblJ9ISk2J7TXxnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471526; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NLWvUqmmBANKsaF5zaX5lQHObBvuZy86Gts19KQtK6w=; b=I+Emv9UAuiEHiXeKTLJEEruEdyro2CoAcTx3WL+/W+Uf/3Wqgg9YwgA7jD+AU7vsVXQ1/R9NzDBA78PK35GTkFGJk8pfNqI6/b7GuW1Y0gfEs4/6IY+JR3VWhvMqxcO1Jh/LeOfGF87I2a0YhjehuttYOGdnJcjygnZRNUfgkZw= 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 1760471526801471.625110967169; Tue, 14 Oct 2025 12:52:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2j-0001eV-00; Tue, 14 Oct 2025 15:50:45 -0400 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 1v8l2X-0001a3-HL for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:34 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2R-0003PI-T8 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:32 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-781251eec51so4779235b3a.3 for ; Tue, 14 Oct 2025 12:50:24 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471422; x=1761076222; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NLWvUqmmBANKsaF5zaX5lQHObBvuZy86Gts19KQtK6w=; b=siwZYPlEVlKtEU4zyVBrILUXVepO+jkn2qg/184Htwk+k4HZ8iPHtMTsfcta2IOXx3 BZdjl0uAisliXeH/wQHDo3X8O8x6U66cQ+Ewlr7FE7Ftwunn8QcNElLMe8wJ+H7I50On y/gU0+rymb4NmKZTlqBZ6KsdqGenashFS+6aj53vs03umB8HdpUq+tuH/C4FAQZLdtvZ zuAdPqBa4nlAQFfP1TFUN5scqKA7SjrplfERtHE/ImnUeL3oSV6zIQmIRKYtUgMhr1EE LIxymcVOFqIowYhJ78/VOylDngr29Y1FAbcSK3ADfkMhU44I4iZFzyuTxZfCH8ANEfn3 WV1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471422; x=1761076222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NLWvUqmmBANKsaF5zaX5lQHObBvuZy86Gts19KQtK6w=; b=iRyYW3nqF/G9Ps0wn8uhzxYSvwuRFr34uTDx5vE1K36jvkj2xUdj/TjMJTF1AFl0Uw BUfDWToKODogxre99CnitHA3WtfEfpFRx6DAq1c7o2oC9hSvNmB3bpUe7O8+HFU6LHYQ ZntcEhhcouJFAb0UfSeCrsI8oAn9HGXQPn3zHLZ9oUz7bQZnHA6XWgIE3V6NB3OMerIk ReT7OqWY7hhf0QGtRyx7S5y2El1PgRE4usc2/O827TH+sBn5Gna9diM97iDB2VP0HP/4 IGTnsmsXxtdII2fvJRfltDv/e/d8c1VXlrdhYZD6bHTGmW7rzhnX57CkeL9sD3FmX84W m3HQ== X-Gm-Message-State: AOJu0YwZIWJhy9Brr3pTFqt5APjqKYcTbqkox3rtQqSvw/Ox5bYb4j9E yYX8UOr/I3ZavhYxbaeotjwW8nbxSbrdPyZ4nffYo8EAmKwZiyt71FbA71nneTs0MDcMxMMyhhM z+U/y25w= X-Gm-Gg: ASbGnct8fDmRbe0v1W1sjCWKj7jrk711i3nFl+Nyhvs7fXt4FWS+Gn4sx0LXcKiqFKa ke973i8PfKdfR8EYU/+jnQGk8PIPMR5L/9d8JkcjzQM6WRAzK3giIB4AKvuAAesY2eXaXCG6czG zHunKK6u3UvuW8MK8iwrti5Ww7XqC+QoTZs7gQZWnQoZboKmyl7hXXr+4cx4hOXNeUlcLjm+gNN tyQLcWcc0BaS1Cvd0GblLQRTEDBAnHjAidOBOg39D6nQ0Azg4z4UZ4DgqLauWSvwr1/dOgAbmHl /Eld/z4CuH3BAzRNvSoWnEe1/ul9twsc+G7XMOzbx5iN9HSgAoZor7rVfeab2rz6XrAN9x1ti9W YH/hwbX2xqyWRVK3HcVwJco5k8otbjfeGAk5ztCTLsLhYHoEjdvw= X-Google-Smtp-Source: AGHT+IFO+jcUMFNDnlWEPK/csFK/QMM1pst4KCKWDs40eylcmd6uLUfhUUPiUV4sgNL1nYfLbGs65w== X-Received: by 2002:a05:6a20:a123:b0:243:d1bd:fbc9 with SMTP id adf61e73a8af0-32da8462b41mr36584149637.56.1760471421934; Tue, 14 Oct 2025 12:50:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 2/7] target/arm: Implement MAIR2_ELx and AMAIR2_ELx Date: Tue, 14 Oct 2025 12:50:12 -0700 Message-ID: <20251014195017.421681-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 @linaro.org) X-ZM-MESSAGEID: 1760471528755158500 Content-Type: text/plain; charset="utf-8" Enable the SCR.AIEn bit in scr_write, and test it in aien_access. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpregs.h | 2 ++ target/arm/cpu.h | 5 +++- target/arm/cpu.c | 3 +++ target/arm/helper.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index 763de5e051..48a406a5fb 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -806,6 +806,8 @@ typedef enum FGTBit { DO_REV_BIT(HFGRTR, NTPIDR2_EL0), DO_REV_BIT(HFGRTR, NPIRE0_EL1), DO_REV_BIT(HFGRTR, NPIR_EL1), + DO_REV_BIT(HFGRTR, NMAIR2_EL1), + DO_REV_BIT(HFGRTR, NAMAIR2_EL1), =20 /* Trap bits in HDFGRTR_EL2 / HDFGWTR_EL2, starting from bit 0. */ DO_BIT(HDFGRTR, DBGBCRN_EL1), diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 1d4e13320c..e21612b898 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -447,7 +447,8 @@ typedef struct CPUArchState { uint64_t c9_pmuserenr; /* perf monitor user enable */ uint64_t c9_pmselr; /* perf monitor counter selection register */ uint64_t c9_pminten; /* perf monitor interrupt enables */ - union { /* Memory attribute redirection */ + /* Memory attribute redirection */ + union { struct { #if HOST_BIG_ENDIAN uint64_t _unused_mair_0; @@ -467,6 +468,7 @@ typedef struct CPUArchState { }; uint64_t mair_el[4]; }; + uint64_t mair2_el[4]; union { /* vector base address register */ struct { uint64_t _unused_vbar; @@ -1736,6 +1738,7 @@ static inline void xpsr_write(CPUARMState *env, uint3= 2_t val, uint32_t mask) #define SCR_TCR2EN (1ULL << 43) #define SCR_SCTLR2EN (1ULL << 44) #define SCR_PIEN (1ULL << 45) +#define SCR_AIEN (1ULL << 46) #define SCR_GPF (1ULL << 48) #define SCR_MECEN (1ULL << 49) #define SCR_NSE (1ULL << 62) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 3b556f1404..d2fc17eab6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -652,6 +652,9 @@ void arm_emulate_firmware_reset(CPUState *cpustate, int= target_el) cpu_isar_feature(aa64_s2pie, cpu)) { env->cp15.scr_el3 |=3D SCR_PIEN; } + if (cpu_isar_feature(aa64_aie, cpu)) { + env->cp15.scr_el3 |=3D SCR_AIEN; + } if (cpu_isar_feature(aa64_mec, cpu)) { env->cp15.scr_el3 |=3D SCR_MECEN; } diff --git a/target/arm/helper.c b/target/arm/helper.c index 167f2909b3..e4d1651440 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -779,6 +779,9 @@ static void scr_write(CPUARMState *env, const ARMCPRegI= nfo *ri, uint64_t value) cpu_isar_feature(aa64_s2pie, cpu)) { valid_mask |=3D SCR_PIEN; } + if (cpu_isar_feature(aa64_aie, cpu)) { + valid_mask |=3D SCR_AIEN; + } if (cpu_isar_feature(aa64_mec, cpu)) { valid_mask |=3D SCR_MECEN; } @@ -6189,6 +6192,61 @@ static const ARMCPRegInfo s2pie_reginfo[] =3D { .fieldoffset =3D offsetof(CPUARMState, cp15.s2pir_el2) }, }; =20 +static CPAccessResult aien_access(CPUARMState *env, const ARMCPRegInfo *ri, + bool isread) +{ + if (arm_feature(env, ARM_FEATURE_EL3) + && !(env->cp15.scr_el3 & SCR_AIEN) + && arm_current_el(env) < 3) { + return CP_ACCESS_TRAP_EL3; + } + return CP_ACCESS_OK; +} + +static CPAccessResult aien_el1_access(CPUARMState *env, const ARMCPRegInfo= *ri, + bool isread) +{ + CPAccessResult ret =3D access_tvm_trvm(env, ri, isread); + if (ret =3D=3D CP_ACCESS_OK) { + ret =3D aien_access(env, ri, isread); + } + return ret; +} + +static const ARMCPRegInfo aie_reginfo[] =3D { + { .name =3D "MAIR2_EL1", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 0, .crn =3D 10, .crm =3D 2, .opc2 =3D 1, + .access =3D PL1_RW, .accessfn =3D aien_el1_access, + .fgt =3D FGT_NMAIR2_EL1, .nv2_redirect_offset =3D 0x280 | NV2_REDIR_= NV1, + .vhe_redir_to_el2 =3D ENCODE_AA64_CP_REG(3, 4, 10, 1, 1), + .vhe_redir_to_el01 =3D ENCODE_AA64_CP_REG(3, 5, 10, 2, 1), + .fieldoffset =3D offsetof(CPUARMState, cp15.mair2_el[1]) }, + { .name =3D "MAIR2_EL2", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 4, .crn =3D 10, .crm =3D 1, .opc2 =3D 1, + .access =3D PL2_RW, .accessfn =3D aien_access, + .fieldoffset =3D offsetof(CPUARMState, cp15.mair2_el[2]) }, + { .name =3D "MAIR2_EL3", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 6, .crn =3D 10, .crm =3D 1, .opc2 =3D 1, + .access =3D PL3_RW, + .fieldoffset =3D offsetof(CPUARMState, cp15.mair2_el[3]) }, + + { .name =3D "AMAIR2_EL1", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 0, .crn =3D 10, .crm =3D 3, .opc2 =3D 1, + .access =3D PL1_RW, .accessfn =3D aien_el1_access, + .fgt =3D FGT_NAMAIR2_EL1, .nv2_redirect_offset =3D 0x288 | NV2_REDIR= _NV1, + .vhe_redir_to_el2 =3D ENCODE_AA64_CP_REG(3, 4, 10, 3, 1), + .vhe_redir_to_el01 =3D ENCODE_AA64_CP_REG(3, 5, 10, 3, 1), + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, + { .name =3D "AMAIR2_EL2", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 4, .crn =3D 10, .crm =3D 3, .opc2 =3D 1, + .access =3D PL2_RW, .accessfn =3D aien_access, + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, + { .name =3D "AMAIR2_EL3", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 6, .crn =3D 10, .crm =3D 3, .opc2 =3D 1, + .access =3D PL3_RW, + .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, +}; + void register_cp_regs_for_features(ARMCPU *cpu) { /* Register all the coprocessor registers based on feature bits */ @@ -7434,6 +7492,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) } } =20 + if (cpu_isar_feature(aa64_aie, cpu)) { + define_arm_cp_regs(cpu, aie_reginfo); + } + if (cpu_isar_feature(any_predinv, cpu)) { define_arm_cp_regs(cpu, predinv_reginfo); } --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471490; cv=none; d=zohomail.com; s=zohoarc; b=jjy+RlNaUSCHmto1ndgKidwWg64PWicVYrT/b99vSOLG50HfujSaR+RGaHeI7X92Vt+EUKUJe/lcheN99O2m4pGvfpdcuHguPGgkDUjmbtk/R9boC2KZkR89dS4r9eGjzYwlcoFH8QFWb2EXvHlTWtLAUY5sxk6emGQDbseL7Qk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471490; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZFl/S3NyYvxn7AHHN5Wyq5GFhbcqVyXqzmKDA5xxH9g=; b=F85UJ+3Rf2lDky8Qv9yjTHUDX3YZpUlIKrbUB6RTvluhLLsf4RTR9GB21XsKC3t8i4LdEkJkEOOAdVrvvJW3GVksH5sSIPFNNyH02/2kevcT7CSfivua3PW8ex//bB/30AEKUXANdJnXWAfwHPGKnZ4Jxy1ekzd/NR8Ia1k/5mg= 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 176047149020547.055776695917416; Tue, 14 Oct 2025 12:51:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2b-0001b0-GX; Tue, 14 Oct 2025 15:50:38 -0400 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 1v8l2U-0001ZZ-GB for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:30 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2R-0003PY-Bs for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:30 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-782e93932ffso5192683b3a.3 for ; Tue, 14 Oct 2025 12:50:24 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471423; x=1761076223; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZFl/S3NyYvxn7AHHN5Wyq5GFhbcqVyXqzmKDA5xxH9g=; b=BOOn9EX50bvPI8hYVpBoqFSA8b3EQjfPv0CrwCczGF36LiKPS34ws+AfkHHJ2jVOqz VwZhHHN6sHENKzBk9sdn74g2mtg1dbBKC9VAUg7nV2Sr5TovC34ERWpHE5zglsY+mCub BmplDxmEdxPPKAWppg40l8xwsARliVJfJgoMT2R3rzMzEHVWEP0kt1jkrQC/KaJ6OLVF VDBYe6unuJ0/uA0Dd/QiNa5HHHfsWu2/mQIcyr+mfDEs99SNvt/EhAXeVirQVQ4MlBY8 FuLKBrAm0a1R38C0XnYqPYxAuPyNDkDQ5XOHuHDfVrh26BYoIJkJQ5j0gyvWR0xeHUmu /ZGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471423; x=1761076223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZFl/S3NyYvxn7AHHN5Wyq5GFhbcqVyXqzmKDA5xxH9g=; b=RQ3lsE0sze32ijcYWQLV3sgX3nLy8F6v23iq6iil5Sdn/wULsgkSJw+4B0556z0T5e DzSday1fkB9Yzzn91S2gTDtl7Q4AAR6hl6ot1GAWpNaI1ed+tbdWxwxLz8ZOznh8dk1y OWVsiEkYr1IHuJwh6Yb1plUL7gn3qyxZuRS5gJ1aoyCl6VDa0q3pwZZrZ3xuYgODzsTH jc+dc2fHOdzvwq1UYz3uZTyW536OZNHLcmnZp501vuiniEJmTVxNkS8nizTsLbJAtcWn YIiVZbcWcklFe5rivBynphnV8T9CjFyfJX3E+nmhRV6CSL1/RnHJUmi+CQ7l16kdARRc 74tw== X-Gm-Message-State: AOJu0Yzq4e5PeHEXArgXPzdnmHdqw0tOoy0oKdbH9JrqiopDX1vhzigj CM5eM9FN5WJ6lXvvmwgdpkQUuyFhvwZWwwlu0DxqRFRFUkyhLcavdATk9veog5k64XLcVYnadRo cP1m/yUs= X-Gm-Gg: ASbGncsQSeApaliKexja5I3MIROgIsqCAAjJLUVmLHj2aRnRMJqrU8xHrLQkFzVnCLK Ge8FD9tYLVFtbe5CK18e2yuSvemNygOWUyOVEkL4e0/v/mKK94meek+V273fgpWWZr3WWMUfriL IrhLXvgDNPq+8wAHoIoOdkek4Umt2LYfgSl71Hxx87egI2WugrPAzgiYgB7FXrHxruZRzS0Y/CC cTgFOr5VguDaFxNKbOy+hOeQalPvSehRLMT/QQ8+9nhl7QG2kmajqfxTV+hQUgFUJJ2L5l6wBHq P0EmVPwAeS1Hj7QLKMLToADvbC1mX1iwd5a0Mr0SvS+fFiGdKR+/6rLtttODDdx4IjLon63JyCc H+SY9UMPO5uqRzQXw82p4DwxjAIBQ8yIKAPL/HYS0qSfX0nqHTLLB21QURogkDQ== X-Google-Smtp-Source: AGHT+IEFjjyZcrv5mQPM07splw9sDAV1uCpgUKR95zTMlMrtsnlIc/Oo0R2cQ+1+b01512eWprvYxA== X-Received: by 2002:a05:6a00:3d16:b0:77c:64d8:3afd with SMTP id d2e1a72fcca58-79387a28eadmr33467529b3a.28.1760471422688; Tue, 14 Oct 2025 12:50:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 3/7] target/arm: Add AIE to ARMVAParameters Date: Tue, 14 Oct 2025 12:50:13 -0700 Message-ID: <20251014195017.421681-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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.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 @linaro.org) X-ZM-MESSAGEID: 1760471493748154100 Content-Type: text/plain; charset="utf-8" Allow the bit to be set in TCR2; extract the bit in aa64_va_parameters. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/internals.h | 1 + target/arm/helper.c | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f539bbe58e..a65386aaed 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1391,6 +1391,7 @@ typedef struct ARMVAParameters { bool hd : 1; ARMGranuleSize gran : 2; bool pie : 1; + bool aie : 1; } ARMVAParameters; =20 /** diff --git a/target/arm/helper.c b/target/arm/helper.c index e4d1651440..8c0b8889db 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6098,6 +6098,9 @@ static void tcr2_el1_write(CPUARMState *env, const AR= MCPRegInfo *ri, if (cpu_isar_feature(aa64_s1pie, cpu)) { valid_mask |=3D TCR2_PIE; } + if (cpu_isar_feature(aa64_aie, cpu)) { + valid_mask |=3D TCR2_AIE; + } value &=3D valid_mask; raw_write(env, ri, value); } @@ -6111,7 +6114,10 @@ static void tcr2_el2_write(CPUARMState *env, const A= RMCPRegInfo *ri, if (cpu_isar_feature(aa64_s1pie, cpu)) { valid_mask |=3D TCR2_PIE; } - if (cpu_isar_feature(aa64_mec, env_archcpu(env))) { + if (cpu_isar_feature(aa64_aie, cpu)) { + valid_mask |=3D TCR2_AIE; + } + if (cpu_isar_feature(aa64_mec, cpu)) { valid_mask |=3D TCR2_AMEC0 | TCR2_AMEC1; } value &=3D valid_mask; @@ -9666,6 +9672,7 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env, = uint64_t va, { uint64_t tcr =3D regime_tcr(env, mmu_idx); bool epd, hpd, tsz_oob, ds, ha, hd, pie =3D false; + bool aie =3D false; int select, tsz, tbi, max_tsz, min_tsz, ps, sh; ARMGranuleSize gran; ARMCPU *cpu =3D env_archcpu(env); @@ -9688,10 +9695,12 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env= , uint64_t va, if (r_el =3D=3D 3) { pie =3D (extract64(tcr, 35, 1) && cpu_isar_feature(aa64_s1pie, cpu)); - } else { - pie =3D ((env->cp15.tcr2_el[2] & TCR2_PIE) - && (!arm_feature(env, ARM_FEATURE_EL3) - || (env->cp15.scr_el3 & SCR_TCR2EN))); + aie =3D (extract64(tcr, 37, 1) + && cpu_isar_feature(aa64_aie, cpu)); + } else if (!arm_feature(env, ARM_FEATURE_EL3) + || (env->cp15.scr_el3 & SCR_TCR2EN)) { + pie =3D env->cp15.tcr2_el[2] & TCR2_PIE; + aie =3D env->cp15.tcr2_el[2] & TCR2_AIE; } } epd =3D false; @@ -9733,10 +9742,12 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env= , uint64_t va, epd =3D true; } =20 - pie =3D ((env->cp15.tcr2_el[r_el] & TCR2_PIE) - && (!arm_feature(env, ARM_FEATURE_EL3) - || (env->cp15.scr_el3 & SCR_TCR2EN)) - && (r_el =3D=3D 2 || (arm_hcrx_el2_eff(env) & HCRX_TCR2EN))= ); + if ((!arm_feature(env, ARM_FEATURE_EL3) + || (env->cp15.scr_el3 & SCR_TCR2EN)) + && (r_el =3D=3D 2 || (arm_hcrx_el2_eff(env) & HCRX_TCR2EN))) { + pie =3D env->cp15.tcr2_el[r_el] & TCR2_PIE; + aie =3D env->cp15.tcr2_el[r_el] & TCR2_AIE; + } } hpd |=3D pie; =20 @@ -9818,6 +9829,7 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env, = uint64_t va, .hd =3D ha && hd, .gran =3D gran, .pie =3D pie, + .aie =3D aie, }; } =20 --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471494; cv=none; d=zohomail.com; s=zohoarc; b=ASGlgJWjvDTR+xaHi85NtbPqt54RY0Wt7q1gWirY4bgXp7TD1vOLDHMVQ8XpM366LPD7BVvhUeLj7ki9echF9ADx4Si/5UdTKFMglCWa/0laA0ZpOsQrEhiOlmyM15MaP6x9lHR33aH6slcdstKqw6byo4xhfI8kQ8jKpHvgOgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471494; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YeiwxiUvqRGSS/dH8aPGA6TRw5Wq+/Vm3e+77xD1954=; b=jnU3xIMmttGHX0tkkuRg5wE+mkeXvfjY+1YPAIToF/Ep38BTKucwRHe4nLSx36LZ+aZN2o55F/EnIGZESN/wXxGL7PKGfVsWWUL9UWcsMdowndZP+EpfW9ZkT4lJ4OTjLyP1TdRz7HBGHyXfzK3uaKIspz8GL6BhoqIgj99CybY= 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 1760471494456417.1587636160666; Tue, 14 Oct 2025 12:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2e-0001cl-Ur; Tue, 14 Oct 2025 15:50:40 -0400 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 1v8l2Y-0001a4-6S for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:35 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2S-0003Pj-O5 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:33 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-781db5068b8so4598893b3a.0 for ; Tue, 14 Oct 2025 12:50:26 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471423; x=1761076223; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YeiwxiUvqRGSS/dH8aPGA6TRw5Wq+/Vm3e+77xD1954=; b=Y5xQATKgsuX4jZDOeYZYwNJm6jdu3iKGiq4rd0dgOHroE2GsDFtScZxlmIL0/c3EJF /fehpSlRjq24/3Qj3PhksPID3C+8FEdbzKC6RlkcqwaHgu/x1D/n8frCUjOZIJtfnnxP UcjJL4K6kWteX2JC5dTZbMNICa4ENNGdXQYf3a8ulBR+q0FZVS61fb3QHxEX3JQj/LAU +vS2YaSUVu9mPVs0HtfIdbRGHN0vf7oje6JUivYWpSy3syy9cbCLM6nEf/z7XkWGuLnE 7/IJ/CAn5ZSZpqL8C9YEcp1IcS4Ymv+jBN+1BTFytG40uQPXfJaZwj6r5SFUYX/tVypi Xlqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471423; x=1761076223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YeiwxiUvqRGSS/dH8aPGA6TRw5Wq+/Vm3e+77xD1954=; b=VHG9Wyq0CTvvajjcY+KNzrs4vG58vWmMsUxjPzrT4XofKz/ttWX4/oqJ3LBT5ZutkY DRvMKPbkL9SVjefO+3e2cWF0aWE4Uj2pyY8RNL9xYEzut5hDDK2m6kZD2upLjpWmQyxh +h9axa6PhAZ+/bXXxM3TSU6g+r4LC7AzaQ7RFHtqqYTyTXJOY3BVn6qcXKtx+27uE+m3 E+GOISGb4NzUj2AGH9b0firkETQzf6SG5Lz1oiaHBn5yg7YhSszh2+BaQjk04kKT1bA8 ie+OQ4E2p78NlgS503oDHDZYP6qsXo2toJGSyFx7VLr8910SGpPhLt0wtlFDNqU0BfbZ U99A== X-Gm-Message-State: AOJu0YzvzL6sAkPnpKdXDP4gcPNK2D0t1ZWShC7X2tjeLb7SVY/GwWsK y8fS1mqUNfwZViBTxVFzKBWSpi5eHiQhaOxqwj8wpRV7KBsLb4NcYmU4TweItUFws6PHCQQgdkv JgGHfnZo= X-Gm-Gg: ASbGncs0dIjx4MHaV0LDkyj6F4DrqiJly5wFKprT4542zy4P/+7D2T1CPnyYfC26Q30 dtaA1pHmBqvOI6EauO8RSEDsrBSp52GDE5L9KOlIsuud00PErcxuLzFdi9afCK2U4qN/YHQEuOe x8fWrJdzG6wBVsllCH/gobQ5rs7+4yb9w+QQdJOxfCYfUnJPo/M/3hQbIktS9BZjbb7xKJAwXBy /xJMwCRXKVxazsgT9fCTGSbmBjcjdIu2GwzGLsve1eTwDzQnApnk6ozbT4khXCCgcBwWW4gOv9M AviI3TCZmUQLtnlDttX+vMRvHDX8DLAF9vLKH5pcQR2qkfJ7aovmQs1Nz4krlcIINVZznXBn/Mz YPzwneHMuX/8GQoiBU2GD8CFTY1vRATQw1aMH81BFlLTGud5jK9CXHRMV7ZrnKQ== X-Google-Smtp-Source: AGHT+IGMt05uYlqnkiw+8u1XhFFkjfrOirM8wSU2bcTQZGp5rgX88XTJXBcCZA7K5K8jq1i151CiPA== X-Received: by 2002:a05:6a21:3291:b0:2ee:afa3:deb3 with SMTP id adf61e73a8af0-32da83e686dmr35355003637.46.1760471423331; Tue, 14 Oct 2025 12:50:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 4/7] target/arm: Drop trivial assert vs attrindx Date: Tue, 14 Oct 2025 12:50:14 -0700 Message-ID: <20251014195017.421681-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 @linaro.org) X-ZM-MESSAGEID: 1760471500445158500 Content-Type: text/plain; charset="utf-8" We just extracted 3 bits; the <=3D 7 test is trivially true. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/ptw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index d4386ede73..54c45fc9fe 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2320,7 +2320,6 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Tr= anslate *ptw, /* Index into MAIR registers for cache attributes */ attrindx =3D extract32(attrs, 2, 3); mair =3D env->cp15.mair_el[regime_el(mmu_idx)]; - assert(attrindx <=3D 7); result->cacheattrs.is_s2_format =3D false; result->cacheattrs.attrs =3D extract64(mair, attrindx * 8, 8); =20 --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471464; cv=none; d=zohomail.com; s=zohoarc; b=WVJpElnY4GrK3FHBVd5vZC1bLka/uiGUdNUs1/GubciyGXT7Zd6qioMj4rkV+zlNL0jLG9ZLT2DpIkll2Rlod9mpR4B4PEVU3zy4ybMRzDvAQcDEXO6W70oLeDHqHZmIx2uD4XSvmFC8QBCSIx2XOgQaT94+33+T4DzXB8thy58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471464; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m2Xy9FdJMIc8NV80GYudnI9XDnoteebZK7GGC8hP3Zs=; b=COdElBLKZsRUSrHrlcl9vsQYGGQb32vbYZXBvxIMRr+nCO9pM1lVQo3ZFwhu9h91xT9R41U+YBFKexfV6JKrwOHjocfe4kneSYJPTRRLhIIyPk1p8eSV/WTnzWPPPFOubfldACnV6D0913juOCW3Ec4icLiR1TnJFve0DEjjTr0= 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 1760471464001358.9511497128665; Tue, 14 Oct 2025 12:51:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2e-0001cB-7x; Tue, 14 Oct 2025 15:50:40 -0400 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 1v8l2U-0001Zy-Q3 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:32 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2R-0003Po-Cq for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:30 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-78af743c232so5271912b3a.1 for ; Tue, 14 Oct 2025 12:50:26 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471424; x=1761076224; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m2Xy9FdJMIc8NV80GYudnI9XDnoteebZK7GGC8hP3Zs=; b=QN8XHLi4MtJc0y9wqdeahgH6pWtux4nFIw7yLzH37DSRzNciB2T9JZMfZAofp5eE+u 3AGIsiI8I1u918vLws5CoCsxCfYd+eqJ7i6sxaQ7/YCAUedZG+vtaozqu+hyzZAWmopB XTCx1neVtgPi71fAXfqe2BTsWouayYHQoXs7ziC3JtExt5nDncZLT+sbvymYVe9crllR 0UG7VKTx7ItsKZsTlxxxTchJIDGGue7lraJcdN6xey4fNT4/kb3k3IovBhUHdU0abcag VmN/uKNU2IjMh9vPHkaQ5uK3ull+0n03lbJ9HqpCnK0IPbHmfbSa6QueE3cn+yigq0Ym wuGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471424; x=1761076224; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m2Xy9FdJMIc8NV80GYudnI9XDnoteebZK7GGC8hP3Zs=; b=PSlbfYWRXgESJRJDVdj1f9McrD2Rb/wi7X538ov/UAxgD94d2IUd25fmm1lKP2N1tJ mQHG68nyW0M9WqwPjmGQf/yBX+tt7qtGuC8dfxowCXc64luWgp1OZnAmENsnkxA1us8s 2EqpEU1lhk/kdnJRvWl+EvDDr2ZcP5kVTk1FyZXixcxp9iHj0GG2WpNAZyfSVlsnkhXB oCUP3xyS4fUF3vGZCsziKZ8gMSybGaaA6Eo26fJKso63BIGxJr/pIohnk8ZtPrjYh7hD 0Ef87921ys5HKyIU2W4IRbJQtaDqFwcX5hStuPqYcWJqGWkeTVpbvT6pus6l1Vit8dMk x0WA== X-Gm-Message-State: AOJu0YxodybEJamuKwogb8lBzXMUZycq5+ga4Q/0OLg3G6KYhtPKwqcX szPTsyCvSFxNGfrwmsd0RetyazTpHmH79nNic5FWeM7nSVISltJko4u7ySeFkCp+7lMote7/gvV 62FI/lY8= X-Gm-Gg: ASbGnctOqssCaFSL93WZCL/xmU3q8LeoU8GIaZSEg6SuhTdFAMX9LKDs4Bx6MF/g0rF Ppo85zI9C17y+76Lyp8Yq+qSx2u7oInxfigEqUCIbWrosu65/NAj1GgD27gz/7DSDiJZ/RMvzIp +q1LPel5xIgtqO8C0F2/hRlZ1oj7wF1rj/n85licGhoFI4Va9v8RFWthUzl/F7ksNMlq2HrZ93g gm6BXVrSjOl1cEhz4AlErRmdlW7FK5wdSa0xCFwbn2ohwj8yv1O+PyBR7s583LcoEgpzEHOFvFW Yc+wDjXzxi6XQuZkgqoye3AiSReb3UI8UuXpzy7o9p+rHXKprw1vn660Vni1Q8Ibg0mLOcLwPji vJGx3DAW+zSpRfbEEdTRk3iNwJ62MMyi22i64LyJsFPTGEVSVtc8= X-Google-Smtp-Source: AGHT+IH8/s9RQFwZ1jyjGBMNBf0m/XQQIUmyOTE6Xxz7hy3qpf9H3m2oUtfcG7b6eqaSxLmYjMQ2pA== X-Received: by 2002:a05:6a00:14ca:b0:781:c54:4d24 with SMTP id d2e1a72fcca58-79387052554mr28867034b3a.21.1760471424148; Tue, 14 Oct 2025 12:50:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 5/7] target/arm: Use el local indexing mair_el Date: Tue, 14 Oct 2025 12:50:15 -0700 Message-ID: <20251014195017.421681-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 @linaro.org) X-ZM-MESSAGEID: 1760471469982158500 Content-Type: text/plain; charset="utf-8" We already have regime_el() computed to a local. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/ptw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 54c45fc9fe..5fcf104272 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2319,7 +2319,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Tr= anslate *ptw, =20 /* Index into MAIR registers for cache attributes */ attrindx =3D extract32(attrs, 2, 3); - mair =3D env->cp15.mair_el[regime_el(mmu_idx)]; + mair =3D env->cp15.mair_el[el]; result->cacheattrs.is_s2_format =3D false; result->cacheattrs.attrs =3D extract64(mair, attrindx * 8, 8); =20 --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471518; cv=none; d=zohomail.com; s=zohoarc; b=hWz4m3lvRg+v4blnEqgzAOMsy1umFhsRuH6o9gPu4orfEgdc8B6h3viTmYe50xQJ1xOUqKTQbAhAjQS8rZdnz0nug9XhZum5fofgJiHVIcAzXeeoRsGclKfPQ2CYmpe4VonLEojSkPCnktT0r6pgkyPpgPRgTs+BBvT/J7SNKQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471518; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LZTPxisuBlozaf2cVitU7+jksAc4vzj+QrVyIeBLhAA=; b=Z8Vt2JbmYYmuWJFkyvkBp+YzILgir80YMh2Fxxtz7t2zbiWNeuD3h4UBopv12+gMoLHBlHpXlta2t+l1y5mMM2M63+iuiFSNWEr2TZoZFH40DHSg2vOvkxnKs/QmoRIcOvqKZ36xTlGQ1+CIfJXFQtU5tabFysPELFTBn2YI8OU= 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 1760471518449293.25035282359556; Tue, 14 Oct 2025 12:51:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2f-0001dH-KN; Tue, 14 Oct 2025 15:50:41 -0400 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 1v8l2W-0001a2-O5 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:34 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2S-0003Pu-8u for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:32 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7a16bd4d875so124655b3a.2 for ; Tue, 14 Oct 2025 12:50:26 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471425; x=1761076225; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LZTPxisuBlozaf2cVitU7+jksAc4vzj+QrVyIeBLhAA=; b=rMJcjhNz/V9GHpxBqz0mUOKdIBrChROEocSlZR305kZHjZvWGRo/SqE3dCxxNzg+o6 bfcul+wIyqNrweAZXIRvZ1tKQwo1h1jdgqSM0LBfG/W2AFWN9P9FSBBNwjzxXWRibEuf cDlc3iNSW2WhD0bO7zTkjfGvd4+PokRvBRAvZr03XfDkthrroVS/0ivFjc4ZL9iYFYHU jVnttCrPyytFUlPfY/v2RXpRe77CQiv3V+Hg8ktbrNpUKHZI8+Gkt/Olu0xsEmCVDe6R voQuxSlRonSo2ogen+eGnnmM7YvssVvlo4hDlpvxNqbhFBY/3tj1BaIQbk/w3g2/FhQg lqrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471425; x=1761076225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LZTPxisuBlozaf2cVitU7+jksAc4vzj+QrVyIeBLhAA=; b=OpMf5I6OtuyyiL/6+kgg0/jwHyVjAGEQVHa/P4WDFxnUunugWcQ36afPTLnOZH/7Rt pEnJTZUCkwF63PQ+Y1ckHhsCeNibN1MKlPoo4kjSa0dC4g52l6el1i0d0rO7beBB/OrB YHuvUscznztJ1H8r4omXFLl+kcsWfAZ28hgLZj5hfZU75tFKv6Xawfu3QiVyLdR03+eT ys5qsZUwHPp0b8EjNCFMJxdW7EselX6M+sxRsadnye9PB8DyyDh8v+oCjM/3qloRLu+7 mPRdELPexm9GyQVG7YX8g8ieFzAIfL3QO5iQAfqWjkK1a6vFALkqd99g+Xr2oNH9SRZi FFpw== X-Gm-Message-State: AOJu0YxjfHLIE+wJzp9cJkpMCsIjjvs2Nr4SagrloGQjv2569lSl0Vn8 V4S4WRTBa61Z1z3167r3VYZJlxSgGmlEEh1FF+/p6kHV1maEcDDCjrPgAwghyeKY+QbtikPd+3V XQU5JWtA= X-Gm-Gg: ASbGncuwaVlQ5FxqvZZHZl0W4uNtxLFVcTVd+BcXEPhMO8cfFxJiYuszpgbCUFqlcwP /K5uIh5M9wvtgXb78o7JzqFBdqRrpJBP10ufvQJ38i/1H1QeuqxJ7C0zXr7sPV5ZANsCr+AGraT Z+6z65r6MrvDY2ENHuEZDcSH5cEz3cA+Bt8S/X8lWMLyuQ8xO1QEd0wEpxEMG4Fw8nkWO9d/Qq0 u9wVENqIzo1QjyP3XHvq44M8cwBT7YqF9BxJAS9LvwpFbjNxSVdpgMBsgmIldu1lUtDaYW03bcV 35ztzTQMgY3X6bko1Tfi+KYcMmbytnzGG7RdqK2nOkA6WvLfvhJpeenvyYv+McGQdHgaezyTbLT LqVnaNbYXxibjS7U+FksbpKBUjozDrnSWGlIL3zs4SPHt0YHwF4U= X-Google-Smtp-Source: AGHT+IH/xTYEyE3k6CYI52N0Lb6Dimhu1SAmlR0ypZYBqzgpQTln9z4yS1hidHRmrRCdUr+dpb31qg== X-Received: by 2002:a05:6a20:4305:b0:324:6e84:d16e with SMTP id adf61e73a8af0-32da83e6479mr32108514637.43.1760471424962; Tue, 14 Oct 2025 12:50:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 6/7] target/arm: Honor param.aie in get_phys_addr_lpae Date: Tue, 14 Oct 2025 12:50:16 -0700 Message-ID: <20251014195017.421681-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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.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 @linaro.org) X-ZM-MESSAGEID: 1760471520088154100 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/ptw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 5fcf104272..23f6616811 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2319,7 +2319,9 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Tr= anslate *ptw, =20 /* Index into MAIR registers for cache attributes */ attrindx =3D extract32(attrs, 2, 3); - mair =3D env->cp15.mair_el[el]; + mair =3D (param.aie && extract64(attrs, 59, 1) + ? env->cp15.mair2_el[el] + : env->cp15.mair_el[el]); result->cacheattrs.is_s2_format =3D false; result->cacheattrs.attrs =3D extract64(mair, attrindx * 8, 8); =20 --=20 2.43.0 From nobody Fri Nov 14 18:19:09 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760471517; cv=none; d=zohomail.com; s=zohoarc; b=JX4GO995SNzo5RBeE+JvpT1Azr20f44Qx0bTJOEWoz56CPALtg7mFRIYOXHqRwUJLaoPZimbOcp/sbDfFAR8nMfg6boaLfyLkN01Yue4WotcjQNhRbl+wJ3yLJtyQjzh8wsmcENudgAzG3Sq5gxP2/WNHp65OZOIcETIv416xh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760471517; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NaprHm1cxvsJDmn0tazFeaRDUdyxGs85ZVb7NZLiwUQ=; b=H7q0EQdzgiM3BN15mrWnA6J7Y9MyUqVPzwl2NGyRdEWul5U0dOVNyeIuP21USZoylWVyq4SmajzpPDbQRAViw3r7z7rrRLOyBkKYgUIi06XBJII3VAXXUj8ywldOH2QXn382SF1JdNO1SJHYPsZua8KfFqzKBLGCG1o8OrldqVQ= 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 1760471517418647.7977061360796; Tue, 14 Oct 2025 12:51:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8l2j-0001et-46; Tue, 14 Oct 2025 15:50:45 -0400 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 1v8l2Z-0001az-Ts for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:36 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8l2S-0003Q6-Tc for qemu-devel@nongnu.org; Tue, 14 Oct 2025 15:50:35 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-7841da939deso5158950b3a.2 for ; Tue, 14 Oct 2025 12:50:27 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992b63a03dsm15918727b3a.19.2025.10.14.12.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 12:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760471425; x=1761076225; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NaprHm1cxvsJDmn0tazFeaRDUdyxGs85ZVb7NZLiwUQ=; b=BoadkB5ufUW/kQhpver3k/OXF9svrBUAYAWwxvD+1Xuj2yt0yZsv96JVufxMP8MHHS eBBILFrEZIlgEQ1PMnLEW9tY5+Fcy78VwMZnrysmn04WG3dMy3bvxIm/DuAnfsT9q+Wn 0qQ6cWoEow2OgbN46/rCF6ZBdu1MOiW7UV5ued3f8zKkSFIRpOBVhIlFKoKsLKimQ3+s i5ElbX8bKLR0nTpquHRilcnD620+nhm3ntsOR22nggBdM9tzuvOdzn3EtS1OGYy2JzHl IhDa35W+eHs+3+AXI2qd7qIDD5tgy9ll1MK5YgKBkyYL3VR7lBIhIL2SklNpmqfDMrHl f8mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760471425; x=1761076225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NaprHm1cxvsJDmn0tazFeaRDUdyxGs85ZVb7NZLiwUQ=; b=d2SLHDW+KvgZypOXm+8t4UAOftQE+AouVxkJKtTsSQDK2wwGUYjOSF+x+mMoEzOFDE Gwjji075Sz16N23eYiQRWnVeVKXfCNJ+2b3FZB0zI6PgHqxKeAC6FxrKHsWtCDaC/kW4 bhCStIOQRCb2MOYZ5jYGnvhs+0AEvL6GTvjSJtD1SHxSko33xTACVT0uyBO6h6u94V7p 5ZA3gQ61spl6LnGca3GJhWSk1LrvcevvGBsxM5hTaaBAs7ITaPM6E9x1iTQNIIqGJR5f DRFeiA4oeLn4rx+EbtUHtsx1WL0uGxq3qhKw8vq3ZxTROjzRltcXiPUhs4Neka5QuMyJ xk5w== X-Gm-Message-State: AOJu0YyKTdHmHzxdMWHZm5pxjH7cgjmWWXCN2ilDzZeAz+/NNlaxedqW t7zqkdo/b5XvL/+8ZlkMWmD6Ivl6J+OKrrOuegbL88baXl7M7wNF9/+q4itLKjIXm/ZVxzaZyb3 dIRY9EWQ= X-Gm-Gg: ASbGncu0QiBeDCV67JrKJKwckjxSbs7/Oz78R7ACECwSOa4asjyy51Ro+1eK5Rh/6Bw Lun74OzK3PygQgn285xkYew63eynsS8h00+HAqksoQrAhEiAXtOo+UPkmISCnlE3wGCVBa7PoWh e0J0TFBFhgw5wKPIggooZLBn/qGK0V+lxIX6jlVqGhqLTmP2Q7gNmxlod/vaMZ5WPpJDPnCwBvY 99MH/dAI1/ks8h07S0iZhDnGOLksjY91gKUi8XvIqZD3paLtjA9neZrlLFWrmDvmO0Jisdt1P+D n6H21YW7TH64nCgvAs1P3OpAi8xExQ7q2WnmvWtDFrqneVnhVLH3GN48yn2tzUUGUB8wCuMV2zz h8XApGV3C1cmd9Y+dj9mOUbP76MaxYj0voHxOp0F0sTiINj7cjbxt9SKLYQML/37I1DZnPsal X-Google-Smtp-Source: AGHT+IFs2rdMt6FFIg1yhnB3QnB0IBgUKHJ1uJjzdqDmzAwZsNw2o0WvRbOlaH2ZY+SGXfevO8/6NA== X-Received: by 2002:a05:6a20:9184:b0:32d:bb3e:c1b5 with SMTP id adf61e73a8af0-32dbb3ec680mr30750541637.31.1760471425609; Tue, 14 Oct 2025 12:50:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 7/7] target/arm: Enable FEAT_AIE for -cpu max Date: Tue, 14 Oct 2025 12:50:17 -0700 Message-ID: <20251014195017.421681-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org> References: <20251014195017.421681-1-richard.henderson@linaro.org> 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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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.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 @linaro.org) X-ZM-MESSAGEID: 1760471520683158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/tcg/cpu64.c | 1 + docs/system/arm/emulation.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 1bffe66e81..6871956382 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1331,6 +1331,7 @@ void aarch64_max_tcg_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64MMFR3, SPEC_FPACC, 1); /* FEAT_FPACC_SPEC */ t =3D FIELD_DP64(t, ID_AA64MMFR3, S1PIE, 1); /* FEAT_S1PIE */ t =3D FIELD_DP64(t, ID_AA64MMFR3, S2PIE, 1); /* FEAT_S2PIE */ + t =3D FIELD_DP64(t, ID_AA64MMFR3, AIE, 1); /* FEAT_AIE */ SET_IDREG(isar, ID_AA64MMFR3, t); =20 t =3D GET_IDREG(isar, ID_AA64ZFR0); diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index bf81da124a..31a5878a8f 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -21,6 +21,7 @@ the following architecture extensions: - FEAT_AdvSIMD (Advanced SIMD Extension) - FEAT_AES (AESD and AESE instructions) - FEAT_AFP (Alternate floating-point behavior) +- FEAT_AIE (Memory Attribute Index Enhancement) - FEAT_Armv9_Crypto (Armv9 Cryptographic Extension) - FEAT_ASID16 (16 bit ASID) - FEAT_ATS1A (Address Translation operations that ignore stage 1 permissio= ns) --=20 2.43.0