From nobody Fri Nov 14 19:49:08 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=1762165185; cv=none; d=zohomail.com; s=zohoarc; b=UkNOl8DChpAD8d80OYx6Uuxweqnw+OIyIUAuvTa9YgVp5zV4+f74l9eGeNw+74EcKKnO08GP1rTTd8ggDNX8R7e07lVMb6zGxm4AacBtH3HzudmyLvIWGSEvYUdQEvDbBWQSDPYXwMYUP5aT+VXD+/0Mh2muqqJxdBcFEq/1U70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762165185; h=Content-Type: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=UvXFIS/LP/8nn2LaWPgW13nQ8RvlKKCfqWkyp2+R/Cs=; b=Og1T9wfciFao3VuTsuGhp/DW6jlijCrHH5hF+nQPf4POSzMwlN2CnsQtL/7jB/eNdcDpqd42gWIrq4laRuMQO6abUmcXDnNcaMJgbh49iGjvimY4t8XcvLHbVF60J0lMqflE4MTFSW7yVimeIuhY44vPbeh7MlQmqaMinTNWtGE= 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 1762165185559185.84462312403764; Mon, 3 Nov 2025 02:19:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vFreQ-0003nE-KH; Mon, 03 Nov 2025 05:19:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vFre2-0002tn-Kw for qemu-devel@nongnu.org; Mon, 03 Nov 2025 05:18:39 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450: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 1vFrdz-0003lo-Oc for qemu-devel@nongnu.org; Mon, 03 Nov 2025 05:18:38 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ee64bc6b90so3382842f8f.0 for ; Mon, 03 Nov 2025 02:18:34 -0800 (PST) Received: from localhost.localdomain (ip-185-104-138-122.ptr.icomera.net. [185.104.138.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4772fd280fbsm85650255e9.5.2025.11.03.02.18.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Nov 2025 02:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762165112; x=1762769912; 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=UvXFIS/LP/8nn2LaWPgW13nQ8RvlKKCfqWkyp2+R/Cs=; b=ADyeT/MkdtsAQqHfgtIP7XX2MU+pNlm/O2hULik6qXByTAdxOPWzcymzROH6il3xd7 BXU5pWH26nDQfQbrfQC4mCSrTrcOakSD2atuXCKBjRb/2SU2Y2wodwYhv/QaKc4iE58m fax1ij519ckI9Ux2yWORG05NJea9qPZc4IR4BTKxxQJa8Y1G4C+4E1Vn+HoSqhJMrPNM bWBVaRnyHPedS08fE2WBMWlLQ8tmYCzhSXsLtqXUaVNEWpkxl1f0xMPuRDI6FOdb+Bm/ BgqwT++dviNQyc3I44DlLtqxLp750EFLy1Rk+oc5BZ7XZIA3BJWSj1ISWFVK9YTMOy3G d4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762165112; x=1762769912; 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=UvXFIS/LP/8nn2LaWPgW13nQ8RvlKKCfqWkyp2+R/Cs=; b=xTCp7kKt4EsHqrsLMsWE5aF59y1G7SivKpAFTLm4Mjnml74PLNI7OvVWzzpd5O3mV8 PXj/OzXRwaainFnkTQmUc2UDu3N6rnttKG88QNRdUzI+5FNaNItQKShJzaOmEXcIhh3J zFufjVYfw+mDbYb2TEJhwQrAvz0wyCDiqQQvetkqb/HYl6JNpZTrByxT4vePFobIAAHK s3HT2taQQbSQ2woiEeKOpZLqAHpM74jwW7LxMLV+sx/oOYiEXsTMOdBDeSKre0WNAwPu hk+BriS448XOkPnNmxDnK+Ipc++RHJpEoGqolDsA2LoWY/lDYF334L/IQ6oPqX9s7sJh hCpw== X-Gm-Message-State: AOJu0Yw85Ub6P27Wiajw+pBa0nMqzcqKjzT2sKMRcAYBq2Ci7xa8xG3O pehJ2d6jT6jIAfu0f9W/Qa/xjwgktAQsYQyiSl9o97M3Cb8PybADlmbpLzoFtq3lBZNzZ4wS88h Dc3Mk9L7Bqdf2 X-Gm-Gg: ASbGncsElNEOj0R1ZN7A/sBkyqiAiXKoszeZ5xwkqnC9Nvs/vpuMLQFXF3S09NnKIfY HaM07eSiHpyS2TzQFSS0ubGQO2MzwagDcTG2q/stNdzN3JLPMX0PnF928caXYc+p2KOfUCB1jSz 9bwSQZmh0ydclct2/yzH+Lwaelqdf7cwa81rcqerzCOHZa4WcJFsCyZT1wO/3BYGi94OzqlOn1i 6bdJn8a2R+oLqXbWe8eDuw7xkVgQgYovdBREyWAoa3ho0Q5UF9vwxBxeZ7Ws7oQhMkx5q/JfHM/ XxSv6ulpBffUV9YWt4V6jMEzATHri2/mRXXI3xmBU4u2n6iwCN6/ya/IwbCLihA7N1lELfs9vYZ uRDtSOWf3Xi83i8jXyVxqyNMlIJbKdYlKXZyfsy3PBKRopElr0OI6T/kDa+4DRu2aNYJeC/kxPU N6a58Pced2I0GeVJZFsGNpjwr3CFOHL6zQL4bqeCGz8PyXxILFRxX8jP0LB47q6tYLnI23cA== X-Google-Smtp-Source: AGHT+IEZPmXb9AuZbO3edqPAeyC3GTTTsz0OrkAmCVLQWI7tHPkC2qbXn4ILunz1PRBvcZ1LcLlnbg== X-Received: by 2002:a05:6000:2f86:b0:428:1475:6a26 with SMTP id ffacd0b85a97d-429bd6b354amr10603949f8f.56.1762165112453; Mon, 03 Nov 2025 02:18:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Alexander Graf , Phil Dennis-Jordan , qemu-arm@nongnu.org, Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Akihiko Odaki , Peter Collingbourne , Cameron Esfahani , Mads Ynddal , Mohamed Mediouni Subject: [PATCH v4 18/23] target/arm/hvf: Really set Generic Timer counter frequency Date: Mon, 3 Nov 2025 11:10:27 +0100 Message-ID: <20251103101034.59039-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251103101034.59039-1-philmd@linaro.org> References: <20251103101034.59039-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-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=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: 1762165187571154100 Setting ARMCPU::gt_cntfrq_hz in hvf_arch_init_vcpu() is not correct because the timers have already be initialized with the default frequency. Set it earlier in the AccelOpsClass::cpu_target_realize() handler instead, and assert the value is correct when reaching hvf_arch_init_vcpu(). Fixes: a1477da3dde ("hvf: Add Apple Silicon support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 8208d345daa..e1113e3d6ca 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -897,6 +897,13 @@ cleanup: return ret; } =20 +static uint64_t get_cntfrq_el0(void) +{ + uint64_t freq_hz =3D 0; + asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(freq_hz)); + return freq_hz; +} + int hvf_arch_init_vcpu(CPUState *cpu) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); @@ -908,7 +915,9 @@ int hvf_arch_init_vcpu(CPUState *cpu) int i; =20 env->aarch64 =3D true; - asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(arm_cpu->gt_cntfrq_hz)); + + /* system count frequency sanity check */ + assert(arm_cpu->gt_cntfrq_hz =3D=3D get_cntfrq_el0()); =20 /* Allocate enough space for our sysreg sync */ arm_cpu->cpreg_indexes =3D g_renew(uint64_t, arm_cpu->cpreg_indexes, @@ -974,6 +983,15 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) { + ARMCPU *cpu =3D ARM_CPU(cs); + + /* + * We must set the counter frequency HVF will be using + * early, before arm_cpu_realizefn initializes the timers + * with it. + */ + cpu->gt_cntfrq_hz =3D get_cntfrq_el0(); + return true; } =20 --=20 2.51.0