From nobody Tue Feb 10 23:54:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517654411712255.73550653360599; Sat, 3 Feb 2018 02:40:11 -0800 (PST) Received: from localhost ([::1]:39515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehvEv-0003Rt-9r for importer@patchew.org; Sat, 03 Feb 2018 05:40:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehvCi-0001zz-Eb for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehvCg-0008TD-Fj for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:52 -0500 Received: from chuckie.co.uk ([82.165.15.123]:36256 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehvCg-0008So-4j for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:50 -0500 Received: from host86-175-243-217.range86-175.btcentralplus.com ([86.175.243.217] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ehvCq-0000hl-Ux; Sat, 03 Feb 2018 10:38:02 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, lvivier@redhat.com Date: Sat, 3 Feb 2018 10:37:24 +0000 Message-Id: <20180203103727.26457-8-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180203103727.26457-1-mark.cave-ayland@ilande.co.uk> References: <20180203103727.26457-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.175.243.217 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 07/10] cuda: set timer 1 frequency property to CUDA_TIMER_FREQ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that we have successfully decoupled the timebase frequency and the hard= ware timer frequency, set the timer 1 frequency property to CUDA_TIMER_FREQ and = alter get_next_irq_time() to use it rather than the hard-coded constant. In addition to this we must now switch the tb_diff calculation over to use = the timebase frequency now that the hardware clock frequency and the timebase frequency are different. Signed-off-by: Mark Cave-Ayland --- hw/misc/macio/cuda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 3336ed46b2..00e71fcd5e 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -158,8 +158,8 @@ static unsigned int get_counter(CUDAState *s, CUDATimer= *ti) uint64_t current_time =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); =20 /* Reverse of the tb calculation algorithm that Mac OS X uses on bootu= p. */ - tb_diff =3D get_tb(current_time, ti->tb_frequency) - ti->load_time; - d =3D (tb_diff * 0xBF401675E5DULL) / (ti->tb_frequency << 24); + tb_diff =3D get_tb(current_time, s->tb_frequency) - ti->load_time; + d =3D (tb_diff * 0xBF401675E5DULL) / (s->tb_frequency << 24); =20 if (ti->index =3D=3D 0) { /* the timer goes down from latch to -1 (period of latch + 2) */ @@ -191,7 +191,7 @@ static int64_t get_next_irq_time(CUDATimer *ti, int64_t= current_time) =20 /* current counter value */ d =3D muldiv64(current_time - ti->load_time, - CUDA_TIMER_FREQ, NANOSECONDS_PER_SECOND); + ti->frequency, NANOSECONDS_PER_SECOND); /* the timer goes down from latch to -1 (period of latch + 2) */ if (d <=3D (ti->counter_value + 1)) { counter =3D (ti->counter_value - d) & 0xffff; @@ -210,7 +210,7 @@ static int64_t get_next_irq_time(CUDATimer *ti, int64_t= current_time) } CUDA_DPRINTF("latch=3D%d counter=3D%" PRId64 " delta_next=3D%" PRId64 = "\n", ti->latch, d, next_time - d); - next_time =3D muldiv64(next_time, NANOSECONDS_PER_SECOND, CUDA_TIMER_F= REQ) + + next_time =3D muldiv64(next_time, NANOSECONDS_PER_SECOND, ti->frequenc= y) + ti->load_time; if (next_time <=3D current_time) { next_time =3D current_time + 1; @@ -879,7 +879,7 @@ static void cuda_realizefn(DeviceState *dev, Error **er= rp) struct tm tm; =20 s->timers[0].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer1, s= ); - s->timers[0].frequency =3D s->tb_frequency; + s->timers[0].frequency =3D CUDA_TIMER_FREQ; s->timers[1].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer2, s= ); s->timers[1].frequency =3D (SCALE_US * 6000) / 4700; =20 --=20 2.11.0