From patchwork Mon Jan 7 16:31:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154946 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3710637ljp; Mon, 7 Jan 2019 09:16:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN5aDAUO3f4JDLDZmwYn4ZkZ1tq7uUxvRZunidU2hUyeEIUQsU8HDRtLdIKB/ak+AooaQS4H X-Received: by 2002:a05:6000:1c8:: with SMTP id t8mr49476513wrx.146.1546881378131; Mon, 07 Jan 2019 09:16:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546881378; cv=none; d=google.com; s=arc-20160816; b=b+ghq7E8Ab+NXVy6QLiem6LYQyYFJGW+QTjH58d9vkZllydD26jzzHAF1PItGVAIA2 D+B5XVRmJ9ilEiIuX1NyrBW3TsWr2jeNZeDo2MgMCfHYV7m0zoMFFeGd7UwLzEShv+di UpTVw3nqSg9k9kzLK05600RDBAZOEiIpjgo4TZOtY+fKaSMmzNEcmBvFsccIff4whSNZ iy5dOQ3z8r1Cbk0FaIxVGkMIDhwpnVB8/r2zEZ0/Kkp9YiEXIZ0QZB4bNZp/Ft1kBZ6k bPvHlOHQcGRHXnel34+wdiM30whNNl8ws3p9axv/DUEhEH0NdTsgfA/623OnJ0YMxS+A 4NoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=nSkm073Bx3v9fUPp9jrgyRE1qp1za0Zg46AppemHHTE=; b=xy1N1YihWOUvHC3PLeijH6klYdhq+kVrK+Yu0zjZv9kRWnJUHuKyAtCjxAxJHdTx9E Ph4CmO6u3YfgYTAWfCqlz89vkltMFLMfxTKdQM8QaYQLTe4KlZaho3QpO6qyY4Eqf1DW YvWG36OrD8SbqXh5qxtXffzLZIoqivyDeQogvOURRmD9lGomB8AlEn7nl7PdtNIlEq4J cSU6dWiusF6vH+9UYl17EO1QLQU2NYpzm2SYY809HcCtwhlNn7pQVtmOsyUUZXeExXr9 SkaZWgclZZVuJ5WcmkahxlxajwwGI6Mr9XkMTbf0ahRe4wCttMEbpD1KRgEpGS9Skuvk nirw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EHSyO3wB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n4si44407438wrg.352.2019.01.07.09.16.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 09:16:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EHSyO3wB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:52845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggYVd-0006cc-29 for patch@linaro.org; Mon, 07 Jan 2019 12:16:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXpR-0005jd-9a for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXpP-0003H8-CK for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:41 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:35441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXpP-0002SM-4t for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:39 -0500 Received: by mail-wr1-x436.google.com with SMTP id 96so1091052wrb.2 for ; Mon, 07 Jan 2019 08:32:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nSkm073Bx3v9fUPp9jrgyRE1qp1za0Zg46AppemHHTE=; b=EHSyO3wB6b4KeEEYHTGvq33+JEJ0bLd6RtOHBTYvQOtATdQ55d7eFaJLtSgRqlzH8X nvRxBzw30ftKSHis1niXmtzIjAbxcm2kOQcY4Q9Nauneah4r6QRMY8BhAz974D1z/WCF wfhi+DMpWyfS2bv+iyxNoFkKpRT5KJLUrQLtk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nSkm073Bx3v9fUPp9jrgyRE1qp1za0Zg46AppemHHTE=; b=Iq311QciDiByEJggu/Vb6tLI+AR6N28UXr6nLRwb0wWlev8mZjLGGRUyE/F1cfze2a qKJ4NicaVZZE7TFugxR3u1uGU4kUYRgUIaXAt1Cl31fn71nwBezMBIadwcU2g7n1UdVU HTgDpzw1U+zJREMudvIcYZnLes2895kBXtj+byDEOKP0Rlk4BEJ7OxnI7gXgxapkWRR8 eqPVGae8egK2oXNhVJhOeNn0Kj/IFPUOPqNuG1jaKOxl8wa2YBTUSk6vKm2Ymyzfrs17 ug1qaH5Olt4Ro1qkAUuG4Ev3YHZRXMOLAsWpkDMY8e+GRT25HjSohTjg0+JwejE40uui 7q1w== X-Gm-Message-State: AJcUukc4O/Sf76gaLLJOco1PpfYj74X79fM+rRexfiKjG68IBSFlk9Tc oUgtBhTwQcOMLxKpW4TxOcWJoXV4hgeC/g== X-Received: by 2002:adf:8323:: with SMTP id 32mr50251797wrd.176.1546878720059; Mon, 07 Jan 2019 08:32:00 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j14sm46039759wrv.96.2019.01.07.08.31.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:31:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:31:12 +0000 Message-Id: <20190107163117.16269-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107163117.16269-1-peter.maydell@linaro.org> References: <20190107163117.16269-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 32/37] arm: Instantiate NRF51 Timers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Steffen Görtz Instantiates TIMER0 - TIMER2 Signed-off-by: Steffen Görtz Reviewed-by: Stefan Hajnoczi Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi Message-id: 20190103091119.9367-10-stefanha@redhat.com Signed-off-by: Peter Maydell --- include/hw/arm/nrf51_soc.h | 4 ++++ hw/arm/nrf51_soc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) -- 2.19.2 diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index 84e0278881b..39e613e1c97 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -15,11 +15,14 @@ #include "hw/char/nrf51_uart.h" #include "hw/misc/nrf51_rng.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/timer/nrf51_timer.h" #define TYPE_NRF51_SOC "nrf51-soc" #define NRF51_SOC(obj) \ OBJECT_CHECK(NRF51State, (obj), TYPE_NRF51_SOC) +#define NRF51_NUM_TIMERS 3 + typedef struct NRF51State { /*< private >*/ SysBusDevice parent_obj; @@ -30,6 +33,7 @@ typedef struct NRF51State { NRF51UARTState uart; NRF51RNGState rng; NRF51GPIOState gpio; + NRF51TimerState timer[NRF51_NUM_TIMERS]; MemoryRegion iomem; MemoryRegion sram; diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index db817fe5064..ef70bd62fa4 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -39,6 +39,8 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) NRF51State *s = NRF51_SOC(dev_soc); MemoryRegion *mr; Error *err = NULL; + uint8_t i = 0; + hwaddr base_addr = 0; if (!s->board_memory) { error_setg(errp, "memory property was not set"); @@ -112,6 +114,22 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) /* Pass all GPIOs to the SOC layer so they are available to the board */ qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL); + /* TIMER */ + for (i = 0; i < NRF51_NUM_TIMERS; i++) { + object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + + base_addr = NRF51_TIMER_BASE + i * NRF51_TIMER_SIZE; + + sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer[i]), 0, base_addr); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, + qdev_get_gpio_in(DEVICE(&s->cpu), + BASE_TO_IRQ(base_addr))); + } + create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE, NRF51_IOMEM_SIZE); create_unimplemented_device("nrf51_soc.ficr", NRF51_FICR_BASE, @@ -122,6 +140,8 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) static void nrf51_soc_init(Object *obj) { + uint8_t i = 0; + NRF51State *s = NRF51_SOC(obj); memory_region_init(&s->container, obj, "nrf51-container", UINT64_MAX); @@ -142,6 +162,12 @@ static void nrf51_soc_init(Object *obj) sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio), TYPE_NRF51_GPIO); + + for (i = 0; i < NRF51_NUM_TIMERS; i++) { + sysbus_init_child_obj(obj, "timer[*]", &s->timer[i], + sizeof(s->timer[i]), TYPE_NRF51_TIMER); + + } } static Property nrf51_soc_properties[] = {