From patchwork Fri Aug 3 05:21:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 143378 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp43645ljj; Thu, 2 Aug 2018 22:24:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdPZaB7HCSsMHnvMIjcgFdRdzdV1MDS8uAmMrBgaRwuwKLOmrrLTUdh9lmsFWWY4Pgb+qVn X-Received: by 2002:ac8:2908:: with SMTP id y8-v6mr2380977qty.45.1533273858238; Thu, 02 Aug 2018 22:24:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533273858; cv=none; d=google.com; s=arc-20160816; b=VcTpyza7Cv60KNg4r2LE6SRvhWS3aeNxFMAklYY07VHD2z4toH22VcRdRpyMTQfuPD kV1h7pTCds4cSm/bRc8ZTWrur4acA0awDtC6e8whlrhmxVoIfQaDiE4Mp+OLMNewZAeJ AMTbV1jDmCaL43kO3xCRsiTtoMBT6QZRnhXs2W1CIdNIKlINYrfVsDUQ9JIeTyaRr7Yi JqH4psoLQ7o0xvrWIl6dxEhJ9CsXEdd6D0M+BLbYlGCWd9tkJxtjhqVbs+zsWYgHWrZY gIx9qGMu3md8vZtbQiQKXLRilIGfg3E7ouHqdU7AGALdMzvrN5xfhimv8Uc5w3Qssowd odVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=uVpIy0tbum8TS+4LeuR9ToTnLJtiAlEi8k9IZIn1ZjE=; b=pK1p5C+ygcWW1c7qGhTlgmTbJqVhFKWo7eHNfNTT2FRcgdroFDpe8pWEXtAIFNMwWt raya9ZaRQoVMLqeFQRR7RukVWTinT0Tdu5LVXgDwUMXKpp+7pMNKCJzVHkgBEu4thDtE 3081OQgyHhMf9WYLhog/AV1OHvUPfdTNHWpiYQdIxWhUaJxYr3S5hIIC6btnBgTvOsbA DvMNxbYpjYYrraCRHW/WJ+zlJCONuIy22F/02zxwy2p7kq7H7ezLlQJi1Ii4qhFZNbMT 2KE+ONaQZOwo3AFVcF0AX4cyl9K8aFfuWK10xxwHmIlqvhIeZXCwpDL0488QtC0T67hk trqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nMwAWy+F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u33-v6si2192421qvh.150.2018.08.02.22.24.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 02 Aug 2018 22:24:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nMwAWy+F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:49008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flSZV-00035p-J1 for patch@linaro.org; Fri, 03 Aug 2018 01:24:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flSXV-0001nL-8w for qemu-devel@nongnu.org; Fri, 03 Aug 2018 01:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flSXU-0004vU-9O for qemu-devel@nongnu.org; Fri, 03 Aug 2018 01:22:13 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:42541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flSXU-0004uv-2F; Fri, 03 Aug 2018 01:22:12 -0400 Received: by mail-pl0-x241.google.com with SMTP id z7-v6so2044079plo.9; Thu, 02 Aug 2018 22:22:11 -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; bh=uVpIy0tbum8TS+4LeuR9ToTnLJtiAlEi8k9IZIn1ZjE=; b=nMwAWy+FgIlT34iAu1gKv8rw0O8YAGvx1k3JV0uGPVNcOp+lDdm9R5JaFEiCLhqOWI hlUoXp9Srk+0r467AKsOc6e/QDogeDhZZUPDgRqwI772OkwUF0SktbmDEDoB1NAuRWcC e+ZpNgT047hRlP6F/AsE+nLdYFSUoP5bjAolpGwwNvK++q3g0ujZBZTGGIvWenO5AyPM luqmPb8QiSvSfDHWKZBS+yhLzNj2aBm7fVlBaxLFN8f/kZvK4l4D2fk+5kAfX+rVq3xE rwnqd07kQLpz8snu8ci6dnEbnzolXsozk9h/vp5toHbR5UBllAcdaxFGUo14F88pvkoX Le3g== 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; bh=uVpIy0tbum8TS+4LeuR9ToTnLJtiAlEi8k9IZIn1ZjE=; b=nJTJtzAKPp/+MbUeYIfnqrC/1J5sfK549XittNE8KM1OWFTsgzisU7es/HqO9iDzZJ 5KQ6loMgLO0PKYZ6V6X/F6W3TJ6KPZ88uQGQ4VMNSYNtsQOXTBJNR4QuSh5clUOsF2S1 zN0nsDMYMZyCiCdGkD0XpbeXmVCqhDf+0qwqaBRYkE9oomDEGkaMmDht4d8jrJnQ5XS0 2kQQ2bSZsJYFznrJDn42qECIoNrZ5eRr4gepE4kkRm8NkxWuiq7ek+oIDzuNy7PMsONM lm+vqqWZg/aJSWgQSSiO/nzR55brvoaU1dC2+rhOm9aAoB6cco1Cetuw/xm62o26X+bk BZHQ== X-Gm-Message-State: AOUpUlGltw9De0aX3gkX/9kbmuIjGS8H03hBgZYCB9+uZYq+N7M+LNiW nN6i5GpbnKk+Z7+gUGEuk007wgg0 X-Received: by 2002:a17:902:8481:: with SMTP id c1-v6mr2117962plo.177.1533273731092; Thu, 02 Aug 2018 22:22:11 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.18]) by smtp.gmail.com with ESMTPSA id f67-v6sm9069888pfe.75.2018.08.02.22.22.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Aug 2018 22:22:10 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 03 Aug 2018 14:52:03 +0930 From: Joel Stanley To: Peter Maydell Date: Fri, 3 Aug 2018 14:51:37 +0930 Message-Id: <20180803052137.10602-4-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803052137.10602-1-joel@jms.id.au> References: <20180803052137.10602-1-joel@jms.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v4 3/3] arm: Add BBC micro:bit machine 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: , Cc: Stefan Hajnoczi , =?utf-8?q?Steffen_G=C3=B6rtz?= , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Jim Mussared , Julia Suvorova Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds the base for a machine model of the BBC micro:bit: https://en.wikipedia.org/wiki/Micro_Bit This is a system with a nRF51 SoC containing the main processor, with various peripherals on board. Reviewed-by: Stefan Hajnoczi Signed-off-by: Joel Stanley --- v2: - Instead of setting kernel filename property, load the image directly - Add link to hardware overview website v3: - Rebase microbit on m0 changes - Remove hard-coded flash size and retrieve from the soc - Add Stefan's reviewed-by --- hw/arm/Makefile.objs | 2 +- hw/arm/microbit.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 hw/arm/microbit.c -- 2.17.1 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index e31875ec69bc..2798a257921d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -36,4 +36,4 @@ obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o obj-$(CONFIG_IOTKIT) += iotkit.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c new file mode 100644 index 000000000000..ecf64e883f4f --- /dev/null +++ b/hw/arm/microbit.c @@ -0,0 +1,54 @@ +/* + * BBC micro:bit machine + * http://tech.microbit.org/hardware/ + * + * Copyright 2018 Joel Stanley + * + * This code is licensed under the GPL version 2 or later. See + * the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/arm/arm.h" +#include "exec/address-spaces.h" + +#include "hw/arm/nrf51_soc.h" + +typedef struct { + MachineState parent; + + NRF51State nrf51; +} MICROBITMachineState; + +#define TYPE_MICROBIT_MACHINE "microbit" + +#define MICROBIT_MACHINE(obj) \ + OBJECT_CHECK(MICROBITMachineState, obj, TYPE_MICROBIT_MACHINE) + +static void microbit_init(MachineState *machine) +{ + MICROBITMachineState *s = g_new(MICROBITMachineState, 1); + MemoryRegion *system_memory = get_system_memory(); + Object *soc; + + object_initialize(&s->nrf51, sizeof(s->nrf51), TYPE_NRF51_SOC); + soc = OBJECT(&s->nrf51); + object_property_add_child(OBJECT(machine), "nrf51", soc, &error_fatal); + object_property_set_link(soc, OBJECT(system_memory), + "memory", &error_abort); + + object_property_set_bool(soc, true, "realized", &error_abort); + + arm_m_profile_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + NRF51_SOC(soc)->flash_size); +} + +static void microbit_machine_init(MachineClass *mc) +{ + mc->desc = "BBC micro:bit"; + mc->init = microbit_init; + mc->max_cpus = 1; +} +DEFINE_MACHINE("microbit", microbit_machine_init);