From nobody Mon May 13 08:27:11 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 ARC-Seal: i=1; a=rsa-sha256; t=1602362235; cv=none; d=zohomail.com; s=zohoarc; b=P7iqCQlrNLVadFT/Bz42rgW+f/+YqIoT1FRJ54g4BxEArX0aYLWb8bhJUGrQ5qgdKT99+EET/OBA8E0iYStu/q9S+/T5/PgN7YYl0dRQBqjD8Iquix/TktIfyThPstsf2sn5d9lwc26oCkgrdlYBAotyqvbxHgvmpYaLwXxrsGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362235; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HRSGmrYnnb9+rYcfBphplSLFyvNnU1n2aTvVy4tkoQk=; b=S19ShvhOuDTtCA0DuNkWa21FEx17fvHFWpmeFjutv0xi60h7Xzt+bmWhk1FCM/5Gb5Mi8R7NoF5sVTKkNCoCdLUUA1vFIzaPbnatuOYPOXg/5aSb1czG3ByFKafZDFAAPVdzKjwyKCj0m9Lf2VYW1VMZ1mfaQvDjFszy0KC5kh4= 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 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1602362235156371.44498708750916; Sat, 10 Oct 2020 13:37:15 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id e17so14129331wru.12 for ; Sat, 10 Oct 2020 13:37:14 -0700 (PDT) Return-Path: Return-Path: 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) 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=P62CRqE0HjR4Dj3YVr5pa3kD/QPyK/jf8ndWPOMc+UI2vrvuHr1eGDaSx5a6OQPvDI afjHHOBUcYkQunzAQBu2bMd1IzibvxEm+d0Z58nzeU3JY4bV+2IowMB9tFRvlE1+nWVp Eh/kLLtwA3LtJo6BtTQdAbci/Siln4/Fcd4IVxrNbSVQHaJKqOZFjmsxhMUVn1xWTOYR RyJD37BScU/G4X5EGBqqwWE6sA1T/fKOjr2SNcTSm+lOeAQippcVpEXGYnPJDpVB/WzR ZOVy6cyz7ibTdb/coYlftpYizcsoFMqt64LXFS1QQaY67NttSuCruIA0llJglHpVcq64 18ow== X-Gm-Message-State: AOAM533i160Z0wiHcBfwl9qI0dnQtWFlMWH96GaCsSVk3+gTzGRMHcyM vDDfHfdVALscdiYBC46CrqE= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Paul Zimmerman , Luc Michel , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel , Richard Henderson 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 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 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 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) =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 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 = =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 Mon May 13 08:27:11 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=1602362236; cv=none; d=zohomail.com; s=zohoarc; b=Muyyf/VMxxxnyLO7w1xuGXKKjqG5o7LVwnKxcni7radUchUgq77I6IWtNGQNrElsQXbn6Q+/EcIHdeit5j8NdwHfBCWyQk9XjBDho3q6Fp6RFMz7zoTwtlcAliCD7QzWn23p4pP1Bj3sPhg6wbHFB1HRYgYgPr2TEawBRRofbcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362236; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aNNUhWwFlXOxHa7l9Duv+e4zB1nmUoxjDeC+01ryrtA=; b=gx4WneLuEiD1NCGs1Peiy/q9HbVl1pgQMdpNcdWvxHtT6NKkcV0+SNitMWWI7AmGiqsc+GHESncUSDN2o7Ol4+sgirZ/xcnNQJd3+ZoQCaK7JkRavKWaZHlC1htCM6pRRk7VGH8ITkVxni719lFbEZMa4E6HMHOOJAWXCDnDf4M= 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 1602362236427111.20200811401264; Sat, 10 Oct 2020 13:37:16 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id i1so8031419wro.1 for ; Sat, 10 Oct 2020 13:37:15 -0700 (PDT) Return-Path: Return-Path: 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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 13:37:13 -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=aNNUhWwFlXOxHa7l9Duv+e4zB1nmUoxjDeC+01ryrtA=; b=c68K9ZVCOMuCtf2nPmkz0E30RnWBeW719GkrbxEaMaYnqLQCUqfgDCzPBn4yGSIvNN /6PXNbh2bi7AS1f/+MBy48OyVNzLJKAZtVZMewVYhrm17aGztyDEVf4Jap5uDisBW5wC 6i8bQNMMNtpVVx1Bt8TPG5rwSKGcYYRlB3wX91DyxIcEQTgK5y0DWYTvZjqQKf8qzfrt 9Bd5ES4NicDFX3NvL7WpcN2P9EIIm/EjA4YlHPw/jdLsNFqoI+2dtgipoCZvusR7B87t tCNa44NC4DHe4tuNDaHsKVN9e+nTKvCxwITmfA3SB94B0/g2/JHOTXT8YLflz75jq2wY sBdA== 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=aNNUhWwFlXOxHa7l9Duv+e4zB1nmUoxjDeC+01ryrtA=; b=e1abz6CVDnv0jMZ1/EqWtyBvdjW2j4hJjU+XL+QJLU9066kvqWSN+IBKbMlzJB87Ye yDBWgyUrA1o939x0X5slFSLctW0sqhT2hHs95hpDcuagFEKBcPLu/p6UjciKsVc88YpA GhGh0AoA7kK8/YLLV3f2zOrnOSitYDBU1JkwWe5TM9/OKQrYVIZYXkvj2Wfg9JHwWqd4 p0o0hH1wj96MdUlfRC3B4gPjZBG9+qSx3ygkNkgTFHa2MoEiGHFEUQjwmVYDh0H4IpMU 8+X4DT3eLzQlppk4h88fExChasyVyn3Jm9TzlxkGPEz3NH13V7davCgkdW0EIVE+tfwf reSQ== X-Gm-Message-State: AOAM531fOD4vKJIHvDvp6LggvQ0dpx7m9Jws6t8cZhc0YBt+YUabT/KJ SkgR3/XAdVqvEFNBDUyzkpA= X-Google-Smtp-Source: ABdhPJypB3bJM7N2NWcqDRxS4ndoYUlwdYlrRGyz9FvQvXbIPoJifF87gEq/vqlJbp3o7ODWxr7apw== X-Received: by 2002:a5d:52ca:: with SMTP id r10mr20299525wrv.195.1602362234480; Sat, 10 Oct 2020 13:37:14 -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: Richard Henderson , Paul Zimmerman , Luc Michel , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel , Richard Henderson Subject: [PATCH v4 2/4] hw/timer/bcm2835: Rename variable holding CTRL_STATUS register Date: Sat, 10 Oct 2020 22:37:07 +0200 Message-Id: <20201010203709.3116542-3-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 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 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 43df7ee488c..f15788a78d8 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 ff8c5536610..b234e83824f 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 Mon May 13 08:27:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602362237; cv=none; d=zohomail.com; s=zohoarc; b=fNx/FLoUWhv4hdK6cmF8Pmm3jFmXUSukc4DS6eT/pScTCWjssQjQv0/YCbYK3GiGKgtt4CqFqEkUCTbsKZvHzmXDQrttZChLwMNjXUzioVdyFgHJyR1HkHeDKmt0hHEESvXtSOQFcTPnpcmjf/6r59v2nxKcIbdMRgLEoL2i++g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362237; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2dF62r5NGZYv16IvnRIG9HnMALb65UHicnzi+SydcjI=; b=FnTQo13VnU8PhFLBIlFrlE2XeiTo1yyXKmsgA9lGwZLl9LwvfqxfI2jEYGfspm8itMZBJxv6vmx6FXtzJOzPI1OZNX30ZQ1SXQow6QKvwrB78SToecm/jMIo0i4ewkCB5CDckAiYzZaDsKhdT6KBLNXF11qvAIgAFZ1yB3amBJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602362237667528.5119088882998; Sat, 10 Oct 2020 13:37:17 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id h7so14185831wre.4 for ; Sat, 10 Oct 2020 13:37:17 -0700 (PDT) Return-Path: Return-Path: 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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 13:37:15 -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=2dF62r5NGZYv16IvnRIG9HnMALb65UHicnzi+SydcjI=; b=e0fmYaTisHLP6PC/i6eCzL8J7CfeTvC0kJpYM33AyznUGFfEDNUmuRHsyxU8nYJa4U W2KaKXjgz/6aJFaBFcFK0k4al+qLvXn8PDwjCPQnkWoh4Dyb7oesdPk91QdjfPoP0mCr ViGO/ZvTR29KxfZc+VzBZ1wEaiY3uAybXKNXtE1sFrNHg67NR1xAaJgxIPZBLxPXTVIu Pr+VT/8NtXCBud79jas1LzokmQhNftgtIj9V5j9MLo7xh48KH5GfK6vKASKCeLuFh+0F t0s+aD6Ud6pEewVl9wT2dF5rPwQN8t5ADrM2f6/BMS29oggq/5o118tQMqoI7hjJ61WT h2SQ== 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=2dF62r5NGZYv16IvnRIG9HnMALb65UHicnzi+SydcjI=; b=XlV26WPOj2tfTDCIXuz/E8rO60aS2bIdoMZIuMOsagTzN17oz0ydly0y2aX1swnPUT Q/1wNSGdhb+9grrBBm+BiDX8fWT1SMauO39bQBSyTt5VtZYcqS40TFmlf18tOS+ixipg nVfk5DocDxcdEq0crsQQ/IRHRxQnMPRkJf14/7tBTaX3GprkivpBv3MhuB7/3n6jKYTe dsQ8h94v7ZnDJP4dvH7D8UyLGqlY4ukhikboHhGh3VlIfi9MAKBLaPmMMc0mL2UEw256 D855sCqiw7MjNGEn/s/qgtmYprVptN6T9Uja5M9506O5iiNU1nPkpKygANDw+v1IUeey TZcg== X-Gm-Message-State: AOAM530DGelY6MxW3DRqZwiTAqJtzRTL3JI9LkADtpJM6LkJYUefxpEj 7LH/Ux5Gv5rrD5IM4tRCV8JpQlLPDhs= X-Google-Smtp-Source: ABdhPJwI63yq1KEdkRiKFUbDWugdns1owB7uFsDYxTH4TokX+6TUUfl2KV0S+Rn6F52z/53mIGGVAQ== X-Received: by 2002:a5d:4451:: with SMTP id x17mr4734033wrr.176.1602362235666; Sat, 10 Oct 2020 13:37:15 -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: Richard Henderson , Paul Zimmerman , Luc Michel , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 3/4] hw/timer/bcm2835: Support the timer COMPARE registers Date: Sat, 10 Oct 2020 22:37:08 +0200 Message-Id: <20201010203709.3116542-4-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 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 Reviewed-by: Luc Michel --- v4: - Fix arithmetic to correctly get value in future (Richard) - Use 32-bit argument value (Richard) 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 | 48 ++++++++++++++++++++----------- hw/timer/trace-events | 6 ++-- 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index f15788a78d8..bd3097d746b 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 b234e83824f..67669a57ff3 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, @@ -75,19 +68,33 @@ static uint64_t bcm2835_systmr_read(void *opaque, hwadd= r offset, } =20 static void bcm2835_systmr_write(void *opaque, hwaddr offset, - uint64_t value, unsigned size) + uint64_t value64, unsigned size) { BCM2835SystemTimerState *s =3D BCM2835_SYSTIMER(opaque); + int index; + uint32_t value =3D value64; + uint32_t triggers_delay_us; + uint64_t now; =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; + 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 +132,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 b996d992000..7a4326d9566 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_write(uint64_t offset, uint32_t data) "timer write: offset = 0x%" PRIx64 " data 0x%" PRIx32 +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 Mon May 13 08:27:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 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=1602362239; cv=none; d=zohomail.com; s=zohoarc; b=Q8xy4UBuUtVndthdSrH+a/O2w+e93xTmyJ/3ziD+yVbbiFVVCqIDXFXOx4CWB9kJ7Hy1fA7H6sqJUoou5ZVg662T+4hkDLVK+peMydpX085EJ7zMz2xj/x+MltjsttO+QPa/UyMElIb/Ryk1MizRpuNm0VJ/3W5ksfaFqbGDwYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362239; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lr9XWjXVDUSEQoFZSyyozoh2chXy3lHKAs9QRDzRDc8=; b=e/lOvV2R12y6oaRyv1FzrtXD5tRUGpYbWfLDeHhONX/8wCNiXycllep5a1BwyeX3yUIcPVck2cvB4wFzwAu33UYjTLvE4tGo4xhrtua3K9JU4/qtfdYIeVpoiazLXYPxL+6pzq+wlU81JsDRN/vL4Yj6ldK0022o5CSEttZi/zU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1602362239092657.369741685267; Sat, 10 Oct 2020 13:37:19 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id d3so13259707wma.4 for ; Sat, 10 Oct 2020 13:37:18 -0700 (PDT) Return-Path: Return-Path: 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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 13:37:16 -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=lr9XWjXVDUSEQoFZSyyozoh2chXy3lHKAs9QRDzRDc8=; b=DsT3sSq4ds8A8NxhET9nOPv7HkTLCGhv833G1LL/5aT5bKU3CcMuCohAb0Qo6CyFEy B+oTHKeBSanWFJcssx8Ax3bJbIMB1G8xkF1MuUunI6X40BdRWnY7gE1DCgCQAdlIy45m qgaAQHw6xVXjDq+Xxq4rkJj6VFsBxUfaOJuGLLo2Fw7xOi3gb6CSEsoyIBhdvuVcqOqf IoLCOWrOiRcTlsnNPHjbOloIuGaa3zArYBmbujm3kbw2iX0k6wgRmhhk0N8r9rjfHlJK 4vhuea1ZWwL8TonOjtLGcZfUyYRijmi1w2pLiXmUcnIe86dWGjBUzg43pJ31vMKEIGCa IQTw== 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=lr9XWjXVDUSEQoFZSyyozoh2chXy3lHKAs9QRDzRDc8=; b=FYgsniG04OIDzBsz9CnXFH978TP5w0aCOqYfgVdgDigeRQr1XOb7mq8tMT2UdgbVdy MXLoAqSwK+Ra0HNud4PJXQTUsv2QVUQgRVH7SR2JMGWx0V9ZqhiuJ8upIAwqC1+SItbc dDvwCgKCFT3RZm5KPAFVCJ1Uw7yRGAQB6BWd6K1p0MLqE9AnW3mwZo9BCXrtEggbN1nl ws96UVv6a0j/M5SLGn6ggankFH1mb7pcaBjcffZkJDb0mGV2kw3tBnQRxTscJIlALs3x nI7MFIkvDCx0iNV6PQzW0ChUNJT3DprnVKrKICm9hM3gBiFgLuJexF3ASAX+Aur1g2i0 5d7w== X-Gm-Message-State: AOAM530G74bT7p0hpGHSs8IAW3gqUgjObwIFw2DFf1D7WxuyvXWy4uhw 1VPTVotredXL102GUnqUvd2Ct1d+H2s= X-Google-Smtp-Source: ABdhPJyPfjyHSwhqMuAeY+VMqUIINApJeRgHsxyzd7TRAJIxlZwb76Vi3IoCHrMAAXWYn/091OjFVw== X-Received: by 2002:a1c:4056:: with SMTP id n83mr3953706wma.186.1602362237181; Sat, 10 Oct 2020 13:37:17 -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: Richard Henderson , Paul Zimmerman , Luc Michel , Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel , Richard Henderson Subject: [PATCH v4 4/4] hw/arm/bcm2835_peripherals: Correctly wire the SYS_timer IRQs Date: Sat, 10 Oct 2020 22:37:09 +0200 Message-Id: <20201010203709.3116542-5-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 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 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 15c5c72e465..48909a43c32 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