From nobody Fri Nov 14 20:45:22 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1762857140; cv=none; d=zohomail.com; s=zohoarc; b=UIPKDQyWzXfGTBzC/cb0MGut3aeQdnoFROZN59XHGbclt7K79jnUyMIiXvJdMKslqNFE9gbPdBI8jFekmdW+RviI7TGzOFpK4w5L0PRcM6crSBuKPlhv/HG+3EcBgg0f8rAd8YpRgfxjWwd8rKOYyFkb9G2KI+Yh58ggrHS97lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762857140; 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=gbDS/MaXiZ2BNL1f+1XPRv78qm4Be4BIPl13rBc/TDY=; b=mOKhOYc2xuPGZTMZFqXpPMGlRPi+NlBjB3R2HaO8uzgMZPr16DtkrPQEzYGnIwYuvu8W7O6LWZC/BpdWDdWvPAVYrf5p+BPX9wbl+X1Pu/RjqyRtFMy0GH2zQSAwT2ZAxK6GTwYxPORUVG2gvXirBRTTAEDn6kG/D/862MLV/Ho= 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 1762857140860663.27418440979; Tue, 11 Nov 2025 02:32:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vIlce-0008J9-IM; Tue, 11 Nov 2025 05:29:12 -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 1vIlcH-0007VT-II for qemu-devel@nongnu.org; Tue, 11 Nov 2025 05:28:49 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vIlcB-0000Fo-1Y for qemu-devel@nongnu.org; Tue, 11 Nov 2025 05:28:47 -0500 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b725ead5800so529205366b.1 for ; Tue, 11 Nov 2025 02:28:41 -0800 (PST) Received: from PC-DA2D10.beckhoff.com ([2001:9e8:dc12:ce00:ae91:a1ff:fe8b:15a7]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b72bdbd1ecfsm1290619366b.10.2025.11.11.02.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 02:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762856920; x=1763461720; 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=gbDS/MaXiZ2BNL1f+1XPRv78qm4Be4BIPl13rBc/TDY=; b=lzULEvrRvgWs4cyeqKYTjdqge4+RaTE9VDOwWyxyA+bc+g4l27IIZh/qYiZUY9qyN4 wdQrlNdfPmZHmtrYtQCgDYL+R/sX32aC3U8A4T7lve/XnVWzt7zSLGIWvh/PowlykAV5 8dPqtKqP08t4AY1B/7wxqKfmbOgLvNCS/qU4eueJ2EVFObbfcmPlMSIPSG0iXTKCerST +Lr+M1yEyK9XwAHbIp8881oFW0R/tKz+rub8RedfbI9vajxun9pVJxiLzjG7KpfFmzoC nY+fraDEJ6+I1MLyVRaN3b0hKUPZN2n5JoNzRfdyyt5f5UVogneu/21S8Xv2gQZb+X76 z53g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762856920; x=1763461720; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gbDS/MaXiZ2BNL1f+1XPRv78qm4Be4BIPl13rBc/TDY=; b=E0c1+qLqjQzkga3pkkiIWLHjCZo0+3lTV9KwITwXifTJLlU6jw8hmyLQaNEuy4tqV0 Kmu36bi61Rh+PE0KdV/TF532QyQETi3ZX7TjSEmsQO9y1zogsvdNZiDskDWI6isPk5Ht DkxfmDrCDSvWHyPeYmsqgsjpi2a5z/I3/brGmjmJbQBBMzPHLY15fMFkktBNO1L1pGha herrpTwqAxicd0YJn49B0ITVQBHxobZImtXq3C6xMUnmOEhfSDQwyqubjVwvsc5lEXMO NQRSHyd/hkueC5FumPBk60rlidkV+vejUa3WA0NOKVlBJ2/QLuHz9D4d+omcg/uXAoMz wHZg== X-Gm-Message-State: AOJu0Yzr+wAKvU27sLOqz3ppPeUUl7gzotc6gI8veNCQyWU/qaV1zpzP 3psrO84OIG8SP2cx0yaMGuWAB4lneGFuINlLnUPYDoTiie5DacAtpIAeFAzyrwdD X-Gm-Gg: ASbGncuxNFhOkLrX+muRv24iqhQr7igHM41PE0QqM1ZLP+xaeRM73FiRUN7h/0N2kTx lfUc5945iDsHtd0yr783wIlTEcm80GC5hUtklYKuqG+u0jz31PXo5h3gNkA3ARQQfIZNOObTgyK PUfvMn4e3179lm0lkZQJWzgl3o7v3AeGL2V9CS90YYHP9xWv2GtpjmIMei88OcqaI+CFUgnqem9 XU3qPSuzGSEJtdpbIOFUO3ZouQA3zRnt+Tuhi6YnVpeFWYQvYD5yybgUlyJR6eZi1OhQWOMCwsJ NMbbnbnoiS9/ifcxfzqdbFzOZ1CtNhelJMOdHx8dRZs/U5DDPFN1wAcPp7iW25frBzsQtSSFOM9 U6CmrkOyza84g0vDgo+Crrnc30xNEkfSnwXV4Z85ViYtMhkxuhSRuVxnVBng5HJejCTDYhqTiT6 MRaInhkVLKpmc52SH35YgILA== X-Google-Smtp-Source: AGHT+IE/8sIqFZhXoMtSuvQo+Vex/umHlW4YvtDgDDI0NrjH9wt2g0KRNSuyMLgHltdOvQSVfLLLOg== X-Received: by 2002:a17:907:7f26:b0:b40:da21:bf38 with SMTP id a640c23a62f3a-b72e041276dmr1183849666b.36.1762856919700; Tue, 11 Nov 2025 02:28:39 -0800 (PST) From: =?UTF-8?q?Corvin=20K=C3=B6hne?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Yannick=20Vo=C3=9Fen?= , qemu-block@nongnu.org, Paolo Bonzini , Hanna Reitz , Alistair Francis , qemu-arm@nongnu.org, =?UTF-8?q?Corvin=20K=C3=B6hne?= , Kevin Wolf , "Edgar E. Iglesias" , YannickV Subject: [PATCH v4 02/15] hw/timer: Make PERIPHCLK divider configurable Date: Tue, 11 Nov 2025 11:28:23 +0100 Message-ID: <20251111102836.212535-3-corvin.koehne@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251111102836.212535-1-corvin.koehne@gmail.com> References: <20251111102836.212535-1-corvin.koehne@gmail.com> 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=2a00:1450:4864:20::631; envelope-from=corvin.koehne@gmail.com; helo=mail-ej1-x631.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, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1762857142668153000 Content-Type: text/plain; charset="utf-8" From: YannickV The A9 global timer and ARM MP timer use PERIPHCLK as their clock source. The frequency of PERIPHCLK is derived by dividing the main clock (CLK) by a configurable divider (must be at least 2). Previously, the PERIPHCLK divider was not configurable, which could lead to unexspected behavior if the application exspected a different PERIPHCLK rate. The property periphclk-divider specifies by which value the main clock is divided to generate PERIPHCLK. This allows flexible configuration of the timer clocks to match application requirements. Information can be found in the Zynq 7000 Soc Technical Reference Manual under Timers. https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM Signed-off-by: YannickV Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/a9gtimer.c | 19 ++++++++++++++++++- hw/timer/arm_mptimer.c | 19 ++++++++++++++++++- include/hw/timer/a9gtimer.h | 1 + include/hw/timer/arm_mptimer.h | 2 ++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 090d14c683..31eb9422f7 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -27,6 +27,7 @@ #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/timer.h" #include "qemu/bitops.h" #include "qemu/log.h" @@ -62,9 +63,17 @@ static inline int a9_gtimer_get_current_cpu(A9GTimerStat= e *s) =20 static inline uint64_t a9_gtimer_get_conv(A9GTimerState *s) { + /* + * Referring to the ARM-Cortex-A9 MPCore TRM + * + * The a9 global timer relies on the PERIPHCLK as its clock source. + * The PERIPHCLK clock period must be configured as a multiple of the + * main clock CLK. The conversion from the qemu clock (1GHz) to a9 + * gtimer ticks can be calculated like this: + */ uint64_t prescale =3D extract32(s->control, R_CONTROL_PRESCALER_SHIFT, R_CONTROL_PRESCALER_LEN) + 1; - uint64_t scaled_prescaler =3D prescale * 10; + uint64_t scaled_prescaler =3D prescale * s->periphclk_divider; return muldiv64(scaled_prescaler, NANOSECONDS_PER_SECOND, s->freq_hz); } =20 @@ -312,6 +321,12 @@ static void a9_gtimer_realize(DeviceState *dev, Error = **errp) sysbus_init_mmio(sbd, &s->iomem); s->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, a9_gtimer_update_no_sync= , s); =20 + if (s->periphclk_divider < 2) { + error_setg(errp, "Invalid periphclk-divider (%lu), must be >=3D 2", + s->periphclk_divider); + return; + } + for (i =3D 0; i < s->num_cpu; i++) { A9GTimerPerCPU *gtb =3D &s->per_cpu[i]; =20 @@ -378,6 +393,8 @@ static const Property a9_gtimer_properties[] =3D { DEFINE_PROP_UINT64("clock-frequency", A9GTimerState, freq_hz, NANOSECONDS_PER_SECOND), DEFINE_PROP_UINT32("num-cpu", A9GTimerState, num_cpu, 0), + DEFINE_PROP_UINT64("periphclk-divider", A9GTimerState, + periphclk_divider, 10), }; =20 static void a9_gtimer_class_init(ObjectClass *klass, void *data) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index cae07090f9..a7434cf56a 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -27,6 +27,7 @@ #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/module.h" #include "hw/core/cpu.h" =20 @@ -61,8 +62,16 @@ static inline void timerblock_update_irq(TimerBlock *tb) /* Return conversion factor from mpcore timer ticks to qemu timer ticks. = */ static inline uint32_t timerblock_scale(TimerBlock *tb, uint32_t control) { + /* + * Referring to the ARM-Cortex-A9 MPCore TRM + * + * The arm mp timer relies on the PERIPHCLK as its clock source. + * The PERIPHCLK clock period must be configured as a multiple of the + * main clock CLK. The conversion from the qemu clock (1GHz) to arm mp + * timer ticks can be calculated like this: + */ uint64_t prescale =3D (((control >> 8) & 0xff) + 1); - uint64_t scaled_prescaler =3D prescale * 10; + uint64_t scaled_prescaler =3D prescale * tb->periphclk_divider; return muldiv64(scaled_prescaler, NANOSECONDS_PER_SECOND, tb->freq_hz); } =20 @@ -273,6 +282,12 @@ static void arm_mptimer_realize(DeviceState *dev, Erro= r **errp) for (i =3D 0; i < s->num_cpu; i++) { TimerBlock *tb =3D &s->timerblock[i]; tb->freq_hz =3D s->freq_hz; + if (s->periphclk_divider < 2) { + error_setg(errp, "Invalid periphclk-divider (%lu), must be >= =3D 2", + s->periphclk_divider); + return; + } + tb->periphclk_divider =3D s->periphclk_divider; tb->timer =3D ptimer_init(timerblock_tick, tb, PTIMER_POLICY); sysbus_init_irq(sbd, &tb->irq); memory_region_init_io(&tb->iomem, OBJECT(s), &timerblock_ops, tb, @@ -309,6 +324,8 @@ static const Property arm_mptimer_properties[] =3D { DEFINE_PROP_UINT64("clock-frequency", ARMMPTimerState, freq_hz, NANOSECONDS_PER_SECOND), DEFINE_PROP_UINT32("num-cpu", ARMMPTimerState, num_cpu, 0), + DEFINE_PROP_UINT64("periphclk-divider", ARMMPTimerState, + periphclk_divider, 10), }; =20 static void arm_mptimer_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/timer/a9gtimer.h b/include/hw/timer/a9gtimer.h index 3b63d14927..ff9baf1c77 100644 --- a/include/hw/timer/a9gtimer.h +++ b/include/hw/timer/a9gtimer.h @@ -77,6 +77,7 @@ struct A9GTimerState { MemoryRegion iomem; /* static props */ uint64_t freq_hz; + uint64_t periphclk_divider; uint32_t num_cpu; =20 QEMUTimer *timer; diff --git a/include/hw/timer/arm_mptimer.h b/include/hw/timer/arm_mptimer.h index da43a3d351..061934e4b5 100644 --- a/include/hw/timer/arm_mptimer.h +++ b/include/hw/timer/arm_mptimer.h @@ -32,6 +32,7 @@ typedef struct { uint32_t status; struct ptimer_state *timer; uint64_t freq_hz; + uint64_t periphclk_divider; qemu_irq irq; MemoryRegion iomem; } TimerBlock; @@ -45,6 +46,7 @@ struct ARMMPTimerState { /*< public >*/ =20 uint64_t freq_hz; + uint64_t periphclk_divider; uint32_t num_cpu; TimerBlock timerblock[ARM_MPTIMER_MAX_CPUS]; MemoryRegion iomem; --=20 2.47.3