From nobody Tue Feb 10 09:01:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1615930065; cv=none; d=zohomail.com; s=zohoarc; b=Z1XUvcHE7tDa2N9vZPIkoPf+D7yuHtjYpWwL9KybdeqzaCAHiQZ/bzNY15ihnv1NryxHBNrbyP1xfZynbh70IqCXbC2xG0FP6oUfRE+8pktCdzEj4WBDaWYwI789Efr+Yvfhr8qtQ5bmWFs8mUD5dZGE/w+aB1aprr00ZlvETuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615930065; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4maG2x3cAOZMPToJ9MDk1+IaLlKU+ks04lY01+K/9jA=; b=N2HlToY7oU3QTQkNFRJC667eIDVm+rNI/k+Bw9VPmpld48Op97tZPyjbFb2S0cpEIBIQ66bBlaOG9CSrZKGD6rOVyxyMQjV4XqQpRxcPCYxTwWZ+rbrJC6rkP4MS6BnE9PMFHn1lOICvf0UqHLKK8C+t/LDVf6YNLF2pZlGJq/Y= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615930065735945.8782466121771; Tue, 16 Mar 2021 14:27:45 -0700 (PDT) Received: from localhost ([::1]:45576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMHE8-0004Rc-FL for importer@patchew.org; Tue, 16 Mar 2021 17:27:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMH3W-0006ko-66 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 17:16:46 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMH3U-0003yy-87 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 17:16:45 -0400 Received: from localhost.localdomain ([82.142.20.38]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MrQMz-1m1NHy2Jxn-00oakO; Tue, 16 Mar 2021 22:16:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/7] mac_via: fix 60Hz VIA1 timer interval Date: Tue, 16 Mar 2021 22:16:30 +0100 Message-Id: <20210316211631.107417-7-laurent@vivier.eu> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316211631.107417-1-laurent@vivier.eu> References: <20210316211631.107417-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:HbgICZv4D4bZYNo8jh+W+S1quxJqTIpWeJOrIqOpy0cfr97a6iB 5nuWinov0fEo7uVWqSSe3Nwb1SfpORMzLqyIw9fVufK1uQGvHZr8b5292x8jRvtZxvmwPeh FLMdzu3Pj5TTymN1QWw6F2Rr71KtQ70JZCsgd6gSgqd0+7MgIlv5b4p0SUqrO7aSefleZTf FpcPQpqjPCjbFd+xGyHKA== X-UI-Out-Filterresults: notjunk:1;V03:K0:uEgqoFJwNXI=:OZewy82OK+oMF4izKo1Nqo 4jPEjdDMlp6SsgHZvf3h0Lw/eht/dsW7eCEGod+COR9caK1tPWyh11faHWjWt9xUe4FwYmyr7 STFmbLnJjLlCzkABvdUkJgMXQyfKqHBFUbvFAe3k1o0fUiNXJrAsh/UVYYBl712k+xJrg+hOd +xmxDHt+u62KSnlZTxxd6I5sw8mUHmjxo0s2IA7PlSz8ehSK4TdwMP2pCTvX+L40G9XTjZ3Za fDbQE7RFUaoPMZrVqmcVUU90+bmPulCDUYSZXL+9QV3Mif/IaS6f77bZtrlFHNRZq6gw1ql73 1bFj9yCUMjDSnr3mdCfnoygU8hxkuZL0GMtQfylAjeDJi2ba+AJlDZ/QVOImuJT56W19dIiOF 9x7wtmel/T9IrqeEvhG8AiK2BAOG3xfmIpY0rOkf5PBymAJTmfNi+0QXhHwnZmihKk7XYKvoB 3luoS/fkrg== 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: none client-ip=212.227.17.13; 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, 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: , Cc: Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland 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. Use a define for the 60Hz timer period taking the more precise value as documented in the Guide To The Macintosh Family Hardware. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: BALATON Zoltan Message-Id: <20210311100505.22596-7-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- hw/misc/mac_via.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 9617e04f02ef..36e70674feda 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -279,6 +279,12 @@ #define VIA_TIMER_FREQ (783360) #define VIA_ADB_POLL_FREQ 50 /* XXX: not real */ =20 +/* + * Guide to the Macintosh Family Hardware ch. 12 "Displays" p. 401 gives t= he + * precise 60Hz interrupt frequency as ~60.15Hz with a period of 16625.8 us + */ +#define VIA_60HZ_TIMER_PERIOD_NS 16625800 + /* VIA returns time offset from Jan 1, 1904, not 1970 */ #define RTC_OFFSET 2082844800 =20 @@ -302,8 +308,9 @@ static void via1_sixty_hz_update(MOS6522Q800VIA1State *= v1s) MOS6522State *s =3D MOS6522(v1s); =20 /* 60 Hz irq */ - v1s->next_sixty_hz =3D (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 16630)= / - 16630 * 16630; + v1s->next_sixty_hz =3D (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + VIA_60HZ_TIMER_PERIOD_NS) / + VIA_60HZ_TIMER_PERIOD_NS * VIA_60HZ_TIMER_PERIOD= _NS; =20 if (s->ier & VIA1_IRQ_60HZ) { timer_mod(v1s->sixty_hz_timer, v1s->next_sixty_hz); --=20 2.30.2