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 lists1p.gnu.org (lists1p.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 04C77C61DD6 for ; Wed, 2 Sep 2026 12:28:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1k4X-0006Qf-PR; Wed, 02 Sep 2026 08:28:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1k4U-0006Pw-RK for qemu-devel@nongnu.org; Wed, 02 Sep 2026 08:28:07 -0400 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 1x1k4T-0004rn-E8 for qemu-devel@nongnu.org; Wed, 02 Sep 2026 08:28:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788352084; 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=eKBO/P4CFlsgKJYOZav0we9gGt0rFWpDphExZfU1mpI=; b=W458FbovMKca+14gh79dgwDVCvjcRha/CG6vBxjqMnInoW//n1H2/dpiLNZoteHq8knb3P vRcFJjFOe+r5FykRSySDzh0qoG1vWw/k8dj0/TrtOYHhmdM/c8+39Z6Jr3XNtxV8tHL2xY Op0Q2mW7boxGKitvLbTypeKfYk8gtYs= Received: from mx-prod-mc-05.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-8-mr979pD7ObGW_5F9j6YNtw-1; Wed, 02 Sept 2026 08:26:55 -0400 X-MC-Unique: mr979pD7ObGW_5F9j6YNtw-1 X-Mimecast-MFC-AGG-ID: mr979pD7ObGW_5F9j6YNtw_1788352014 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 85A8819344F7; Wed, 2 Sep 2026 12:26:54 +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 5F9CA3000223; Wed, 2 Sep 2026 12:26:53 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, leif.lindholm@oss.qualcomm.com, eauger@redhat.com Subject: [PATCH 2/6] arm: gwdt: consolidate clear WS0 and WS1 on explicit refresh Date: Wed, 2 Sep 2026 14:26:42 +0200 Message-ID: <20260902122646.2848464-3-imammedo@redhat.com> In-Reply-To: <20260902122646.2848464-1-imammedo@redhat.com> References: <20260902122646.2848464-1-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Current impl had logic scattered all over the place and WCS was implicitly cleared on WCS write. Consolidate clear action in one place under EXPLICIT_REFRESH condition. Signed-off-by: Igor Mammedov --- hw/watchdog/sbsa_gwdt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index 7cc5609b83..2aa44573a7 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -105,6 +105,10 @@ static void sbsa_gwdt_update_timer(SBSA_GWDTState *s, WdtRefreshType rtype) timer_del(s->timer); + if (rtype == EXPLICIT_REFRESH) { + s->wcs &= ~(SBSA_GWDT_WCS_WS0 | SBSA_GWDT_WCS_WS1); + } + if (!(s->wcs & SBSA_GWDT_WCS_EN)) { return; } @@ -134,8 +138,6 @@ static void sbsa_gwdt_rwrite(void *opaque, hwaddr offset, uint64_t data, trace_sbsa_gwdt_refresh_write(offset, data); if (offset == SBSA_GWDT_WRR) { - s->wcs &= ~(SBSA_GWDT_WCS_WS0 | SBSA_GWDT_WCS_WS1); - sbsa_gwdt_update_timer(s, EXPLICIT_REFRESH); } else { qemu_log_mask(LOG_GUEST_ERROR, "bad address in refresh frame write :" @@ -157,14 +159,12 @@ static void sbsa_gwdt_write(void *opaque, hwaddr offset, uint64_t data, case SBSA_GWDT_WOR: s->worl = data; - s->wcs &= ~(SBSA_GWDT_WCS_WS0 | SBSA_GWDT_WCS_WS1); qemu_set_irq(s->irq, 0); sbsa_gwdt_update_timer(s, EXPLICIT_REFRESH); break; case SBSA_GWDT_WORU: s->woru = data & SBSA_GWDT_WOR_MASK; - s->wcs &= ~(SBSA_GWDT_WCS_WS0 | SBSA_GWDT_WCS_WS1); qemu_set_irq(s->irq, 0); sbsa_gwdt_update_timer(s, EXPLICIT_REFRESH); break; -- 2.52.0