From patchwork Sat Oct 10 20:37:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303188 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 E365AC43457 for ; Sat, 10 Oct 2020 20:39:05 +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 6BB5B207C4 for ; Sat, 10 Oct 2020 20:39:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AQPjHzCQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BB5B207C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRLdw-0003Qf-If for qemu-devel@archiver.kernel.org; Sat, 10 Oct 2020 16:39:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRLcD-0001yQ-R7; Sat, 10 Oct 2020 16:37:19 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRLcC-0006cg-C9; Sat, 10 Oct 2020 16:37:17 -0400 Received: by mail-wr1-x443.google.com with SMTP id n6so13848123wrm.13; Sat, 10 Oct 2020 13:37:14 -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=HRSGmrYnnb9+rYcfBphplSLFyvNnU1n2aTvVy4tkoQk=; b=AQPjHzCQ9eYQLNhcqsEpJp6x5aySMkiGwDEvehmpJnB419NuoXmOpNsHPHDiqavGZK rQze6IB4wNaa5T+hvXVQLhhxCXha75N738nulRJ68NuWzwdoTRo1ysPYBXZgI+pBMw6O l1NPVJ4+V7jVtrcvVbsmmXkYzFNvbNoubSyHYOK1GcO0ioxJeKEBsOm0ujQQsRUxAEs/ Pesl9BCyVQxK5BNhccyrRyROfIgH4/KSlIN7qqLGlnOApPSfIeRYJFzvQs5N2YaYohYF 6YMQRtbFks8magkICPJubgVLXPDc2ogtCRF1iz0k8FnCyY2pKsErMDuSWx+1tXLbXCwG i2og== 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=HRSGmrYnnb9+rYcfBphplSLFyvNnU1n2aTvVy4tkoQk=; b=KqJYuzLLDHjz7Z0uV5fctkCk9qh9fcEoghHr3AalsfagpFszA99lgIWyDmlmrcSGm6 HiHoZBI2He7GZJnHZOdtSBuip949Ip4qgpKfVGWqqFXpy/MuRjA6uGlsQeLztQJpV2sJ 92dE7dwrSfe3+l2vy4RkqpL9Z6fNuHUE598yqAWOx6jsQzCXDiP4W72ocyTkqLMOyQUN /WtKbpQFCZ1yxIuptVc4N+edU5dT1FofXcSf5upMfWfu1R4dgzQ9T3IM+31kzmOa6ZX/ C7VZUmjZwFZxNCNq8+QWTDXqQCUyOUVnJ6ssJQtei1+J9gGLRSjABKtlVfmiLTlpxmkc EqAQ== X-Gm-Message-State: AOAM5303Sekj06MJpkrvRrZnSTk+77roEiEnhWcCn7d9V99+F2dINDPX d/ugL3jMoNHB7NfpYrbzLmreJEefTJw= X-Google-Smtp-Source: ABdhPJxaOS1cD0Ioe79XsULoiz9TChDxZxZhKjs5684x2JYTmcT8xzlNcRTbYQih+v+gWfB1kqDrhA== X-Received: by 2002:adf:f548:: with SMTP id j8mr22324272wrp.114.1602362233277; Sat, 10 Oct 2020 13:37:13 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id v17sm5661341wru.44.2020.10.10.13.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 13:37:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 1/4] hw/timer/bcm2835: Introduce BCM2835_SYSTIMER_COUNT definition Date: Sat, 10 Oct 2020 22:37:06 +0200 Message-Id: <20201010203709.3116542-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201010203709.3116542-1-f4bug@amsat.org> References: <20201010203709.3116542-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Luc Michel , Richard Henderson , =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Andrew Baumann , Paul Zimmerman , qemu-arm@nongnu.org, Luc Michel , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use the BCM2835_SYSTIMER_COUNT definition instead of the magic '4' value. Reviewed-by: Luc Michel Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- 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_systmr.h index 7ce8f6ef4d8..43df7ee488c 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) +#define BCM2835_SYSTIMER_COUNT 4 + struct BCM2835SystemTimerState { /*< private >*/ SysBusDevice parent_obj; @@ -26,7 +28,7 @@ struct BCM2835SystemTimerState { struct { uint32_t status; - uint32_t compare[4]; + uint32_t compare[BCM2835_SYSTIMER_COUNT]; } reg; }; diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index 3387a6214a2..ff8c5536610 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -134,7 +134,8 @@ static const VMStateDescription bcm2835_systmr_vmstate = { .minimum_version_id = 1, .fields = (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() } };