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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8D84DEC047E for ; Tue, 3 Mar 2026 09:27:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxM1j-0004wK-RE; Tue, 03 Mar 2026 04:26:51 -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 1vxM1i-0004vA-B4 for qemu-arm@nongnu.org; Tue, 03 Mar 2026 04:26:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxM1d-0004YP-3y for qemu-arm@nongnu.org; Tue, 03 Mar 2026 04:26:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772530004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=he/XKQVhHHZiAjZueN+uimRzEwb7exyo+Go1JwWJzNI=; b=M/ZHbykoal+8I6JF+ddSveNfjhrpSjFSmdV4jUoXKNn36i0suvCmjNdzNkljddcjGuMCOr XyEAEPWmyiOXK8IXJMxuCvE1vfUiStPLGB2/DB+uFDsvN02SS50PwweC7SxdbiSwmuKpCz rTvnedhThKPx2qZ3RB7LDeH+pP7wXk8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-355-OSD0qgpfNLewyIxuUPGRmg-1; Tue, 03 Mar 2026 04:26:41 -0500 X-MC-Unique: OSD0qgpfNLewyIxuUPGRmg-1 X-Mimecast-MFC-AGG-ID: OSD0qgpfNLewyIxuUPGRmg_1772529999 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2F481956071; Tue, 3 Mar 2026 09:26:39 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq2.redhat.com (dell-r430-03.lab.eng.brq2.redhat.com [10.37.153.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5016F30001B9; Tue, 3 Mar 2026 09:26:36 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Cc: mst@redhat.com, anisinha@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, shannon.zhaosl@gmail.com, philmd@linaro.org, zhao1.liu@intel.com, rad@semihalf.com, leif.lindholm@oss.qualcomm.com, qemu-arm@nongnu.org Subject: [PATCH v2 19/21] sbsa_gwdt: move all foo_REFRESH logic under REFRESH condition Date: Tue, 3 Mar 2026 10:25:30 +0100 Message-ID: <20260303092532.2410177-20-imammedo@redhat.com> In-Reply-To: <20260303092532.2410177-1-imammedo@redhat.com> References: <20260303092532.2410177-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: BgsMGUHHtPaFyE9lJQatWqHJBE5dUpF5MmixSWH2NRU_1772529999 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.968, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.495, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org and while at it, simplify timeout calculations Signed-off-by: Igor Mammedov --- hw/watchdog/sbsa_gwdt.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index 91f9a4202c..c2d6f672f9 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -109,22 +109,20 @@ static void sbsa_gwdt_update_timer(SBSA_GWDTState *s, WdtRefreshType rtype) return; } - /* - * Extract the upper 16 bits from woru & 32 bits from worl - * registers to construct the 48 bit offset value - */ - timeout = s->woru; - timeout <<= 32; - timeout |= s->worl; - timeout = muldiv64(timeout, NANOSECONDS_PER_SECOND, s->freq); - timeout += qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - if ((rtype == EXPLICIT_REFRESH) || ((rtype == TIMEOUT_REFRESH) && (!(s->wcs & SBSA_GWDT_WCS_WS0)))) { - /* store the current timeout value into compare registers */ + uint64_t offset = (uint64_t)s->woru << 32 | s->worl; + timeout = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + muldiv64(offset, NANOSECONDS_PER_SECOND, s->freq); + + /* store (now + offset)ns in WCV */ s->wcvu = timeout >> 32; s->wcvl = timeout; + } else { + g_assert_not_reached(); } + + timeout = (uint64_t)s->wcvu << 32 | s->wcvl; timer_mod(s->timer, timeout); } -- 2.47.3