From nobody Tue Feb 10 12:42:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601656942; cv=none; d=zohomail.com; s=zohoarc; b=C86kpzUq4W1ZIL0E6KR5D5VvuTS8OuZ6W/HQLKoIdcuORyjLT0FID6EKsRlmmgO/JfHUQizeptuVEerPoIPAT2dvjIN9VxRNTtlAasO+1u1YYojR3+gEmC75NflZlXD1esbuAwWujzEzx9bfoO7Xp9xiuZgZvZ2ETnJsLHIFbs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601656942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kqAvM0Pu10/HybQXi4LUrcWWzLXPnfvBTRL2IryhEpk=; b=aTWypYMXbzYNaEQwXscdMudxYNIx+QBB2BaLu7X9LMIrEqoXUaZPC5w9WWWvrD8/J/A1Fz7hY/HNrTSMPZHaV76mHgJ5plKL/n303tnSbsP6S344mTyRx672IXCSrc9vGMUYOJaUO7+0D+yuTPIQ1aT1URyLE9knUu6uKxVBMUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1601656942067263.53625849676246; Fri, 2 Oct 2020 09:42:22 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id q9so2298878wmj.2 for ; Fri, 02 Oct 2020 09:42:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id t17sm2378673wrx.82.2020.10.02.09.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 09:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kqAvM0Pu10/HybQXi4LUrcWWzLXPnfvBTRL2IryhEpk=; b=JmpUvUF7IZ22bKv1nFca5fYWjZBmknzrDmb/qFfqqgPIC015Qfi+N+thBX73bpf0qA LYjrhHBg12vtiTfF79NIBbsatlUwUNhJsfg3046oRNEpYjkZS0D+XVay9XFb+H25ZMah BhY6Zb/kW3akyNfStalnQSstKXCtgD7AkxOTCrBOtQ2Ul9vjwVK0XQZum7rt+hUuQ0bD Jb0l5R8GxJTu1hYkHlSKswy2RjdeqP5etX4YumRe6q6sRHYlTQ+wmeUkwEL6DXl1Wvqw ETBauO14eFzdKhCXul1ZTovEAlKHGPhP3PZXzqMltL/zQ+S4yOtdzTiALcJzPUM8a0WX Bkmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kqAvM0Pu10/HybQXi4LUrcWWzLXPnfvBTRL2IryhEpk=; b=S6ArjnEE42nqhUCU3LAoD3U/Fr3FVKeSt/OsncSTkLYVFBllmLFJIftclfacvD2rKm fqPO2ZIOJcpP2YruHnir8fV1tNoUcytCZQ7IrTwSh7ws5MVS4bj+zTG+kNfAWbaY25hk appjRdc2GJaa0jdq3rdsmL5bxds3JJ31ABrrVyVLd/ae5CODWnQ7aOSw8Sy0pOfCMUIP fTTQsdM730XgHK7YxnqGi1kPLpIjNRboOaEX2+OWRmAgWHWNA8DzsociSYKTxmekk4P3 FTOJfMK0YrJiakKDO94TEokyEvcDouY5b7kLd1Sp02zjQOC4QkaQTV+688zuyz6D8/HR F28w== X-Gm-Message-State: AOAM5321WqpQv2UGquEhNv5JN3iPIT8dICPfgfDJvNhqYIKYPsoDBDiX 9aBdOUQ9Ro9VtIiz+QGMO+I= X-Google-Smtp-Source: ABdhPJz25WhV0ae6BAUgMAsZn/yo+ba25QYSO0/Mspg9ZooDjZr4rIInHeUblQ3d3+mbH3B/aUwv9g== X-Received: by 2002:a1c:ed05:: with SMTP id l5mr3859583wmh.106.1601656940043; Fri, 02 Oct 2020 09:42:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paul Zimmerman , Andrew Baumann , Luc Michel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Niek Linnenbank , Luc Michel Subject: [PATCH v3 1/4] hw/timer/bcm2835: Introduce BCM2835_SYSTIMER_COUNT definition Date: Fri, 2 Oct 2020 18:42:13 +0200 Message-Id: <20201002164216.1741110-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002164216.1741110-1-f4bug@amsat.org> References: <20201002164216.1741110-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Use the BCM2835_SYSTIMER_COUNT definition instead of the magic '4' value. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/timer/bcm2835_systmr.h | 4 +++- hw/timer/bcm2835_systmr.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index 7ce8f6ef4d..43df7ee488 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -16,6 +16,8 @@ #define TYPE_BCM2835_SYSTIMER "bcm2835-sys-timer" OBJECT_DECLARE_SIMPLE_TYPE(BCM2835SystemTimerState, BCM2835_SYSTIMER) =20 +#define BCM2835_SYSTIMER_COUNT 4 + struct BCM2835SystemTimerState { /*< private >*/ SysBusDevice parent_obj; @@ -26,7 +28,7 @@ struct BCM2835SystemTimerState { =20 struct { uint32_t status; - uint32_t compare[4]; + uint32_t compare[BCM2835_SYSTIMER_COUNT]; } reg; }; =20 diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index 3387a6214a..ff8c553661 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -134,7 +134,8 @@ static const VMStateDescription bcm2835_systmr_vmstate = =3D { .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(reg.status, BCM2835SystemTimerState), - VMSTATE_UINT32_ARRAY(reg.compare, BCM2835SystemTimerState, 4), + VMSTATE_UINT32_ARRAY(reg.compare, BCM2835SystemTimerState, + BCM2835_SYSTIMER_COUNT), VMSTATE_END_OF_LIST() } }; --=20 2.26.2