From nobody Sat May 18 08:14:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588577370; cv=none; d=zohomail.com; s=zohoarc; b=embKqk97oSCNO6P/TEc0E51VR6txAptWCF/a+b22jwar/sW6uZvipLuXlpAaW++uwvMTTenRGJ0cP55iwsRASuQcgLD8MZFUBKva5zQ/9Lc0re/UccFJ6fY4shM2Ko05ZO2398Lns+daIrY2Fjs5C81Au4vYbHv7Sd91uMYuobk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588577370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dsajqg5lAaKjFPLXc7DAkT/Ql48pVTTyNDF4inTTmC8=; b=QeUV0sB1Za4qPjBZNc6aOJ8T8wc+gqb+1987Ze1xOGqjodHYPy97f/i1jiGlRs/nHir0FMZJgMIVr2wMKvR7+E2W31Q29ROYC7wFnZNMtaJCw5CS+Oy4/qCm6O9hSJ9qWiCvza52+6DeRdXsKB4F0Xw8qJwRpWQdlzSl+CQw5Q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588577370278133.63564611457628; Mon, 4 May 2020 00:29:30 -0700 (PDT) Received: from localhost ([::1]:41660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVVXd-0007Zk-0R for importer@patchew.org; Mon, 04 May 2020 03:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVVWg-0005zU-47; Mon, 04 May 2020 03:28:30 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVVWe-00063Y-RH; Mon, 04 May 2020 03:28:29 -0400 Received: by mail-wr1-x441.google.com with SMTP id x18so19643412wrq.2; Mon, 04 May 2020 00:28:28 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id w83sm12590159wmb.37.2020.05.04.00.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 00:28:25 -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=dsajqg5lAaKjFPLXc7DAkT/Ql48pVTTyNDF4inTTmC8=; b=nAN4IOBZGf9iV4qWAm5yqzwg6S2WcDVcXCXnWWdZ5KZeHwPSopMqE9XfUJOCf0tH5a 9xvdZLFgVqF3ZwKVisRQqlm+nErQk8FCZvB7a84zMbSSjLsJT6NcWyHQ13LgRKg/wEKt +TQR+w2My6cA+QIR5SuFlHqocZVZkD7ROX2ey/5/uD2kHjZt/q5wIm9TCCl54MTEah2w /KCBXr2JGO3KMIcuRc30nrSLJMcC0SGtQP2/2riVJ27Yj4OrJ1fvWGEUItu58kC3c1Bd gG5uo/iG2rzzAS1ij9MauvDECON3vp/dKIRtg5o1yIt/xtJUxbsbMvaReLQgHfEifovG sgrg== 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=dsajqg5lAaKjFPLXc7DAkT/Ql48pVTTyNDF4inTTmC8=; b=mrlSgnqGZ25KB/8uOXH0gCInf+FFThvtGIRInDExw4M4K0CsIBRRLSRBQYr54qEn6O L9fmSpOt4vFxDr6BdTNxN4WteLgfgCm/5oc+J+voeX4KkCrGfmd/vw5EakoNsPhlVnI3 LxR924+w+LuGYwZeEQNhOE4KHnewF/RI1k95gTJWVvkMfAycYjXgCAV2jeNDyVIcpqMt Yt3haBFa9sGSWs0Ltx++E4etOzq0yiNzs/zBd2B6/KUzTklVJEigbzV1gqgrXh8E62gx EbijwaJKAqA3mNHwpbWONc0cFD7IRB9FENngO0mcLanYKOQD/MfYFupAfln1nB9ilpNT TySA== X-Gm-Message-State: AGi0PuaDBqjyJacsqE7QoUcUETeA1E6tkZPt1SwmpV+kEwS1oNZENCn6 9zLTNxHx4rdq/T5uS6DQZvsxV1jU X-Google-Smtp-Source: APiQypKpyrNJrwM7YEANCn2JBxnGiWTrDL0LRFhU1JYiHNehAaebKzqOIOFvldgcnt+p0kMjG2SFbQ== X-Received: by 2002:adf:f1c4:: with SMTP id z4mr9294279wro.25.1588577305926; Mon, 04 May 2020 00:28:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hw/arm/nrf51: Add NRF51_PERIPHERAL_SIZE definition Date: Mon, 4 May 2020 09:28:19 +0200 Message-Id: <20200504072822.18799-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504072822.18799-1-f4bug@amsat.org> References: <20200504072822.18799-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , qemu-arm@nongnu.org, Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) On the NRF51 series, all peripherals have a fixed I/O size of 4KiB. Define NRF51_PERIPHERAL_SIZE and use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/arm/nrf51.h | 3 +-- include/hw/i2c/microbit_i2c.h | 2 +- hw/arm/nrf51_soc.c | 4 ++-- hw/i2c/microbit_i2c.c | 2 +- hw/timer/nrf51_timer.c | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/hw/arm/nrf51.h b/include/hw/arm/nrf51.h index 1008fee6c9..de836beaa4 100644 --- a/include/hw/arm/nrf51.h +++ b/include/hw/arm/nrf51.h @@ -24,11 +24,10 @@ #define NRF51_IOMEM_BASE 0x40000000 #define NRF51_IOMEM_SIZE 0x20000000 =20 +#define NRF51_PERIPHERAL_SIZE 0x00001000 #define NRF51_UART_BASE 0x40002000 #define NRF51_TWI_BASE 0x40003000 -#define NRF51_TWI_SIZE 0x00001000 #define NRF51_TIMER_BASE 0x40008000 -#define NRF51_TIMER_SIZE 0x00001000 #define NRF51_RNG_BASE 0x4000D000 #define NRF51_NVMC_BASE 0x4001E000 #define NRF51_GPIO_BASE 0x50000000 diff --git a/include/hw/i2c/microbit_i2c.h b/include/hw/i2c/microbit_i2c.h index aad636127e..2bff36680c 100644 --- a/include/hw/i2c/microbit_i2c.h +++ b/include/hw/i2c/microbit_i2c.h @@ -29,7 +29,7 @@ #define MICROBIT_I2C(obj) \ OBJECT_CHECK(MicrobitI2CState, (obj), TYPE_MICROBIT_I2C) =20 -#define MICROBIT_I2C_NREGS (NRF51_TWI_SIZE / sizeof(uint32_t)) +#define MICROBIT_I2C_NREGS (NRF51_PERIPHERAL_SIZE / sizeof(uint32_t)) =20 typedef struct { SysBusDevice parent_obj; diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 57eff63f0d..e50473fd19 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -156,7 +156,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Err= or **errp) return; } =20 - base_addr =3D NRF51_TIMER_BASE + i * NRF51_TIMER_SIZE; + base_addr =3D NRF51_TIMER_BASE + i * NRF51_PERIPHERAL_SIZE; =20 sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer[i]), 0, base_addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, @@ -166,7 +166,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Err= or **errp) =20 /* STUB Peripherals */ memory_region_init_io(&s->clock, OBJECT(dev_soc), &clock_ops, NULL, - "nrf51_soc.clock", 0x1000); + "nrf51_soc.clock", NRF51_PERIPHERAL_SIZE); memory_region_add_subregion_overlap(&s->container, NRF51_IOMEM_BASE, &s->clock, -1); =20 diff --git a/hw/i2c/microbit_i2c.c b/hw/i2c/microbit_i2c.c index 4661f05253..8024739820 100644 --- a/hw/i2c/microbit_i2c.c +++ b/hw/i2c/microbit_i2c.c @@ -100,7 +100,7 @@ static void microbit_i2c_realize(DeviceState *dev, Erro= r **errp) MicrobitI2CState *s =3D MICROBIT_I2C(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), µbit_i2c_ops, s, - "microbit.twi", NRF51_TWI_SIZE); + "microbit.twi", NRF51_PERIPHERAL_SIZE); sysbus_init_mmio(sbd, &s->iomem); } =20 diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index e04046eb15..bc82c85a6f 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -313,7 +313,7 @@ static void nrf51_timer_init(Object *obj) SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 memory_region_init_io(&s->iomem, obj, &rng_ops, s, - TYPE_NRF51_TIMER, NRF51_TIMER_SIZE); + TYPE_NRF51_TIMER, NRF51_PERIPHERAL_SIZE); sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->irq); =20 --=20 2.21.3 From nobody Sat May 18 08:14:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588577383; cv=none; d=zohomail.com; s=zohoarc; b=I7R2lmxIharcmjB6QsCDwZ7N6gXy15ppf6pvBL7drCAW2sjIml7Bb/aMCrQ0tLDQV0dWChIEMCHzWRBySfP3NBCPS+dPXlNo/r2s1lQEaW9zU5ANdRlrsuVjFZev1ETFNyOlqmu6OfhHLzszIHO24zHXCqeqPzRc3qHEA9HyEPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588577383; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T3XR2g8kj7VSDhrVTdQeVBycX1aQdfydS7sgJhSrjvA=; b=GxQB/QeR0Dq//48i0Ej60vsG1YgD754fLxPuzKln5WAJX2WCYCAA/p82sYqHdvi5yA9IfG7VI+UumCZNvQ4VRDzfyg82yHZI6rreW9z0OVh5ACRSx9DDXCvBCF7BMCafzg3EXTHKqC7e7mvcBVyd9uAQuRWTZgNxb3KVNdumEqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158857738300781.65726510632612; Mon, 4 May 2020 00:29:43 -0700 (PDT) Received: from localhost ([::1]:42362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVVXp-0007qo-MG for importer@patchew.org; Mon, 04 May 2020 03:29:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVVWg-00060Q-Eu; Mon, 04 May 2020 03:28:30 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51542) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVVWf-00063m-ND; Mon, 04 May 2020 03:28:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id x4so7250813wmj.1; Mon, 04 May 2020 00:28:29 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id w83sm12590159wmb.37.2020.05.04.00.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 00:28:27 -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=T3XR2g8kj7VSDhrVTdQeVBycX1aQdfydS7sgJhSrjvA=; b=ku9XwNvP29vPvuuAGB9FzL/m4KyHcgoTpSkoqMKmWhiBQrZ7X6kqqOKZO2kuajrKXB hAEY2/ZCDfZwQMLfr1VilUhXZg31PZaRflptct3ffFyvNuAVwWPMA7RIdVZCpy24Eel6 lLyTBxjY45BUhzmcjg+SWVPti3Rh4MMi37KiI2CNwbpoAtbGtoeXq6wzbLWvXWxbFxO4 Q3d1imwxlawJOVD/eRV3vY4mFUBj7/ujSeif/6DhzpCmINHHViBq9HeZXTMHLb7BzIwr 7x0p+F91MYWnnKNf+4E9hoUxPYfuuBjlHUtOhBmzLzas/0DruByrDwc34VUrA806tm7H HGeA== 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=T3XR2g8kj7VSDhrVTdQeVBycX1aQdfydS7sgJhSrjvA=; b=OQA2XdhRJxfcfSi91qMG87KD3qgXl0mowzgc0gM4PipDD/yNO3FfFvQQh9vLYFNSFb PteVkyAMKk/M+MN3uvE+oIAkvfyUKQhUYp4ZMm+cdU0Un91KgwhljI85//oxWQJ/MrRl mXEV2dfZCgBVjXMJhPqflttAMT6GeG6TSP0hAcmeqIhb46cXqPNXMtex/urAGpKi6ALv oImzSEbuMiIeEmkiYSHouNffQyckd8XJTN5dRWLv9KP69wbYBtdyt/svMB7n1cVNuw0V IhuhwovHLHtPyVOp3fimS1bD/Jh8K7TNo7z2lkw1jOgY+395m55tP6WsHDCfjgFXfy7X 1H3A== X-Gm-Message-State: AGi0PuZ8m56o4PLbMDkhwqIcWpZNuJW9jwpgk3hUXa/JjhxbSjEuUWZ8 HmhfBQeuZ8GoFvbkklqwxXHmNYaf X-Google-Smtp-Source: APiQypKYm89TBeuic6ZrT0cNKSRbUdh6FXuK3YfQ0ipEnPZt34AHLXknm7/p5MN/1SKv3/Az1AFikg== X-Received: by 2002:a1c:384:: with SMTP id 126mr13274392wmd.58.1588577307844; Mon, 04 May 2020 00:28:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/4] hw/arm/nrf51_soc: Mark some peripherals as unimplemented Date: Mon, 4 May 2020 09:28:20 +0200 Message-Id: <20200504072822.18799-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504072822.18799-1-f4bug@amsat.org> References: <20200504072822.18799-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32b.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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , qemu-arm@nongnu.org, Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Map some peripherals used by Zephyr Project: https://github.com/zephyrproject-rtos/zephyr/blob/zephyr-v2.2.0/dts/arm/nor= dic/nrf51822.dtsi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/nrf51.h | 4 ++++ hw/arm/nrf51_soc.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/hw/arm/nrf51.h b/include/hw/arm/nrf51.h index de836beaa4..46d0cfc7a1 100644 --- a/include/hw/arm/nrf51.h +++ b/include/hw/arm/nrf51.h @@ -25,11 +25,15 @@ #define NRF51_IOMEM_SIZE 0x20000000 =20 #define NRF51_PERIPHERAL_SIZE 0x00001000 +#define NRF51_RADIO_BASE 0x40001000 #define NRF51_UART_BASE 0x40002000 #define NRF51_TWI_BASE 0x40003000 +#define NRF51_GPIOTE_BASE 0x40006000 #define NRF51_TIMER_BASE 0x40008000 +#define NRF51_TEMP_BASE 0x4000c000 #define NRF51_RNG_BASE 0x4000D000 #define NRF51_NVMC_BASE 0x4001E000 +#define NRF51_PPI_BASE 0x4001f000 #define NRF51_GPIO_BASE 0x50000000 =20 #define NRF51_PRIVATE_BASE 0xF0000000 diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index e50473fd19..6212c5cb53 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -170,6 +170,17 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Er= ror **errp) memory_region_add_subregion_overlap(&s->container, NRF51_IOMEM_BASE, &s->clock, -1); =20 + create_unimplemented_device("nrf51_soc.radio", NRF51_RADIO_BASE, + NRF51_PERIPHERAL_SIZE); + create_unimplemented_device("nrf51_soc.uarte", NRF51_UART_BASE, + NRF51_PERIPHERAL_SIZE); + create_unimplemented_device("nrf51_soc.gpiote", NRF51_GPIOTE_BASE, + NRF51_PERIPHERAL_SIZE); + create_unimplemented_device("nrf51_soc.temp", NRF51_TEMP_BASE, + NRF51_PERIPHERAL_SIZE); + create_unimplemented_device("nrf51_soc.ppi", NRF51_PPI_BASE, + NRF51_PERIPHERAL_SIZE); + create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE, NRF51_IOMEM_SIZE); create_unimplemented_device("nrf51_soc.private", --=20 2.21.3 From nobody Sat May 18 08:14:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588577577; cv=none; d=zohomail.com; s=zohoarc; b=NWNO3UHl8YQIZYtvU9nYygdFAuzBDMHZzR+2J/r4ynAnMu04TVfEPxL2fbe5GtW8+JCM+x5gV0bPLQVxnxXIMPn45wo2EbBFrod1RVFnz365Q2oFMoJuB4ujOYIDznmDDXJvtcIR0KwoGVu5a1FgQeDJUGVL+kUJpbge8njn9Ws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588577577; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NmgzSAKKhE63JGc7KiZaWfPFcEP9GIaik5bYtHzc0+Y=; b=XhQfAGpwG6gmJGSEojLZiW+cZxo/JI0imcev9cNf+qagY5FXmWnSXpBFrJEhnONhLtXB9SaQ2AuactdxWF47jpC3L78USlC5PzyrqTfnG1dQ13GQrnFMi0lOTsnxW8rKtTNTT34UHgGGmfxRqZPjsoONBkP4V3EL0kQ/AEVTC8U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588577577633867.4695842238187; Mon, 4 May 2020 00:32:57 -0700 (PDT) Received: from localhost ([::1]:47660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVVay-0001nX-Bx for importer@patchew.org; Mon, 04 May 2020 03:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVVWh-00062H-Ib; Mon, 04 May 2020 03:28:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVVWg-000644-Pn; Mon, 04 May 2020 03:28:31 -0400 Received: by mail-wr1-x442.google.com with SMTP id l18so8882729wrn.6; Mon, 04 May 2020 00:28:30 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id w83sm12590159wmb.37.2020.05.04.00.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 00:28:28 -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=NmgzSAKKhE63JGc7KiZaWfPFcEP9GIaik5bYtHzc0+Y=; b=iVfYczXvoJQwtj6PH14fEnY/L0H/c5bU3pAvHp2tDz76/TfqEUO22DBsg7yCqXt7Xy nQ51JXs4+MmEOAvJPXovtgLhXyjtXxhwoaxaq+7i/+4VaEctKGduf71NqM8PX6lyMYwg EtA9FnyvgjKxR1cBbNdYKCFV4t9nh8Zh/V2p9WRF1i48NFuvLl+lVhKMD3gYLo7AvQ43 LVM5n4F5d0e6o3yTt8dfvxFo9n+xC9ZJ0tkoWtWFbZyxFW738vZXpGx3GQ/2vE4AQTEO WQNgwjOBQKKAvLwYZ0UPbt3MnNJmuPyKM37CqtQG68RHDtMvkum5YaCjj69ZHJd86NUN 0OEg== 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=NmgzSAKKhE63JGc7KiZaWfPFcEP9GIaik5bYtHzc0+Y=; b=eXu0hz+g/K9NjlL621IDHaiqb4N4DI+4lm6O9Ibddm5Pj7fjx0m+YpScj+9ztt76m2 o27WH7/3dpev2M+pYzC+m6V7Fe4NzeTNJ9FuF8LNLcTknyeKJYcOITln6zmOw4dMkgK0 v0gdxRcLzpDDmmqPtdnv8pTtuLo8bkVs/HEckMM4Ewr1kIMwBhwRq/fPEbUYF+zXS1Wh uub/Y1qENJrfqLK0WoA6Li3O7sIn5wtYpYke8gtltlvBfMbkntNg4rT6O6WfLgzcLsrz OfR6BoGk7O8S8gMx7SbUXizJo7x2febpbwRTBBrXdoZaeB0zpTAZh0aKWRVYsD8P3g+l inKg== X-Gm-Message-State: AGi0PubVeLT+QeW//0r6dKS2tYx3bOVnLfbjPMFheh1AYWupn2uzsf4x +FhHVEXW5G78G8xspw0YHKF2pr82 X-Google-Smtp-Source: APiQypKqswOkLxJl2q+rqM2QUL9gy8A4mN0czIerLynPN2/cxK+FlQ1BdGEnk6w0dkPDqSmiv9dz3Q== X-Received: by 2002:a5d:5261:: with SMTP id l1mr5769624wrc.24.1588577308885; Mon, 04 May 2020 00:28:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/4] hw/timer/nrf51_timer: Display timer ID in trace events Date: Mon, 4 May 2020 09:28:21 +0200 Message-Id: <20200504072822.18799-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504072822.18799-1-f4bug@amsat.org> References: <20200504072822.18799-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , qemu-arm@nongnu.org, Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The NRF51 series SoC have 3 timer peripherals, each having 4 counters. To help differentiate which peripheral is accessed, display the timer ID in the trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/timer/nrf51_timer.h | 1 + hw/arm/nrf51_soc.c | 5 +++++ hw/timer/nrf51_timer.c | 11 +++++++++-- hw/timer/trace-events | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/nrf51_timer.h b/include/hw/timer/nrf51_timer.h index 85cad2300d..eb6815f21d 100644 --- a/include/hw/timer/nrf51_timer.h +++ b/include/hw/timer/nrf51_timer.h @@ -59,6 +59,7 @@ typedef struct NRF51TimerState { MemoryRegion iomem; qemu_irq irq; =20 + uint8_t id; QEMUTimer timer; int64_t timer_start_ns; int64_t update_counter_ns; diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 6212c5cb53..44b2624e8e 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -150,6 +150,11 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Er= ror **errp) =20 /* TIMER */ for (i =3D 0; i < NRF51_NUM_TIMERS; i++) { + object_property_set_uint(OBJECT(&s->timer[i]), i, "id", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", &= err); if (err) { error_propagate(errp, err); diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index bc82c85a6f..38cea0542e 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -17,6 +17,7 @@ #include "hw/arm/nrf51.h" #include "hw/irq.h" #include "hw/timer/nrf51_timer.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" =20 @@ -185,7 +186,7 @@ static uint64_t nrf51_timer_read(void *opaque, hwaddr o= ffset, unsigned int size) __func__, offset); } =20 - trace_nrf51_timer_read(offset, r, size); + trace_nrf51_timer_read(s->id, offset, r, size); =20 return r; } @@ -197,7 +198,7 @@ static void nrf51_timer_write(void *opaque, hwaddr offs= et, uint64_t now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); size_t idx; =20 - trace_nrf51_timer_write(offset, value, size); + trace_nrf51_timer_write(s->id, offset, value, size); =20 switch (offset) { case NRF51_TIMER_TASK_START: @@ -372,12 +373,18 @@ static const VMStateDescription vmstate_nrf51_timer = =3D { } }; =20 +static Property nrf51_timer_properties[] =3D { + DEFINE_PROP_UINT8("id", NRF51TimerState, id, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void nrf51_timer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->reset =3D nrf51_timer_reset; dc->vmsd =3D &vmstate_nrf51_timer; + device_class_set_props(dc, nrf51_timer_properties); } =20 static const TypeInfo nrf51_timer_info =3D { diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 29fda7870e..43b605cc75 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -67,8 +67,8 @@ cmsdk_apb_dualtimer_write(uint64_t offset, uint64_t data,= unsigned size) "CMSDK cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset" =20 # nrf51_timer.c -nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr = 0x%" PRIx64 " data 0x%" PRIx32 " size %u" -nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write add= r 0x%" PRIx64 " data 0x%" PRIx32 " size %u" +nrf51_timer_read(uint8_t timer_id, uint64_t addr, uint32_t value, unsigned= size) "timer %u read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" +nrf51_timer_write(uint8_t timer_id, uint64_t addr, uint32_t value, unsigne= d size) "timer %u write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" =20 # bcm2835_systmr.c bcm2835_systmr_irq(bool enable) "timer irq state %u" --=20 2.21.3 From nobody Sat May 18 08:14:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588577573; cv=none; d=zohomail.com; s=zohoarc; b=JNe2dHVmiG1NjLmpsMuQXlHA6YL1Txl4tFiKN7R0g1OUm5GmxZRafCcRhlbQEasrBd3w+z4654mYL/A5YuMz/RUu30/cp9k5Juc8yFABgPeoBQh9cq6Pe4f1ewyiQpiGr40giPanNkKD+/Faf7h21eU5fu83RTSIiP0Hk1/KceM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588577573; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lNnVPTok0KuGhI7WlF3rtisA4RGSH6dUX5yCMf1ZDmM=; b=Q6mmp49EZa3i7OVsJpM6FyseSqCQLvAc4LkEHlgxoA0QyvxFSGrVTuubVjg4SxlBFTaxvLMdy4qp9acAw9wlYFZTiZtNWea63jtI86AL1IaNKwMcP9oHZESm83tzA91Ngz73WNyXQH+WQ0a7hCP1laKSWIxk9heksfHPQc5HYQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588577573962261.2959922821559; Mon, 4 May 2020 00:32:53 -0700 (PDT) Received: from localhost ([::1]:47448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVVau-0001iD-Lh for importer@patchew.org; Mon, 04 May 2020 03:32:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVVWi-00065O-G7; Mon, 04 May 2020 03:28:32 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVVWh-00064H-RQ; Mon, 04 May 2020 03:28:32 -0400 Received: by mail-wm1-x32d.google.com with SMTP id u16so7760211wmc.5; Mon, 04 May 2020 00:28:31 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id w83sm12590159wmb.37.2020.05.04.00.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 00:28:29 -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=lNnVPTok0KuGhI7WlF3rtisA4RGSH6dUX5yCMf1ZDmM=; b=cTflwZCzKRKiU4Lmyl6EZYrYM9DmjJJAK6cQfuTgXJHqKXTl8dhMrKemOtI2vvGpF0 e6/8JvmmK7sD0+1y57LP12cNRtw6Cgg1jYv/eog6377XJuSwaiRicCs/RzjP6LZOkTda dvYYpHPEQhwdEBRrBg2w/7JeQsRWBL7d4+hcDHxVtVQNOgeppX12mKesAXiTa0qTnGup /VnyNOERebsAc5uKpmYXBs0wJ9cOElhc+BHZIwALplCy/WdVNWc7XlaNm5OdoidlgVQI jOIDW+dW2EiUzrrko66cwhTjK2XHUFilAEIGtP8jeOzjrkeDhyD9nKeEM64t9uA2lmTI qr8w== 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=lNnVPTok0KuGhI7WlF3rtisA4RGSH6dUX5yCMf1ZDmM=; b=PCf22RDpYDi2WvjLHngUatfUrYrbSzbMl/5SsTNcJjBw4ug/Z1sdUCZnAzvOSdY+jS 2VJogfldP5Z6ebekA6DCQcm8Oj9UyJPLWfONrR/0cIwVOow+6iGhR0qkoQn3JX1aw3Ba ZBaLwgk/9TuNc0V7uGHwXbbxHKQRc7kOXrzaf3dnurFzI7sAgYOuj8GoAhseVcG3U2Pz rxtWL2hulK5tSSNuwgK0sNuN7ST3AljSOnLAZDDgu6wcOt1rzd9GSdLJR4g4AYwHn5gY cQCzgdPOYqhYWJgAKE/sgyR9CThtkkMkMXodTrvByjg9vg9V18JzfQCUytcEuCx8ygYF lsWQ== X-Gm-Message-State: AGi0PubRCzBT2AA0CFkmLJe330gxRuplOptjPGrBclONwT1EZDtJrvSN MoBQKJd6JCW1K/cQfCx7Xc5INoXM X-Google-Smtp-Source: APiQypLEM+7UTXeD/OPUoPdHQsT0mWIOS3SNZwEIMtixgKg8xMPakLTwRJFF4fAwZXGdPoV4NfExTg== X-Received: by 2002:a7b:c459:: with SMTP id l25mr12760238wmi.52.1588577310044; Mon, 04 May 2020 00:28:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/4] hw/timer/nrf51_timer: Add trace event of counter value update Date: Mon, 4 May 2020 09:28:22 +0200 Message-Id: <20200504072822.18799-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504072822.18799-1-f4bug@amsat.org> References: <20200504072822.18799-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , qemu-arm@nongnu.org, Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add trace event to display timer's counter value updates. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/timer/nrf51_timer.c | 1 + hw/timer/trace-events | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 38cea0542e..42be79c736 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -240,6 +240,7 @@ static void nrf51_timer_write(void *opaque, hwaddr offs= et, =20 idx =3D (offset - NRF51_TIMER_TASK_CAPTURE_0) / 4; s->cc[idx] =3D s->counter; + trace_nrf51_timer_set_count(s->id, idx, s->counter); } break; case NRF51_TIMER_EVENT_COMPARE_0 ... NRF51_TIMER_EVENT_COMPARE_3: diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 43b605cc75..80ea197594 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -69,6 +69,7 @@ cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: res= et" # nrf51_timer.c nrf51_timer_read(uint8_t timer_id, uint64_t addr, uint32_t value, unsigned= size) "timer %u read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" nrf51_timer_write(uint8_t timer_id, uint64_t addr, uint32_t value, unsigne= d size) "timer %u write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" +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" --=20 2.21.3