From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41752C433DB for ; Wed, 10 Mar 2021 08:48:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7546064FD6 for ; Wed, 10 Mar 2021 08:48:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7546064FD6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuVw-0007UU-FO for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 03:48:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJuV0-0006Zp-UF for qemu-devel@nongnu.org; Wed, 10 Mar 2021 03:47:24 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:35393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJuUz-0007BT-EQ for qemu-devel@nongnu.org; Wed, 10 Mar 2021 03:47:22 -0500 Received: from [192.168.100.1] ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue012 [213.165.67.103]) with ESMTPSA (Nemesis) id 1MSqbe-1lAfO51kVy-00UKtB; Wed, 10 Mar 2021 09:47:19 +0100 Subject: Re: [PATCH 6/7] mac_via: fix 60Hz VIA1 timer interval To: Mark Cave-Ayland , qemu-devel@nongnu.org References: <20210310080908.11861-1-mark.cave-ayland@ilande.co.uk> <20210310080908.11861-7-mark.cave-ayland@ilande.co.uk> From: Laurent Vivier Message-ID: <5d6ba4c7-0ad8-1987-890a-2faea335827c@vivier.eu> Date: Wed, 10 Mar 2021 09:47:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210310080908.11861-7-mark.cave-ayland@ilande.co.uk> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:Ui5KyukR4w5lSPgcA8o1jowOH5kpR5bCeCYLBkMUk9VgVec6pKc IlSxAs0Q8YO5OycqjsgveUGPVaJQU5ffuL3N5X+N6Ce90ZQrhQ17YlK//pM7g8fUUpQB4c6 9Xs82pjfZrq2xo+EnzErQQM9vDBVvVXf8YRmj75bgB4WYv/OYLkCHGWncWZEkwQ70hcqgBE W+h7Ox0SLHfat08k6V2AQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:ESYoYX39Isw=:YGTheJCq5Vya5VWimT50cQ 6waau1Pct+oXkNdhv2yRaAZaghoi6JatgXmXUW5M46A4i5w0HGiuEvFPiHaNDDEeC4XPnRDa0 SkPnLuua8r8LpO/msCSLnytNBSWoSoIBBrVFVGf3oqH8XA8ALQTbtC4CoJuU/IV5t0M7DKECA MuEUll2+i8qCVavrU56oSJFb3I6HKuJQIsBnzVpfDcs97JG2OZQCzvJYd+bNPsU8XZSO8SxtM z99SMNDtx6L/QBn0vE81ZXVa5pID6KPxAUK+OhWYSCNFtk2iiL1FPUt8NosPIrDsjSPgzBldo hT7LP18UZdPqzZaR2Ax7smKtO09i3XqM4pA+NRnb/hgBtV1hr6LzFZuXlR1/aHRBrxVF7GLfI rBr+BOzZXxvVrEUKbVrDY5s/9QY58PXVrY81YAHX9C4V/rswh3RJD/kQyb4Ea Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 10/03/2021 à 09:09, Mark Cave-Ayland a écrit : > The 60Hz timer is initialised using timer_new_ns() meaning that the timer > interval should be measured in ns, and therefore its period is a thousand > times too short. > > Signed-off-by: Mark Cave-Ayland > --- > hw/misc/mac_via.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c > index f994fefa7c..c6e1552a59 100644 > --- a/hw/misc/mac_via.c > +++ b/hw/misc/mac_via.c > @@ -302,8 +302,8 @@ static void via1_sixty_hz_update(MOS6522Q800VIA1State *v1s) > MOS6522State *s = MOS6522(v1s); > > /* 60 Hz irq */ > - v1s->next_sixty_hz = (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 16630) / > - 16630 * 16630; > + v1s->next_sixty_hz = (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 16630000) / > + 16630000 * 16630000; > > if (s->ier & VIA1_IRQ_60HZ) { > timer_mod(v1s->sixty_hz_timer, v1s->next_sixty_hz); > Reviewed-by: Laurent Vivier