From nobody Sun May 19 14:14:29 2024 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 From nobody Sun May 19 14:14:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601656943; cv=none; d=zohomail.com; s=zohoarc; b=hcnuyIjdK4FO0MMcDvacGBEc4Ns+NXxkwJreM/BCQMs/olkR/XiEtlhPXBMTTxsiNpXL9TNpv9mfKDeoEZqW5/eDrUA9IiKfsE08agEryM4T7bX5slauqFXtq3XzckPB7zfNQrFSF+edmSSvd34DO/cRCmJSDOrccOfgkoDwFyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601656943; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dWp63D9c2Lr1JkfNpk3fP0mvyDGBITZOhbYefHb3Q5E=; b=fJaWmG3Q1FKX0Kb62CyVOCikA9aEFZ8QnVakC9f4Odi33CbVVV3+zfmZ7jopLFqzJSpg+k3CnHNlGG0ryk4OQ3YGy3bDjhyTmt4lDHPxudglRc0LygXhCeuuGgUvguUPr9YvbXeYrLhbG7R427L8mytQl23gZ22mzcy0sPrH0h0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1601656943043386.568421186421; Fri, 2 Oct 2020 09:42:23 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id m6so2539831wrn.0 for ; Fri, 02 Oct 2020 09:42:22 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 09:42:20 -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=dWp63D9c2Lr1JkfNpk3fP0mvyDGBITZOhbYefHb3Q5E=; b=CmC0xxSbZUsDEpDzXkvQVngmvyZ7mmQ0DdrtxBSeYl2NOvcudtRH/uQwv/rcJhXQ+R xsXnYAi87rYb1AlabT9IiQxlSSL1PiwZOvlQXNb6Sou3L2vf7InLzjPmGume0bhpFgTU VxMTzbZT45eSmbf9Vj1hvc3zJPHAPRqzs8KmC45KzrXXYdRDlrKRdFZqprwVOsFp8z8m EqtoIh7+n1h+huyCYCCvgVQP2g/pFjl1K4gmkDCiWQ0gnJ6cH6+hxFxKCaLjxTtx+wve 0yIq4PAJrYkYpjI/W90L/zOC46wgMjRnp3Z7g32201FwxRXuEX/YnvPvSaT5RTztv9+v VUJg== 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=dWp63D9c2Lr1JkfNpk3fP0mvyDGBITZOhbYefHb3Q5E=; b=IFUBY+7JX6vDrCdUmLaJv9Ez9P1oHPdT452oHPTiydTIoWO+QfEHK2nv9zfmpD3k2c 0bobZoMomaX2yxGs0xx47DnDUL59nPne9aV7bkNOW9Bc2hCZu7r8H8rtn7enuXkLKig2 +Um53dpSrfeuGkhz6yezavi9cOAkqIHv8Kq3Gg0Z6PGm/dqHsmIhVoohuAnxampR2UoZ 6pb1BopoS6XaG5bmDpB3MvKLVAD4AJW28WL4ONPBM2mSI5cXg5VbJ02wdFwBE/HZYAN/ K4kazdHsBl2pG9W+CVcjQdge2S0x3JloZ73rtyzD4Ppw+i+nLOzxDaEQT57lcQdPUfHI hD1A== X-Gm-Message-State: AOAM532avJkSPzA8Yx8VlPLSdap1cMfZZcw3v9DsgHCgUiDwUOuSFxW5 wWUkjxqiz7BX27ev+FhNxOk= X-Google-Smtp-Source: ABdhPJzdZ2mkQiI8InzYwLmGX/BohZxQ6DSihyIpKr8D+Y56JZA58wq4PLe3n0bO6XNI8egAL8Sniw== X-Received: by 2002:adf:fd8c:: with SMTP id d12mr4000702wrr.283.1601656941141; Fri, 02 Oct 2020 09:42:21 -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 2/4] hw/timer/bcm2835: Rename variable holding CTRL_STATUS register Date: Fri, 2 Oct 2020 18:42:14 +0200 Message-Id: <20201002164216.1741110-3-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) The variable holding the CTRL_STATUS register is misnamed 'status'. Rename it 'ctrl_status' to make it more obvious this register is also used to control the peripheral. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/timer/bcm2835_systmr.h | 2 +- hw/timer/bcm2835_systmr.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index 43df7ee488..f15788a78d 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -27,7 +27,7 @@ struct BCM2835SystemTimerState { qemu_irq irq; =20 struct { - uint32_t status; + uint32_t ctrl_status; uint32_t compare[BCM2835_SYSTIMER_COUNT]; } reg; }; diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index ff8c553661..b234e83824 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -30,7 +30,7 @@ REG32(COMPARE3, 0x18) =20 static void bcm2835_systmr_update_irq(BCM2835SystemTimerState *s) { - bool enable =3D !!s->reg.status; + bool enable =3D !!s->reg.ctrl_status; =20 trace_bcm2835_systmr_irq(enable); qemu_set_irq(s->irq, enable); @@ -52,7 +52,7 @@ static uint64_t bcm2835_systmr_read(void *opaque, hwaddr = offset, =20 switch (offset) { case A_CTRL_STATUS: - r =3D s->reg.status; + r =3D s->reg.ctrl_status; break; case A_COMPARE0 ... A_COMPARE3: r =3D s->reg.compare[(offset - A_COMPARE0) >> 2]; @@ -82,7 +82,7 @@ static void bcm2835_systmr_write(void *opaque, hwaddr off= set, trace_bcm2835_systmr_write(offset, value); switch (offset) { case A_CTRL_STATUS: - s->reg.status &=3D ~value; /* Ack */ + s->reg.ctrl_status &=3D ~value; /* Ack */ bcm2835_systmr_update_irq(s); break; case A_COMPARE0 ... A_COMPARE3: @@ -133,7 +133,7 @@ static const VMStateDescription bcm2835_systmr_vmstate = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(reg.status, BCM2835SystemTimerState), + VMSTATE_UINT32(reg.ctrl_status, BCM2835SystemTimerState), VMSTATE_UINT32_ARRAY(reg.compare, BCM2835SystemTimerState, BCM2835_SYSTIMER_COUNT), VMSTATE_END_OF_LIST() --=20 2.26.2 From nobody Sun May 19 14:14:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1601656944; cv=none; d=zohomail.com; s=zohoarc; b=lED0QnWZAbGt4qDetX+YCGHiIFQ5I/qQP529zubMM6kcOQTFJkGsFbEbzNrZFXb2kEc9+uNiMSEFrtf+YZ8uxCrNexY6gM6GXcfm1Rb46vNnxsy0BAXRZvAvaJHq5oYr2kuXQxH/P9s4cfzNuqo0j1s4X8T1U4ca7yYbVp+OLvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601656944; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Lo+NLeYd13T3W4hIWAIUPXQaMQ+IojORhmIinFsRoSc=; b=NVBZfEyC0SB0LPc15gpLBKVsuz42bvmQmxwJJe7I/4dzYQMrmNwHSf/cqXj9WWr868IS0DTsAy2bH8v/vVRbtrFHbQYZaplU+S4lEL+Z3t1nlkCSyWLFft2VSVGw4pJc0C6r9fZ0RHcBE7eAf3ky7Kh2CC0Um4+8tmh6fdp91lo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1601656944232706.5742289815437; Fri, 2 Oct 2020 09:42:24 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id x14so2497847wrl.12 for ; Fri, 02 Oct 2020 09:42:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 09:42:21 -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=Lo+NLeYd13T3W4hIWAIUPXQaMQ+IojORhmIinFsRoSc=; b=TsMIULxzGGPcU4okfRIFLxzgrQHifjQEWoMpRpcgj4qOEJ78d4CpNdD0BcBfmH+0Bz Xry7qMNAH/jOvNnh3aXA6LlT9Qf+iVTt/NnhaZEZddJ7+jkQR/DY2J3h3rwgnwjceyxS KXSZd8bUv3f9NURpDAsqo5kQrxd111ILJOPWY8iDLieuusYxVxy3D99EzJ6jpyzUfvMK xhweUAmnpgf75gimCIQXB2mf1G00e3krAgWX+JUH7lXPDEhauTtunOzPkgX9OEZ6Gdfc LIPG5uv9d/A4Uv+fBdrQGxoopNXWKykDMKn+PbBCZ+iEe321HRvvBdjTvsdm3hGv6SUk iUmA== 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=Lo+NLeYd13T3W4hIWAIUPXQaMQ+IojORhmIinFsRoSc=; b=O1CMIZgyR49L51dP3Xi3Idh7CBL1zI5Oe/ubX2as5pX4sRwx9Rsx1WXHTc+u2GoPuB JGQuywr/8fhPm2qi2kOQpSp+KfG69EiVUCBhNDnFL9ieblzCxFnKdWrAvwMuNd5wPNOS TE+mT2z7RNinxQ8H3YHkojFxtE1yGnpO0CWnTY3YjM/FXxXgFyPd7NJCXEGJizG7295N /kmYBbKiURh8F6yD37S9b5R/Sz/vTcRH8imYt8s7dZVks3+Gq7oWCne3NhGZGgbyVWnW mydtHrJ0I0HeTrlJJpelC8yD4UanxmuiTVRk3dKLv12aUfJ5XfKsZYgit4w5viDGjGHo q5FQ== X-Gm-Message-State: AOAM531zWzW3wemiyvE3p0XaY20/Lz/gYuBQDUJYfGYKDc1Y+mA+AGI8 HaGUUSCcGXMCOPrk/G/Jyae0Snqw1JQ= X-Google-Smtp-Source: ABdhPJzpndBOLDlDQ0y61K4+51BjzCGnXVqU2F0jJfYL2kOIeJjJ+w3VFobVpzYPN0Vj7E1bYnC0zA== X-Received: by 2002:adf:e852:: with SMTP id d18mr4288673wrn.40.1601656942235; Fri, 02 Oct 2020 09:42:22 -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 Subject: [PATCH v3 3/4] hw/timer/bcm2835: Support the timer COMPARE registers Date: Fri, 2 Oct 2020 18:42:15 +0200 Message-Id: <20201002164216.1741110-4-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) This peripheral has 1 free-running timer and 4 compare registers. Only the free-running timer is implemented. Add support the COMPARE registers (each register is wired to an IRQ). Reference: "BCM2835 ARM Peripherals" datasheet [*] chapter 12 "System Timer": The System Timer peripheral provides four 32-bit timer channels and a single 64-bit free running counter. Each channel has an output compare register, which is compared against the 32 least significant bits of the free running counter values. When the two values match, the system timer peripheral generates a signal to indicate a match for the appropriate channel. The match signal is then fed into the interrupt controller. This peripheral is used since Linux 3.7, commit ee4af5696720 ("ARM: bcm2835: add system timer"). [*] https://www.raspberrypi.org/app/uploads/2012/02/BCM2835-ARM-Peripherals= .pdf Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: - Only compare 32 least significant bits of the free running counter values (Luc) --- include/hw/timer/bcm2835_systmr.h | 11 ++++++-- hw/timer/bcm2835_systmr.c | 45 ++++++++++++++++++++----------- hw/timer/trace-events | 4 ++- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index f15788a78d..bd3097d746 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -11,6 +11,7 @@ =20 #include "hw/sysbus.h" #include "hw/irq.h" +#include "qemu/timer.h" #include "qom/object.h" =20 #define TYPE_BCM2835_SYSTIMER "bcm2835-sys-timer" @@ -18,18 +19,24 @@ OBJECT_DECLARE_SIMPLE_TYPE(BCM2835SystemTimerState, BCM= 2835_SYSTIMER) =20 #define BCM2835_SYSTIMER_COUNT 4 =20 +typedef struct { + unsigned id; + QEMUTimer timer; + qemu_irq irq; + BCM2835SystemTimerState *state; +} BCM2835SystemTimerCompare; + struct BCM2835SystemTimerState { /*< private >*/ SysBusDevice parent_obj; =20 /*< public >*/ MemoryRegion iomem; - qemu_irq irq; - struct { uint32_t ctrl_status; uint32_t compare[BCM2835_SYSTIMER_COUNT]; } reg; + BCM2835SystemTimerCompare tmr[BCM2835_SYSTIMER_COUNT]; }; =20 #endif diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index b234e83824..66a1d4d6b8 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -28,20 +28,13 @@ REG32(COMPARE1, 0x10) REG32(COMPARE2, 0x14) REG32(COMPARE3, 0x18) =20 -static void bcm2835_systmr_update_irq(BCM2835SystemTimerState *s) +static void bcm2835_systmr_timer_expire(void *opaque) { - bool enable =3D !!s->reg.ctrl_status; + BCM2835SystemTimerCompare *tmr =3D opaque; =20 - trace_bcm2835_systmr_irq(enable); - qemu_set_irq(s->irq, enable); -} - -static void bcm2835_systmr_update_compare(BCM2835SystemTimerState *s, - unsigned timer_index) -{ - /* TODO fow now, since neither Linux nor U-boot use these timers. */ - qemu_log_mask(LOG_UNIMP, "COMPARE register %u not implemented\n", - timer_index); + trace_bcm2835_systmr_timer_expired(tmr->id); + tmr->state->reg.ctrl_status |=3D 1 << tmr->id; + qemu_set_irq(tmr->irq, 1); } =20 static uint64_t bcm2835_systmr_read(void *opaque, hwaddr offset, @@ -78,16 +71,29 @@ static void bcm2835_systmr_write(void *opaque, hwaddr o= ffset, uint64_t value, unsigned size) { BCM2835SystemTimerState *s =3D BCM2835_SYSTIMER(opaque); + int index; + uint64_t now; + uint64_t triggers_delay_us; =20 trace_bcm2835_systmr_write(offset, value); switch (offset) { case A_CTRL_STATUS: s->reg.ctrl_status &=3D ~value; /* Ack */ - bcm2835_systmr_update_irq(s); + for (index =3D 0; index < ARRAY_SIZE(s->tmr); index++) { + if (extract32(value, index, 1)) { + trace_bcm2835_systmr_irq_ack(index); + qemu_set_irq(s->tmr[index].irq, 0); + } + } break; case A_COMPARE0 ... A_COMPARE3: - s->reg.compare[(offset - A_COMPARE0) >> 2] =3D value; - bcm2835_systmr_update_compare(s, (offset - A_COMPARE0) >> 2); + index =3D (offset - A_COMPARE0) >> 2; + s->reg.compare[index] =3D value; + now =3D qemu_clock_get_us(QEMU_CLOCK_VIRTUAL); + /* Compare lower 32-bits of the free-running counter. */ + triggers_delay_us =3D value - (now & UINT32_MAX); + trace_bcm2835_systmr_run(index, triggers_delay_us); + timer_mod(&s->tmr[index].timer, now + triggers_delay_us); break; case A_COUNTER_LOW: case A_COUNTER_HIGH: @@ -125,7 +131,14 @@ static void bcm2835_systmr_realize(DeviceState *dev, E= rror **errp) memory_region_init_io(&s->iomem, OBJECT(dev), &bcm2835_systmr_ops, s, "bcm2835-sys-timer", 0x20); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); - sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); + + for (size_t i =3D 0; i < ARRAY_SIZE(s->tmr); i++) { + s->tmr[i].id =3D i; + s->tmr[i].state =3D s; + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->tmr[i].irq); + timer_init_us(&s->tmr[i].timer, QEMU_CLOCK_VIRTUAL, + bcm2835_systmr_timer_expire, &s->tmr[i]); + } } =20 static const VMStateDescription bcm2835_systmr_vmstate =3D { diff --git a/hw/timer/trace-events b/hw/timer/trace-events index b996d99200..f4ca31d495 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -77,9 +77,11 @@ nrf51_timer_write(uint8_t timer_id, uint64_t addr, uint3= 2_t value, unsigned size nrf51_timer_set_count(uint8_t timer_id, uint8_t counter_id, uint32_t value= ) "timer %u counter %u count 0x%" PRIx32 =20 # bcm2835_systmr.c -bcm2835_systmr_irq(bool enable) "timer irq state %u" +bcm2835_systmr_timer_expired(unsigned id) "timer #%u expired" +bcm2835_systmr_irq_ack(unsigned id) "timer #%u acked" bcm2835_systmr_read(uint64_t offset, uint64_t data) "timer read: offset 0x= %" PRIx64 " data 0x%" PRIx64 bcm2835_systmr_write(uint64_t offset, uint64_t data) "timer write: offset = 0x%" PRIx64 " data 0x%" PRIx64 +bcm2835_systmr_run(unsigned id, uint64_t delay_us) "timer #%u expiring in = %"PRIu64" us" =20 # avr_timer16.c avr_timer16_read(uint8_t addr, uint8_t value) "timer16 read addr:%u value:= %u" --=20 2.26.2 From nobody Sun May 19 14:14:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601656945; cv=none; d=zohomail.com; s=zohoarc; b=WWmVvVyEx1rXepNJMrO5zqDI5JxelPLQB1PLsT8vcM81fcUSFFyhrwT2UlU5yIi8lqjWbXGSulNm5bRAzas9F5viUbbPEdqsF+H/pqSvrg5kTx6h3LhOWT727zbfCHVRf6uRGroomOX5xn50ZD4D/7pipfBjKy+GuXGgCJE3Too= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601656945; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJ73gD1Uc7sEkC9QbqMVDttq6asn/T6Kh/yxfjBEUp0=; b=H3M53tseLL7fp6peC5kFwAp4hJuAdLNULVldDQ6OIy+X8u2UW9VTiT1bsCtwR60SbI+VLxB6iIUv/RI5fqbZ28P9nLz3N30eOb+0sq1GG6BvlQ9N/0bcAU572PgQU3qHRwxceajUKVVIxBTo4dDVov4kydoQMDbJxoA3OO8/QrY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1601656945370823.4369194220145; Fri, 2 Oct 2020 09:42:25 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id m6so2539963wrn.0 for ; Fri, 02 Oct 2020 09:42:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 09:42:22 -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=QJ73gD1Uc7sEkC9QbqMVDttq6asn/T6Kh/yxfjBEUp0=; b=KDh4pV1ceGZZTuxJs5aUhU91MGb4YjeVBG+mdh69E4f53aSZQpk2Ta8E9dvUBVXeLm +oya7gV69PW7WNIEKhAPgTLmNnCuDmPGAD1E66kMAYV5QU7/eHKslc7fdOCMKiTbbGvy 8mPvqGPw1H2pr+wA07HKTvYscP4yrj/viDkqRuc7HFtgVBPnvMugAmqUw5xFZ/yd788n g1mG8sspfPy3ZyvqQj8HejfJ/dMTODJ6lEOmxDqa/0UVJCcj2gNbNi/NhX/Kfmk7zeo4 HO4ipcOSdAgpvLRSsh263eLDg+8L911wWrwGytG5TM8Ju4cQqbdJ8g/MveOZyrYZ7jRZ 0ymw== 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=QJ73gD1Uc7sEkC9QbqMVDttq6asn/T6Kh/yxfjBEUp0=; b=j+cD1s+z8yZOVih8Hd+Z+XsREktwKJpaczZikQhCwQtmSwp668vLWz/MHun0hqh4Y9 6I2Slf6R7TBzMVwOkBFJQ7EH69YDlUJ930ydF10ni8kQGZcX7Iz+uAl5sQk1U7H99lZ1 LcU2Fl4R9xt+r4KI6hQJTmkVMz6RajKEXxztjLgTLX3cHvpOZ64TT74YIwDCthtyzn2m HGwZmLraok37N1lC9gMIXXWWuwHqQaYf/xBdoyidx4GpxJnxeITqOwoW6f+B9r/7wHH5 f+6viX/497mXSn9jyvqRIOvcQ3rtICeiIVVM1wtT24F76xlHf4K+wgKytZoP44rJUpdL hIVQ== X-Gm-Message-State: AOAM531YmfNVturaTdi2bTkafLRT/+nxdrj2s8EbHnvZPncno/KITZQd 4uI/2Ir2Nr7O/1d2pOaexjY= X-Google-Smtp-Source: ABdhPJydccUqaErHkbxPw5tJExtimzS0oH/uUzTQN4k89U5DRCsxarx2xO12IwWgAyZwBX+5RSLOyA== X-Received: by 2002:a5d:4104:: with SMTP id l4mr4078197wrp.396.1601656943473; Fri, 02 Oct 2020 09:42:23 -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 4/4] hw/arm/bcm2835_peripherals: Correctly wire the SYS_timer IRQs Date: Fri, 2 Oct 2020 18:42:16 +0200 Message-Id: <20201002164216.1741110-5-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) The SYS_timer is not directly wired to the ARM core, but to the SoC (peripheral) interrupt controller. Fixes: 0e5bbd74064 ("hw/arm/bcm2835_peripherals: Use the SYS_timer") Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/bcm2835_peripherals.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 15c5c72e46..48909a43c3 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -171,8 +171,17 @@ static void bcm2835_peripherals_realize(DeviceState *d= ev, Error **errp) memory_region_add_subregion(&s->peri_mr, ST_OFFSET, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systmr), 0)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->systmr), 0, - qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_ARM_IRQ, - INTERRUPT_ARM_TIMER)); + qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, + INTERRUPT_TIMER0)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->systmr), 1, + qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, + INTERRUPT_TIMER1)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->systmr), 2, + qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, + INTERRUPT_TIMER2)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->systmr), 3, + qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, + INTERRUPT_TIMER3)); =20 /* UART0 */ qdev_prop_set_chr(DEVICE(&s->uart0), "chardev", serial_hd(0)); --=20 2.26.2