From nobody Fri Aug 21 21:27:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1787313714; cv=none; d=zohomail.com; s=zohoarc; b=mSVywwiXANOCJlkXNY2bohhABGW7QffKVoe5RxXb2oTt7Ch4H+ouWOmXP5DgOm7pmdtMADM/pIsCjtR7YYVwG31Wp4ct0OmLyGkBTeo7AspZpAgjhjPeR13in7acRGQm32WZYf7YtATGoo9f+USVgIkqyOLvQuV42VNtRPHAubI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787313714; h=Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=iDp4JFzF0yKxoajjfXO1PCWxHO5x9h0WjZDpv8t289M=; b=R/Y1AcUbKgGG0WbipMadN3omJwyoVTOF/3W2QHz3Kzk3U5xUiIRYbZYmVMi01faoRz6QI2w7oWsmzxbw7wER4YTK3EOYiUJSiRWnmQRK4mYVzxMV7oQmACfXey9W8iuGlLlH8Cij2G9SXIBTP8lHvxMY4vGWoZ1ck6lxHQAI/hs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787313714442170.45184805976953; Fri, 21 Aug 2026 05:01:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxNvi-0004Qe-24; Fri, 21 Aug 2026 08:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxNvT-0004M9-69 for qemu-devel@nongnu.org; Fri, 21 Aug 2026 08:00:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wxNvQ-000548-0b for qemu-devel@nongnu.org; Fri, 21 Aug 2026 08:00:45 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-496bb7cdf51so8734105e9.2 for ; Fri, 21 Aug 2026 05:00:42 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499b911724bsm24219315e9.15.2026.08.21.05.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 05:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1787313640; x=1787918440; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=iDp4JFzF0yKxoajjfXO1PCWxHO5x9h0WjZDpv8t289M=; b=oTIGy83SY4RmUn6iXZxTdaZRiFgGaCuOFG9cq4XNGh/pVKMJqGSSRrPDQPsd9MUBcv i0tRPH1Spocg9gq8yL7vLF8zPqRCVu6h79hnh25+xySNMrH4mt7o5CCm4HuQFCB5nWkS uUrzh13nT2OHaoQDIWoiuV7Qth6VfRp36kk3N73w/lnEDEjePwYw0GSxNUeFKiWANo8z zbVpB9PFEAfZIIwMAEcLAGRXZEt/DwiHWzHifs7+FpWyf+WzjxhFTA1uhTwI2Bo7Cu0V cEfChfIENX/nEcT3S/HYpUlEHaxfUeHq/I09Nhe/rIKWZcNhK/Er3o4sfbcW41qiaJSp UPIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787313640; x=1787918440; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to:content-type; bh=iDp4JFzF0yKxoajjfXO1PCWxHO5x9h0WjZDpv8t289M=; b=oktBHs5GjRGmE3cG5PHhXnqGdFqF2ovfKzOjpINgYbtg2zAKo/0F6YMQ+ISPvAceYO TAzdT2bgzs4I+jL6zNtevVkJNx0y/ywT63culzk8ss0wN3PIu0wJQiSCzaUtaKJQ88gv Q3TYKDjD9d+RTbZKWJmvDP2GOczs70P8xONdSl5sODfZ5AQz4c3OGOdISKIL3qXbaBQk f4c/siSCWQCL+onQofHI+aVGDyTE/UDP6imDu+mmMSqK6j7zMeCO0T+yWT8wC8HFa6pK mzq3JWJg4QziVh6OKotjTxK6MGZk39rCa78yZDY7guaRcLoDM8n4nsf5X27CHJJXD0Qx /m4A== X-Forwarded-Encrypted: i=1; AHgh+RpsPySKx1LkYFYeKDZ/zXy23IDexaJ0d6lXC9jgkIWnbaqX5/rHBTTXGm6ch969l/2KU0/UyxQehQvL@nongnu.org X-Gm-Message-State: AOJu0YwlXXOvMxjuJTxY5NAqg2LBVO7XJ9NcsgAKZjNqzItt3Vsprb/2 3GdAWxUHzFjMxcBSzCx+tc8wREpSL8h7qOIsJvxlEKizlvYYr3LVUebIYl1OiNjVOexa6W/wJ5q T0Os0 X-Gm-Gg: AR+sD138N/cbjtKU67BPGO0jFfZ06AhdhnN5bppxi7kC5yn1b7h1H4/4f/cPhzapyhf FCfI4up/C+fRPAInwk2dDwtp2wgcxi+/rnNeFkNBMAxPYkykDv50m3NGJcFMjPu30p1JOks2LQQ pUSiTEcUoFYEl8EArnxO568uW9+eisS9xhB3s5KbNiASegNGkt4MB6Xfw5XvSXLTw58WoQ8wEqb xaHpqAjYiTHzxzQ+AFfhWDoR0p7h9hcSOhrsITYZfklqBOCL7X4xLgMC+hMwXKFMOkoJ5yUfXqw T+OVUYmvTFFRXwK5SqcXJlVLDMhzkB5UAZXN13SideIUYahvZWgh16H0n+58Q18iLRYJs2uOm7Z Vv5zgCyUenQ0Ni27Gk9RHuVqPJdFnV2OL/fkBJ6PgH6hW9y4+GIjtP/Law1WCzUraxBmV0npeIO l/H6kZ3HaDXgQqwB4i8TGixEp0dr77v99KMioFNUOAD4+q9fbTJEVAjiIcnJAFf+ImfPd8lF+LY PxFWqEzUpx6rJvzQyJ7z+QAdcKIbKPWJdrIfu/euOaKZzB4fsSUXeQ18qnL19WbWvkrow== X-Received: by 2002:a05:600c:4f54:b0:496:bbce:fc with SMTP id 5b1f17b1804b1-499b8354a65mr69967595e9.12.1787313639925; Fri, 21 Aug 2026 05:00:39 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH] target/arm: Don't provide TLBTR for pre-v6 CPUs Date: Fri, 21 Aug 2026 13:00:36 +0100 Message-ID: <20260821120036.4161792-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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: qemu development 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: 1787313717793158500 Content-Type: text/plain; charset="utf-8" The TLBTR register (encoding cp15, 0, c0, c0, 3) is listed in the v7A Arm ARM appendix O as being present in v4 and v5 (section O.7.1, diagram "Organization of CP15 registers in an ARMv4 or ARMv5 VMSA implementation"). However, it isn't listed in the v5 Arm ARM, and checking individual TRMs for the arm926, arm1026, sa1100, sa1110 and ti925 shows that none of them implement it, so it seems much more likely that TLBTR was new for v6. It's also confirmed not to be present on a real arm926. Gate the register on ARM_FEATURE_V6 being present; this means that on pre-v6 cores the encoding will fall back to reporting the MIDR (due to the CP_ANY wildcarding), matching the hardware behaviour. We can also remove the "make id_tlbtr_reginfo r/w for strongarm and omap" code, because those CPUs are pre-v6 so won't be using that reginfo struct now. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4207 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index af45234ad2a..db7a0c55380 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7290,7 +7290,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) id_cp_reginfo[i].access =3D PL1_RW; } id_mpuir_reginfo.access =3D PL1_RW; - id_tlbtr_reginfo.access =3D PL1_RW; } if (arm_feature(env, ARM_FEATURE_V8)) { define_arm_cp_regs(cpu, id_v8_midr_cp_reginfo); @@ -7301,7 +7300,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, id_pre_v8_midr_cp_reginfo); } define_arm_cp_regs(cpu, id_cp_reginfo); - if (!arm_feature(env, ARM_FEATURE_PMSA)) { + if (arm_feature(env, ARM_FEATURE_V6) && + !arm_feature(env, ARM_FEATURE_PMSA)) { define_one_arm_cp_reg(cpu, &id_tlbtr_reginfo); } else if (arm_feature(env, ARM_FEATURE_PMSA) && arm_feature(env, ARM_FEATURE_V8)) { --=20 2.43.0