From nobody Sat Nov 15 11:10:00 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=1753279083; cv=none; d=zohomail.com; s=zohoarc; b=jSvu77+Iy31X6BV0PAfQ5AvJLNoOJwXJZS5mXzSBFYnycGffCI+4eWNJed8ptVTfI3/7iurgnJ5LGO6RrFrExgM7fRh92Tj4fGBEZKoYRFFmjivYA7jDJyK8Cg5N/pRndPIMB8FOjpiwXjTZXQFU1WmmkWackzkd8Rn+KEXCbA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753279083; 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=+HZCiXqJ6zZg/VWStToH24eJmWXqFdiiJ1PQISWWaS0=; b=T+8Nfc4MRS8QaGQpOyqMbUWRVVPwRWhQ71bcm0HOOvaAJA6ROm5HH/N/haMgeccN9FFG90tL9TDjwzNL4iCmJRVEw9TheCkil8IU6lNVIHMIy0iD8ZcFZTPruaf/Szc2dmezK3g9lguxYJ2RLkq2pi8C0SXeAk0WTlJz+eZSCUw= 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 1753279083340776.3117223533425; Wed, 23 Jul 2025 06:58:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ueZxq-0004pJ-O2; Wed, 23 Jul 2025 09:56:58 -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 1ueZtP-00030V-45 for qemu-devel@nongnu.org; Wed, 23 Jul 2025 09:52:23 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ueZtN-0002to-6k for qemu-devel@nongnu.org; Wed, 23 Jul 2025 09:52:22 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a528243636so4057915f8f.3 for ; Wed, 23 Jul 2025 06:52:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b61ca48719sm16582343f8f.47.2025.07.23.06.52.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 23 Jul 2025 06:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753278739; x=1753883539; 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=+HZCiXqJ6zZg/VWStToH24eJmWXqFdiiJ1PQISWWaS0=; b=f4ZzV5dg1vtfb9264gnO7OcbEY9NbXksEpi+eTqoOt7TEVV+4jCMQzZ/PLOWBsLyuJ bDWQkEbjUFKagvWay9lvnV6iIO3A3eu9ir1PCVGiBaonM7kjjWHY0TLKYqyACHAfk8/m N/M4UeSMJLTCjf015QFFrhTuYQulXGutw7xD+ZiRPZJB9a0/VBQl3k7iYwHPMV7O9vqO 51AIHwZxYUlEbh7fbcyp6qP7Ghnfz/ENtI184G0SPOEf9lg6Zy4vyXRcpCkHxAdu0Ffy mBP6BLbY38FBPGS5ZPkZAtsVCOz5KE/HXGq5GpU1bZyo3yaUOeE51V1nH/W29iuhiEo+ UDEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753278739; x=1753883539; 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=+HZCiXqJ6zZg/VWStToH24eJmWXqFdiiJ1PQISWWaS0=; b=eHWY6UNbSfHwz8i3TJk4gZYcXY97IMruoXDyniK4ilGtQs8niOr5cph94fVpNGsjLZ hdXOgbeMwIAQ9/ueetFqnzccbIQwVwEkjWiQoqE6Hlbk74MM4dAIzrHuqUSKr28kor81 ueNBLtJLmORBvK8H0m5AcwUkNsdXlggVwpc44ooosqsFoUTiWxEl8VBeC8O/DcgCId2L uEa7iagWp4QDQu8HMEtMbyeJ10XmL/FEHqBWgYsEK2ASoRuQGBGrr4nYUXL3IWqC6YcX BPHyqupxgeoVUgId0Ahmyyt+t23F6lh2TZ1VmFXrodLu+4UeFTh45K68mJNHAGZBkV5/ Z3nw== X-Gm-Message-State: AOJu0YxQCG3mSBYtVXw8k57W1Qf76iRcMBgZj/0DCNA7+x429PjebATp gYy+WqDDndMXaeym/gbfWMtOdCfnK5QSVP1Ky/E4nh8FAVhadhRlTIoCskGkdVYtbIsFxg058CA wd5io X-Gm-Gg: ASbGnctyNh7hjeU04ky8cuLctPL7IsF688/kZe2VKURndSJK4WdNBJrPEc2q1eHwfpp qfbatVWkyo7Olu6BBmO8dYWZ4usN6KTZu7BinAe0D14HNFnrgvP0bE31u3nBXrTC5CU/oDzNUub LYAjeUa80Q8Z5Q+G42lq/9A75FnCsnp+PumQAzmgQ0WOz59M25wDjwFuCCEiq95cxcCtNHytjBq v/iH3QuL0Rypw2I13sy26O/bF/y95BEJsuIm3RdmgYOxT+QLyAUlE6QCHsqD8hUiA4QuWVuUycu YlYcY//txAk9kXg4ShGbH6HMTmNhw95udeok0nee8djYSG8BCC7aZQiqUfYg5N4pbFFurUX5EzA 9HvSEPVdD8L8A/VdcpFzmTLm3oN+Z05a7A4wrVwVz3DsnTXBf0MWZ6oC0fBNiP3AVnVyXZuWP X-Google-Smtp-Source: AGHT+IHDwvvKSwdTtXPkM65Zb4e5VGlOb0fOueXxV3lHOJmaYtgt5pDH+n2dlWWjSnAG8Oh/0ZWrUA== X-Received: by 2002:a5d:5f89:0:b0:3a4:e841:b236 with SMTP id ffacd0b85a97d-3b768f1ab75mr2724398f8f.33.1753278738629; Wed, 23 Jul 2025 06:52:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Mohamed Mediouni , Phil Dennis-Jordan , Roman Bolshakov , Peter Maydell , Paolo Bonzini , Alexander Graf , Mads Ynddal , Cameron Esfahani , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v4 4/4] target/arm/hvf: Really set Generic Timer counter frequency Date: Wed, 23 Jul 2025 15:51:56 +0200 Message-ID: <20250723135156.85426-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250723135156.85426-1-philmd@linaro.org> References: <20250723135156.85426-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1753279085613116600 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 7de770da4f3..ea9e6b1c0c6 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1007,6 +1007,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); @@ -1018,7 +1025,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, @@ -1083,6 +1092,10 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) { + ARMCPU *cpu =3D ARM_CPU(cs); + + cpu->gt_cntfrq_hz =3D get_cntfrq_el0(); + return true; } =20 --=20 2.49.0