From nobody Fri Nov 14 18:17:40 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=1760127681; cv=none; d=zohomail.com; s=zohoarc; b=QmebTcFjNfpn0s8Oxtc1sNcySB04Sm+yi6K1REYeVfKb+OewdUx7I5lTeLqybAyD/3EUF9gdxP+vsZDhAnCec5CMRPj5iQ9fXMDnOij+/cTUriRaU9nN/78rq3am62YJaOXhYyPnTeTzpLIvObBLZItQe/lw5ReuOA80kqWEg+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127681; 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=q2Aq2R8qFy1Zs+Gw1UAVd5afKCONPV4nbObRXjTv5Ss=; b=KsBCii215Kw7Y4evnfKxe+Po8tTu4y5qWByyxFuzOX7aIbVALn6PUP/nLLMMliSjz5s5s1wVnTKJ92JtRuGg4gcvZw+lXhEAMH88rfiCJB4/+PgTkc8AzAVj28sG7ceq0ZmstCKGQwJxqOG5hPY6+EvN1d/GO9lrfx3/emGWp6A= 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 17601276813371000.2762528582208; Fri, 10 Oct 2025 13:21:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7JaM-0000Ql-3z; Fri, 10 Oct 2025 16:19:30 -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 1v7JaG-0000P2-Ne for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:24 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaD-0002lL-PE for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:24 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-791c287c10dso2323798b3a.1 for ; Fri, 10 Oct 2025 13:19:21 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127559; x=1760732359; 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=q2Aq2R8qFy1Zs+Gw1UAVd5afKCONPV4nbObRXjTv5Ss=; b=gRqn3rivhPd5hUL74tPrLGCw8+fIH840AKsJIYuk9WsieHNh8LHraAQYOD5ebLQk9t q1M/X4ber72ULEMJELvBi51SXZjUMMojqiBnyUk2syTobcAUMzF5fSAG+TZwss1VoIT0 JI8tDpVOUxBhrclBy8myKxoeUvVCzGzr2rFfU37puGDmwWhnXC8cksF3RbbMWQ4nASu7 SxW0plIdSJ4XRVVGp79aYZVqsNs0HG/Bw6WuBx1wFcUwDhGdQiYNGfEj2/xpcG16utmD m6aprKpn7y0xbbxccP9bdp3nuEGl07X5utj0XXM+TcWupYBssKMpfhVFz7nxS+xLYFS5 dwtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127559; x=1760732359; 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=q2Aq2R8qFy1Zs+Gw1UAVd5afKCONPV4nbObRXjTv5Ss=; b=t4mZzwfpYFaIvmcv4gVbRIpD3Dbbelv3IBJOJ1u3BhfOUVIKbdTpPPe+M2gl0q5vX6 VQFKXb/O6Pjx3icR+/m3bOTJ+AKG160JkQMkSxFxYz/4/JcNRsK6/Knux2+LgfUYopzQ OaW7shDTkTSKZ2ia+wmZW24wvlDLxTY3D86bKXJ1ruFPijXq7bfwmXElOq4JNPPRe574 NCjYojKHA7e0StDKr7cgYy/vgTH3xnF7IcDeKJRgrILbEqFsQ/usA/rA5HUQFL/iQUjA DhZIUKIIwZdvQ9T/T1iefRPd8DjH0D2w5WVoRZJXG3IUVqqa4RruWg9GomQywgJ4vWZ5 cboQ== X-Gm-Message-State: AOJu0Ywt6xrvQvYzvxm3lu3dH+Mfy0o+ohOOY5Og6RpVueuPFmrAo12b ywjiygbEiZS8gxpU+HOmjIY5KAf1UWj+c2G76hrdTdp5ebDWVDhQomqGWd3ligbQNCBkZiTejlA RA0/n3oc= X-Gm-Gg: ASbGncuK1VNSQ7026arr1c2N4XodTS+Zx+TM70gsOrtEZb6fSiQUkc1wkEBxSZl/JSE h5H+k085Y5t2AAp3objrlOB/FKvbhTE7F8SP1hzI6nu902KR0SALvOeJBPCBaQojda31JyBgCwa yTE7isNJp/68A1AIV9ubizjdRILmwUeSP9zLOYh2Y+3rfQDKnpgoz9Y5WpbTVCrpOuGssbl0NK/ tNXVpYApcb4RvnqNUdQWSGdsIUPeZdm+EBFQdhIpSZBsD5quQ9CF1zXJoyx/WiTvcKKcfC/EoVK WrJZ0jw1ve3lrpagHeS4waL7LQKZJcn0+oycXK7ra3q7rNidYnEgytKLIK5pmT8JUEzKiPJ+m6y uPbrGhEadZ9w9O9FXDhj16ypk/gP3Rjul4dpKYHjOfULd8pcRsVOaaWCv6lszzQ== X-Google-Smtp-Source: AGHT+IEWJ14Ez9JxUDmpVkgTt1bMHyIiSMhw2gQeIlLSqcXq6e9s1YF7aTi6dTmqKk3GsZ9ZIkMp3Q== X-Received: by 2002:a05:6a20:6a29:b0:2d6:9a15:1394 with SMTP id adf61e73a8af0-32da8130c95mr17450009637.18.1760127559561; Fri, 10 Oct 2025 13:19:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 1/7] target/arm: Add isar feature test for FEAT_AIE Date: Fri, 10 Oct 2025 13:19:11 -0700 Message-ID: <20251010201917.685716-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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: 1760127687004158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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:17:40 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=1760127687; cv=none; d=zohomail.com; s=zohoarc; b=n4IFIJO6Z6HU7pq0sXf3UFZ9S3ST0MqUX5jbvHrCDT6kFRgnAAvaNvwYe+l02C5R840l681IN8Zutk1a8X3cRBh7nP4Z8e4+eQ5QhsFtS0tyeA3xhyjKaORT99/phCE6edvvNrUrYGssZlt8tOaJLGlXg0ycclKNKKNyJWUsfzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127687; 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=/tcvXe/+zrpnYYwFhuufS2LXIH9ZUA9oPOxweSPI5bU=; b=iCxzvB/HAQc7h6AfRRvVQ/JkDJERn5dEKh0WJaIVsm52kO949SvFb7JouMQEtH0QOyaTSC5suQhR/0y8ak5WwxYD6cR2kgpucw1MNHvNbKL+o0/NAFpQnx/KwWJTbvustfrQPnUDlrDjemYV9zm83OIDO2v8GMl+xW9xFb+/pQU= 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 1760127686964937.424752258812; Fri, 10 Oct 2025 13:21:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Jac-0000Uc-0h; Fri, 10 Oct 2025 16:19:46 -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 1v7JaK-0000Pc-KQ for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:29 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaF-0002lg-0W for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:28 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-78125ed4052so2967183b3a.0 for ; Fri, 10 Oct 2025 13:19:21 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127560; x=1760732360; 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=/tcvXe/+zrpnYYwFhuufS2LXIH9ZUA9oPOxweSPI5bU=; b=EnGgf9H2ZY4Eg2KFcPlBqfVqVKU2tVmarGtwYkoknBsNkrtUwsLsGWN0/rxtP3iph4 b/xQjJ37N2iHRLpaXNzqe/NLNg4o0q5Q44FpzuwCEXmhmJ0syrmPsoclIAInmfGdNB5q EmDTSEUm874eb/4ZzMovNIzVV7cvLazyUdDKpESKETTO9e1APzJ2e/TK6VMQ4bBQ+j6S 8cuUPWYTdpC83jkb6z8vSNayWU9S6oVrH0EXh7e8Ps9sWZBo+eORMCaga1E/F3wENiMJ Vb1EG9WsSHNl+bhXiYjdCwqQd2kfka5iC2CQUDZejr0/+dZh4IXMAoD4UY4ZKNPiwZ6j 2bqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127560; x=1760732360; 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=/tcvXe/+zrpnYYwFhuufS2LXIH9ZUA9oPOxweSPI5bU=; b=nox4X+/37CeArH01/WMWahGx5U3s8lXymN2WK0JGNABhzPO6guzh75WlIVHmjgvNzO d7vRbyiksAtbSMj7rsPHTCL6neN1/v0eyodPooCF6PCkGWVHjmXXgSBmyMRUFXdiJOwx 34RmlTS/zn+wQB9m5DK+30V+041Q1OS2qis67sNCHTdkmNSxprsGsDQOKbXOoUW8/HVQ tTdYuhvG8AcfJ9pwN3ksEG5LsfizQvNSsUcj+nvk4BDWEKVhA0jVL+dPqWUUa957lBOv /GKyH0bIMJHNM7400Wen224MsZgLQVvSK3xgqxbux75vkEKCyEyIaeBB4a0b2C3Q4Psx BeEQ== X-Gm-Message-State: AOJu0Yz9hO/pwIaylMuhW0l84kaOMTiwroXB42GhTIbLlUoL/QMuk5QB mYk4wbUkmSD5BW+awbldKFBM5rOWOjHqrEtodxDEn7z1C2kb1X9OPsJRbldNdyC6JSLousXJzrm Keym/06A= X-Gm-Gg: ASbGncvm27JAd2C+6mSgtE32SRPAT6BCPkzkISqaFSgVL+DLXYOcKIQljbAcK0XjJ/P kXFodeIctsjKEp3Z/IO+qPra6C6F+qEUCeQgb5si8zFUHf8VvTGg3jkpg83hvugaH1l70hq7ZVL Xtmb+wodENmtENjyJYtOyMKe3AEBJdnWcZQMDwAVOiBBPK65GeykGe356gesjoVY6a7sVOwAh/Y YKZqC2ZVpYAPzQ632xfpC4k2pcXNHwVEANDCCvsZqZbmjBPCHJUxMBdS7WRu/qSrZwW7kWumfyl 36agR+DDVPDh2p9ICdtSy1HscsAxyjWzRkGNpGlvPk3vtNEQDL3B6sy229pNPLHNNQ3p7AP9Y80 uCohHs/UVtzj3em2KAVMzQ5MEOl7DOCTXaZMyKsTYgYONJSn5Ya0SoGvqcbnhzA== X-Google-Smtp-Source: AGHT+IHmRe3uENi2PItqGA61GOOwz89E7hPW2mPCuJ8gd39gfYXpldNKg+71rAPSI4863oRT2BT7Bg== X-Received: by 2002:a05:6a00:234b:b0:781:8680:3175 with SMTP id d2e1a72fcca58-79387146c19mr15880335b3a.21.1760127560209; Fri, 10 Oct 2025 13:19:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 2/7] target/arm: Implement MAIR2_ELx and AMAIR2_ELx Date: Fri, 10 Oct 2025 13:19:12 -0700 Message-ID: <20251010201917.685716-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: 1760127688573154100 Content-Type: text/plain; charset="utf-8" Enable the SCR.AIEn bit in scr_write, and test it in aien_access. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/cpregs.h | 2 ++ target/arm/cpu.h | 5 +++- target/arm/helper.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 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/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:17:40 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=1760127720; cv=none; d=zohomail.com; s=zohoarc; b=WOatkjCPSLTcvh7jOfAihn+5d+1mmX7zlieyGSH/n1TjCvdDxuIMo7mx0w5W8JI95GW5b3PPgR78x3DQ61xf93/Asta3Q/2axQgYqeEXDZqRMs4rGaxbrUIw080sfFJaBZIGCt4ASedzt4TFHHSoKkKZM8NeZksFAsJ3LanMWvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127720; 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=lKDWM9JOJL4Z7fwX++JRpG4RVDnGvsCntxjMTQCvPsg=; b=jIH+DnyTYP+4DABk4J8AHnrH+iiQswaYunuIt/OJ6+LMeJgIb7LFczCeWx3fk+Zxa7AyJ8tNubGZjQ6nonFkMYPi9lEhgcXD280HIYMsHRj9TXIwBBdg95PzJA0DKJXjyI0Fh/gXzA/qNTRlzKXpUR9QeoNS1Jz7YJ29HPKaxLc= 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 1760127720586981.3429793776838; Fri, 10 Oct 2025 13:22:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7JaZ-0000T4-Cy; Fri, 10 Oct 2025 16:19:43 -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 1v7JaK-0000Pb-6f for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:29 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaF-0002lw-NK for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:27 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-77f1f29a551so3289964b3a.3 for ; Fri, 10 Oct 2025 13:19:23 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127561; x=1760732361; 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=lKDWM9JOJL4Z7fwX++JRpG4RVDnGvsCntxjMTQCvPsg=; b=LKYxU5i1gtVY38P4Rrfqnb091qkqkAEUhBzkkX7ppUSdrcIlgy68ME0uqnSGExAAiS jd07YpfKaWailSmnPDpTGUdxTnXSJ03p+E0wf6SkPkP5J3gtHjb3OrY6E5YbTwF7ZK7l bMtFX2nExRktqjn1UHWWsBIJOhjxchwgFnQJpsRMQz3R63wm/fNlCMkdUJXUPY6uCvMR wP3QfC+K+JoC7K5uPm+vJYEdEzKbCtse+BfjyKlddhKOrp2A4HDAgz7IAnYFsrBarO8y C5tIKyLBABpd4n7D12JMnvA4/LGOZqkx8HR+YQR3d6CUg+TTo/Kg++IzbNfeiUG8+r/v jKdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127561; x=1760732361; 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=lKDWM9JOJL4Z7fwX++JRpG4RVDnGvsCntxjMTQCvPsg=; b=gh86DwlewGjALNa/yumCsm+qZnFQEeb50bUcV0Cfl3cBV1nFwugT/iQRp5ZRw1FqKi DiPti45uEukgnSqnpv+jJCkyCkWkUFz/XbH0cL+NGeBr8pF12wIHi8lhNZTGj3O/W7lo asmZsYFQwgQvw9Ftm7zxKJPjYDcfGUhZdnKM6DUY/4eOBngLI7EucVw8kgol/GfWwXAH dSlgtY7Xe56C+bYcoffcxUNMZflhWedT0oABNsuYR9akIb8gyls2qCgmmuCSFITDWcXl e4ucsspQQW7D+dT97w+tQrlgnPLLd1k71BuOw9Mps6D4C/CYCMBqYu6GVBhkldBcsBWJ ATRQ== X-Gm-Message-State: AOJu0Yx1QPfcWXVyIFO6bFjQzp+cizYdLuGS+9PMWr6Yoear/BT9Fmmg 5EZDT44dQKxUvhE1TQMFJmdOf4oKLmkiMUB21f1ACYDY41kMLYTz2/z2GJxVOrFY/iLW4YB+2tn 2FQCIF9w= X-Gm-Gg: ASbGncvYH2Wqt93cSottLk49upxjuy3+Enlz9yNi4UC9GpomS25fO6uWxHm0h9Oy9OJ un91YY/bGnvfBurwC+WEN6QJnWuK7O3/6GXxoaAIarb1jvNk8805itoksje32Add88cyKCwjLsB dSCkgybUI1JJUZqYfjzMdMBDVDD+JqEOpW3MmFlA3x/wIyVjPr35qf9xVcKDKtgOKNli+txMUii nl89HL6dJ/nDiAzOYb8/88FYPVpdN5MBvtC2sLdim5DiFOTjEn2iucRRQxwtWmpwbn1VxTsbOOj v3IydenGB4oO8H+RiSdiy1d7foWoTwZwiVd/gTWQu6LAc5ZICHNT4iYfKBcBxuweAfZ1vIUZtEb a589YA+5ti4tWVgzWLEkgdFR9/X65Tr4Q95t0htbEd7BxSykrBW54NUrBq4THBVWjtbQ6WqYg X-Google-Smtp-Source: AGHT+IEBFVi/+kricpkeclHcP9sh9XWEFi+pL5UzcNnL5re0LVXz4iFq+eC3dOX7dCbgye/cAW41hA== X-Received: by 2002:a05:6a00:8c8:b0:781:2538:bf95 with SMTP id d2e1a72fcca58-793858fb6d4mr15043291b3a.10.1760127560844; Fri, 10 Oct 2025 13:19:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 3/7] target/arm: Add AIE to ARMVAParameters Date: Fri, 10 Oct 2025 13:19:13 -0700 Message-ID: <20251010201917.685716-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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: 1760127722854154100 Content-Type: text/plain; charset="utf-8" Allow the bit to be set in TCR2; extract the bit in aa64_va_parameters. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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:17:40 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=1760127715; cv=none; d=zohomail.com; s=zohoarc; b=gYzAtIFlP1ZU5MbQGeTl8JgdhyrxbFS2BIxaFbsOuu0WGfSEe1EV1FOLCC7h38/54ujsG1lkLKT5EB/GdNjOKC4KQSUEH1ZqrYt0aL7L7igrHPpFzrGZZaKyGinn7VZIXDyfdC86Eqdhar5XCeLGqEhtQ5czanUrMSGUJ5eDC40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127715; 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=8c/a/e7GGXyISQ+cP5eE5evfd22JmDwjI0oLT+QFhgY=; b=MLjcThkybwMlspwbaS7iwMg8ZQEvI46AW1wqOWvxg99p0iLbGnDpzfqtnIsx179vi3Z9MgITLYCNG1OE7YfreN4nAfF8KEBeCHJJhFUXXUVPMUlLZQlUhgIQZcqvu2MalJlXKX3KT68EXp0bQGR3iFo/aiNsJJVRjt35ZXk9+FY= 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 1760127715818591.793936814721; Fri, 10 Oct 2025 13:21:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Jaa-0000TX-0R; Fri, 10 Oct 2025 16:19:44 -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 1v7JaP-0000Rf-D6 for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:33 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaG-0002mA-Dn for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:33 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-781997d195aso1791392b3a.3 for ; Fri, 10 Oct 2025 13:19:23 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127562; x=1760732362; 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=8c/a/e7GGXyISQ+cP5eE5evfd22JmDwjI0oLT+QFhgY=; b=UVJtSVHMiVT+KHGyDQhzoXXfFKyfBPpRTtU9ejN16WZj5kF/Nvcyqj8E/XKX8aX5GY X/UlkbeyqcOmTMrVAyS4lNikbRPnatFXgl/tCynnUYhNN+WeOzf+6DyDLv0nYSQ6Iqv/ SO897MyaWRFimTkVNHMqEgoWbGYH5fdQ9/YoD8oumKZl112RVE1vTPPO0V3TtYWlBOdB JnOhOYCEqM5R5GW7IqTnLN2SP9gJP7MKuMr0f6aKnfeusuPDi2KEbI7InU6FdqfcQAlu IgYDL69aQLPoD7BfMhqs32upKO4/WsBBOP/l5ljV5RAst5H5v8cTOxUY3JpoaeAfXY8l KSzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127562; x=1760732362; 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=8c/a/e7GGXyISQ+cP5eE5evfd22JmDwjI0oLT+QFhgY=; b=LFwp6bNRzXKHpqf7SEDXSbm7CWawXa+AS99Tb5Bdk9UlKTvK+60GA7BVw6odzxVHuH Ltjgs+Oc5n6bY/iyTM+/aVClDlMnH8IsJ+Zh67A43Gsb+snlPCeKAuxul40wwoN4gDAu iT9MsxTeF8SZKNXbY21fDJ6cvcklikQ19lEpqSCTKF7MG8mimgL1xmJiiT+r6txL6HU9 HmvcMfUnC2F/8uI0jxsVwaJ68ROkOWPaucLGB8IECGtBQJFATGixCkJpE+7RTYRoQQQV Li9BWz5r7wjBvI8JUFjTj2sL7ikVX1U484CLLkZsRdUvXAiAyf6q/NU1WHWZFB0gd+ji M9wg== X-Gm-Message-State: AOJu0Yw6+YJomT7A1DUyCx/cafHOKlq4rbG2SxA8/wyBv73fKVuW0Cnz zM7LlgztwMHfY75LDsDSL/A6OBkYdGqY1Ew4o/tACkVJ7ZmVMP0gXnB+XS44yXwFsxAPEZrxTtc /YaCNdYs= X-Gm-Gg: ASbGncuuMHq8eZG3KM5BpvcFhD5eP7LN0IvyRRQM9KzLkYsHGZOIO1YY8kpIfLQLcba JYC9k4pJrG0zwPl6dJfmx+O+8m+4b/F1vyJrJDPFV79UnQeeYftsTpPI0Q6uRaowXl7wEeZNCwf eVH1s7eHYQTqpXOlWS7j4/M5US4bq5Ob1/S/LmdtNzHqQ+mXrT9yjZhJPo5g2m8KSal0j/u+hot 84LQsrQ2cOQJERwRAf/ZZioAsTl4QkVAoU5xTEEzGa2ytveUWpbvoAbLlPnapbKL3mEH315yIxn xUGTtTjgHASKWba7Hg0wnGJ2nPog3n5k01ad3F8iJ1MCpyVT20Z24kTg6og3b/qc4OnEp1ipIj/ ISYZVyrX2yW8QHNAPkI/wmnVlIM8UFXrzLiVrw4h2behEIo+J5Kw= X-Google-Smtp-Source: AGHT+IGNQfr+nOt8GLVJjV4O2hH9AxJn0l4CWbu7Ze2rbIJ8yFqydBlO3Gyu+5h4nCf+U5lgeaHCWA== X-Received: by 2002:a05:6a00:4b01:b0:77f:1550:f3c9 with SMTP id d2e1a72fcca58-793859f34b3mr16203532b3a.12.1760127561430; Fri, 10 Oct 2025 13:19:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 4/7] target/arm: Drop trivial assert vs attrindx Date: Fri, 10 Oct 2025 13:19:14 -0700 Message-ID: <20251010201917.685716-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: 1760127718851154100 Content-Type: text/plain; charset="utf-8" We just extracted 3 bits; the <=3D 7 test is trivially true. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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:17:40 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=1760127682; cv=none; d=zohomail.com; s=zohoarc; b=Z6KSDRZINUX2+BKGraMDEPzHMUMis1JNrXz0WaqBdPO25Ix0O3Bu9qJvBcld7A6dcaMdR215nlGM4xOBEwGFF+9tQEhpusG53GTylelkZcH1Zdgq5NcB7U11meVmIgIiqz4U7N+A9MM4YJSTCK0YxQ0yXfFWf9M9wxsngZMxIcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127682; 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=CP76C7oRmzrw27VCj+6uaBSxUKPZ5rYHiNDf93P0cFA=; b=biIk9iF8S2PUB4TENQQubJMTEoXQkeYvNAKUGkp2X/kibBs0y41Uz3s/HpW04mTAZWULnBUDz/vjKP3TVYSyUkKGZ3AKmCoQt/sdZzJ/6N+eA3EnwMh2CDewjAILVncS8BobTJXOmFco3SkZRyyWsBEH0g5GgmAwhl8s8AeWVSQ= 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 1760127682309434.7117453364982; Fri, 10 Oct 2025 13:21:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7JaZ-0000TW-SR; Fri, 10 Oct 2025 16:19:43 -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 1v7JaO-0000RR-5L for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:33 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaK-0002mL-KG for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:31 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-782e93932ffso2351911b3a.3 for ; Fri, 10 Oct 2025 13:19:24 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127562; x=1760732362; 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=CP76C7oRmzrw27VCj+6uaBSxUKPZ5rYHiNDf93P0cFA=; b=VH8nnEqPePlElnzgDcJQKCfUlaISHRvOvN+ZjbrDbb/0ikPXHSwk1FBXNfEtV8SPZx 7yC5G727+KT2JmC1gZeaybEoVvsykvNZXeGLu3hSPl24a0sKMEPH6T3bTd6qF3y94x0f bjPhcRDFOxDIuq1uubmM7WbQ2iBKqESEbKv0UV0h6mJBbuD2OvFL7AzoHDB8Gc/dC/Bp wRxkrxZHSf1BO/oKbbKenroe1KE6N16EX1+ZLqoYbQ/vdtu3W+qQkCwfDsc2OoBPBj1T qT65xisdaqHOun6TQvbo5b8UdPhA4P/36XqsRgt1I/sLvUoHomjPsW3V9+gg1epPGe/I CJiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127562; x=1760732362; 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=CP76C7oRmzrw27VCj+6uaBSxUKPZ5rYHiNDf93P0cFA=; b=Xz7IIIdOOb5Yo5aHR9XtDNYSFIJPud8VMjqrknKiwFUGsBfI4hiS83MzPZcdgYkQS1 ftd4lTsaUWeQgU5PTkfiOpH38Zn0YI2P1hnO0pxSvIcGUByvMnJJl1X4vb1jAFVl7nEg pcJX+pilpPVpEopFIZvrV47SAyUpH7CE+WIkGYR32dOr90nxthSFQoaf/Ei5rWywZxwQ jHLVC9OaXJtg6j1gFx5eN694jKa226+8+eYnKlmH6Rnw0K3zqrt4iIukSYVttOfG/3De 4VwAWutQAVAKhpQh8OrOCGPbAno6cIVrUGunN5mrzmnxPlQJRYWdjC45CP7GRFSDO0SQ BTDA== X-Gm-Message-State: AOJu0Yw5KV1SKJhNJxuiH7qLxj12hBIT5IXWUOjorTmQM7ACsubHwPAr VN3URezA5aGl+u0964+jA+tTXQHOu1SqbhoCEkuu8KJicKLqI92jwKO0Sr1cx36CfeVl0q3VyIf sI1IdOfU= X-Gm-Gg: ASbGncu0V0lSYLC0XRh+GdQnfLa6bC/LOyqFUPbPuRp4qC5rXxBcFjJebOa+t0GMiwf AYZhexDsmuy+OlLzANu7Q+HJH9mfSti4NzWD613Wo2Jp4Csg79BMRIRlr7SlzlTIEae7C8quq4r ljI0g0LuTG/dh2EpYsjB2LqveUB66vILxVbmSI7EmQsnXZQycmrZDanjLwklsRCLoom/rT2N/hF uxD6b9lpEjlEOXzGUB7wziZpEKoVNEsnQHoWdISUs96f8wwI3uQG3ETBsUFUSuizmFoXpHcu0IA m4ihjkndrMmPRMNJsLthL1gYa4GtYDPKed05HTw8lm+aUbvdWQf0hk6Zb6plwaId1RtnkpCBL7d AP133rrxhGhyKuL28DGSidbh1F7EnSUGxRm++APla37DVIcKcwwXQruNSdmIdqQ== X-Google-Smtp-Source: AGHT+IHrsSC0MB3bUEfGYxk95TRPMNyTgd7R8NwAEpXlWu4EDGq3kqy3NxGiL/E2+Va6qwJ+0wAQPg== X-Received: by 2002:a05:6a00:178e:b0:782:ec0f:d271 with SMTP id d2e1a72fcca58-79385ce0c44mr15849346b3a.8.1760127562040; Fri, 10 Oct 2025 13:19:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 5/7] target/arm: Use el local indexing mair_el Date: Fri, 10 Oct 2025 13:19:15 -0700 Message-ID: <20251010201917.685716-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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: 1760127684949154100 Content-Type: text/plain; charset="utf-8" We already have regime_el() computed to a local. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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:17:40 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=1760127689; cv=none; d=zohomail.com; s=zohoarc; b=GncwCHsVHYbd+0tqWcv7ndCdoi2AXHkBLtU3DcrEmpONp7QLzsFzwkg988TNtXH9vPuNQDurNvjC6yYzPtN4nxrBbrUR+vPC4CpIVEoT00n7ddl5EBvEj13WdqtE57+9LPIJvmHBJdcpmOFsa00BSWa77enbYhSHcNeonuLUdl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127689; 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=cu0j3u1EiPOo3ymLdtqAPpVdEyM8avmIgAx+FgTrQms=; b=mYSe4clNgCEmqE1NDVs22Htaj/zC2AoXwkQLIvfiS0dwYSYw5wuvvhb49ZB0aBH/xE40yHzoVyFhDgsqzA7H+YejKGYH7al7rlbDVJC++POF32a32i+hhhpM3QoxTrFnOth0ujao2CuhnuM3ehykIdKBhx/Uu8x+oYR2qMrloSQ= 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 1760127689599228.94696665571269; Fri, 10 Oct 2025 13:21:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Jac-0000Ui-0O; Fri, 10 Oct 2025 16:19:47 -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 1v7JaL-0000Qc-NA for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:29 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7JaH-0002mb-F3 for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:29 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-77f67ba775aso3664331b3a.3 for ; Fri, 10 Oct 2025 13:19:24 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127563; x=1760732363; 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=cu0j3u1EiPOo3ymLdtqAPpVdEyM8avmIgAx+FgTrQms=; b=ykk6EedlP3l2SwEedfsAIo56u1YzSZu3GNjVHWUdqH96aNiQ5RIw8Lc/KvS4jim3a7 1L2IpjmMJaLBoPd4WINEHGs0VdYnB+LoIwONoH0w2iF1Dy/WxCmm8TfpnLcnA864jxbf n+QV6UcYhLq0jB1s2kI0PtX2AE9Lrc9qa0CM0lV6RLHtywoB3ZMZD8F19R+V54s2f0Zb XbteTE9+f1OnC35SOnfjHJQdSftZC+cQ36zR4U19ATyT7I3fXhOTRbIScjh0rFPr9712 xwazInmPa/dwkFwZ21+rkLuTjyCs3VhNMPs4nkE1pKOeQY4ZlREYy1hn2pN/ZSi/12Lh 7MjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127563; x=1760732363; 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=cu0j3u1EiPOo3ymLdtqAPpVdEyM8avmIgAx+FgTrQms=; b=rVe7lCrW1Xig7j7pljf4bs6IDURYf5BJPcvylyA7EfXL+CcLitEDL9apmB/pePFAdH +r1Nzazx3o02zAzNk5uWylDHuBaxdHAopD3knbvebrYgc4UqXxGZl2Z+0WKfrjEOtSnW f82Qi4fhj3+XwJlx2DPeDVTj+F1R61OYOnEyGdx+zaD4xCjBLOwZTVo22OLRCVm7C2l2 iwihS3mQLgwHn5xtA0zlkpx+qdpzvNI42j5qsTOj4GdpLhUcua1yq/YPZpwQYdC9lWnZ 8Ict4QTUxlk1PVXEw//x03JNNIPXJwms6qVfGrMx/HsB6R7Nocl5iC2Q9aBC1PaFMoUn teMg== X-Gm-Message-State: AOJu0YwxLw9mXcYR/dGUKFVAZ+brInV0MqmO7YNVldoVhRPSoHE+gwsF OO2EIismJfkaj0SfPGZpmyCGqjArFSihT21OCJwZUTw7l6DiWCZyhyk2IsYW1cIDX002gzQ1zFL aeqIyxKU= X-Gm-Gg: ASbGnctaCsgq7ZxxUmBnvtMYk6L9xUIwyb41uXvV1jp+itbaT/nSM22AimE3yp5C6Hm o4yN2/+BGgyspOx1eCzsNF8/UedKCcWuq0WEfFj0rWtgP3VCZ/6Ebjle7+uFT94GKcgJH1Ooq0A tLC8/XUSU74zm8+Kz0ItPYp6CKeVPkbzCdMk4q0awBA9n3M4UwDXwW+AIu/xlON2i94kiq9VOH8 Z+vTVLK2x9pwNqn7gSICQ2zknu0eTqxWz6tDFrsT5hNhZOD94VMXn664ju6NcCGffAjj6orOrOq bp/WFc/dAYXWgLry4qXDaZOceORz9yyn3eqAFCN+9jw6jTfEJ/OJTnY9tuWgMLPBmFlInQJfVIP 1IHLoft9QLkBHP/Z4qECksM+ARHTuE1n9fMGf9ngMrJc173iBb9k= X-Google-Smtp-Source: AGHT+IF9/t8/V2aMRUwKhAPvTmYxObLcnN5Hqr9xyZf4qUVQgSWRtus/L7hsU99L9XECJo8wU7Vulw== X-Received: by 2002:a05:6a00:1146:b0:781:4ec:4ec4 with SMTP id d2e1a72fcca58-79387a23c57mr17005819b3a.31.1760127562763; Fri, 10 Oct 2025 13:19:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 6/7] target/arm: Honor param.aie in get_phys_addr_lpae Date: Fri, 10 Oct 2025 13:19:16 -0700 Message-ID: <20251010201917.685716-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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: 1760127692409154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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:17:40 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=1760127695; cv=none; d=zohomail.com; s=zohoarc; b=KTsGvLSDFEVc+LFpixvu5pd8kDuPOiimF2S30ajDaEzvuoMVoZ8T7Q3cTlVFPJHNhyPNlv2GVcKzHOKSbT8haeiEfUf0CzuicM0DVijyHTKUN9nFyK2/Wn75vLhbW04mgsbrTCfMdFDHF1ddAtKr3UrKLwNg0AWqiBBQDIB+yq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760127695; 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=qpOqxN2RJLucJYrBCL4XiSbhJrK5bcbpor4bzH0LpBQ=; b=CxyoCFXvpnZmQ1Es8c34THHpNSnRP5fLse6XXgZUYr3Ga2bnk5hDmRtNexe5xyfX9ZaRhcRNqIpM2b/o53+rjaVIwAIZSKdBmvCrVKuK24rsJ5pZ/7IKNywt1pDoHgGql8TZ4ut2VYncNl9S8w2KyJsTylQlQUuWHG8l1oPCrTQ= 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 1760127695701479.44956621482515; Fri, 10 Oct 2025 13:21:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Jab-0000U2-5M; Fri, 10 Oct 2025 16:19: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 1v7JaO-0000RP-4j for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:33 -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 1v7JaJ-0002mw-KL for qemu-devel@nongnu.org; Fri, 10 Oct 2025 16:19:30 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7833765433cso3351471b3a.0 for ; Fri, 10 Oct 2025 13:19:25 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7992dd7ee5bsm3764830b3a.85.2025.10.10.13.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 13:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760127564; x=1760732364; 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=qpOqxN2RJLucJYrBCL4XiSbhJrK5bcbpor4bzH0LpBQ=; b=T8WyIIOYRJXkT2gDCNmBLMKKbzLBQS5ru2gYkoruCabWa41um6EjFNb0OjJ2J41YHb xaet3RQhL+LKneoHifX8TvFuVFaKqHH7YeMI4pAhG4v935TFqXFcM1N4Y+InY6z2H05Q s6KmRbzw2pDqEKQT7lNe21/+0zhoNaohgrExJU1MaJ6kej/cCTv4MX9Yjh3/IwkO6wmt 9oGSvmUAZaQviOKmMFtuU7L4ps3pD6RHErYwHIqYH9xSvfJTFDfqJGhsfSGe4+qMl1SA uwEtwvnEbPc3W2V2m5ULWP52yUbBJJDUu9bfRV0Zm++4O824J7Nv2QNsZvidJPafGg8k Fecw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760127564; x=1760732364; 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=qpOqxN2RJLucJYrBCL4XiSbhJrK5bcbpor4bzH0LpBQ=; b=G53ypoqq+trd8/8P+crtD4y8XUm173DEY4BfbbpbXikHDj+FOboGO/ONM5vLabszBA KuikM2YhiC2aRBAGTRthqSzNoNRswIk7pl8iOrbY5KPsnRIoYfYQxV3tc1vC4L3+0bxd Bwg1s2lACvjonvfVi+JY+0S3T+xJaZJ5/aEhyM0eJRspNfCm2pO69uW/4Z6rVdal60AU a5BNXftz7wGdmnRaNnMEte+FiCE9UtTqiu02Toa7D2Fhoe60exoDE9/i9p3D9I2G/7R4 OtiS45K5jY4Rf2AvnGNY/wX6N3IruEm4p7Rvup3+R7Prx2MjkysJ97p8W4RBKH32ZvPc w3fw== X-Gm-Message-State: AOJu0YylM3wiI5dSGX++2y3SL4g/WMYAEYhF5scS44mieF2unf/xvfD2 5+VsdCHD0L3KEfhMGVV0dp/WvYDBigXJqOFHpugWertIXTdtgRqixfdOhsCoTTtb/MEsraIaepI ojbleU9c= X-Gm-Gg: ASbGnct9TXSniVV28mvo/NUnvu6BjhvUq7M7QtS6AuUa7EObbFr3qbNB8pEhDLyEEsW VDP9S0kugULkxUchRcpgMvp8WDITH1k1+TIDP4CwXkGq82a8NZ/XMLGUeiN/glMZi5cAcFW+xbb JHbeEwKCBxFGdYSv8+V4uK9+grqaU0h8msypzocAjlgXJtIyTDubgT9gGAXn2aRyrhUI7PaDwLv KDmGK4VC5gbISZFvRsGPXh1TmO2Ap0dggCKJbAex+yCJx3GSj58LkiyxLbv1hMt6s3bEQQ/oGlS +f1czWv7iqp3RqavVTqsDtvIqTtDyaeeSVVN1njc+3OJsEamMXrPnfMTR66SP0jzqf199UHKAsm 9NhdUiy7h7w+ESMJ84vSYbRwuVHsnZ18sn+GKSrbqDx0ibY+8DEddcNu3Eux6cQ== X-Google-Smtp-Source: AGHT+IERgO1YZ3zhuCSh3EAsVBiDjqNgb+8RNcVYpvDRtvEUbDfCNofpBkwNYfbKDoigoxDkBbHMtA== X-Received: by 2002:a05:6a00:39aa:b0:793:11fc:783f with SMTP id d2e1a72fcca58-79387a21bd2mr16797144b3a.29.1760127563790; Fri, 10 Oct 2025 13:19:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 7/7] target/arm: Enable FEAT_AIE for -cpu max Date: Fri, 10 Oct 2025 13:19:17 -0700 Message-ID: <20251010201917.685716-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010201917.685716-1-richard.henderson@linaro.org> References: <20251010201917.685716-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=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: 1760127698593154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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