From patchwork Fri Jul 29 15:32:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 9252615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 49FC46075F for ; Fri, 29 Jul 2016 15:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3243C2835B for ; Fri, 29 Jul 2016 15:37:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25E2C28365; Fri, 29 Jul 2016 15:37:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 65D6A2835B for ; Fri, 29 Jul 2016 15:37:13 +0000 (UTC) Received: from localhost ([::1]:60213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT9qa-00081t-5i for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jul 2016 11:37:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT9mM-0004TV-I1 for qemu-devel@nongnu.org; Fri, 29 Jul 2016 11:32:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bT9mL-0001pH-2k for qemu-devel@nongnu.org; Fri, 29 Jul 2016 11:32:50 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT9mK-0001p8-Ov for qemu-devel@nongnu.org; Fri, 29 Jul 2016 11:32:49 -0400 Received: by mail-wm0-x241.google.com with SMTP id x83so16212261wma.3 for ; Fri, 29 Jul 2016 08:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pe+ZmeCJGHDv89GQFtQc+pM6CgonYqrXaB4qvNpC7mc=; b=WgmASd0k4xoFoFggzNwa+N69MYvI5WJjlvsq4d2hbBdRxLlg9lmpqmxxpPPTnSvUhW IOYvhNg9XTcvJfeoRJKmIE841MY3MWnePvCXf4MlT7Y15g3Bys8C9TAowLBu7naIHfW0 3DdFbg34uHCcBq13z/KCzAqlGcTi9a/ObtfMiA6ZSjsPmUgfN5qU79vXfnDGfWrN49Wy 8/TFbwoVxgSwJQYjeUkUNRRm0tM5sdw+m83uqpoxbLJuzWQhRndpz5q6U4kDoHHbGg0w JERa7uo7hfStTmeQiBlYFNZsJfKcsPwZPi4Ke3cf0sALarhgTBt6A3lMsyKkbxRONk3j 8aow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pe+ZmeCJGHDv89GQFtQc+pM6CgonYqrXaB4qvNpC7mc=; b=hALgl5vxoDMFmTlQMYzXR7Yo9Re4VbkfZ+W1Oz1o3eIlWWlEejQjt9UILsQlhG7wJl ycOU7vD4vIWdEp5hAozvc6m9Sddk8nvp5I5aKVSdZiuDJSckH1cfOLhK2jl2ROpuCm53 XcDP2KP3jEpozktny2SZKrYOunC+19k+FPuwoxsH1B2d6GhEXsXxU1E9Te48P59xlSX5 CN1TJ5bKPrMmdPrTwrvBcwSJmEvBiUwye1QhivMGkB60XFD8ngeAAbHTHCVtJTqPTxLm 8js2QbYcxWE7zmQoCW88bserpRMb5xCaYsF2fSFgcGhCCiwl7kJO04YPenegtl1fnMC6 KubA== X-Gm-Message-State: AEkoous7aPHKd8bvHtL/UfyOcI4W5ARaCvBazjc8OGG39W1XtxaLS7R0sNINHBQ18T1CIQ== X-Received: by 10.28.15.194 with SMTP id 185mr35355277wmp.58.1469806367962; Fri, 29 Jul 2016 08:32:47 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([141.226.161.178]) by smtp.gmail.com with ESMTPSA id f10sm17067332wje.14.2016.07.29.08.32.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jul 2016 08:32:46 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2016 18:32:19 +0300 Message-Id: <1469806345-67852-4-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1469806345-67852-1-git-send-email-mrolnik@gmail.com> References: <1469806345-67852-1-git-send-email-mrolnik@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v14 3/9] target-avr: adding a sample AVR board 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: peter.maydell@linaro.org, Michael Rolnik , rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Michael Rolnik --- MAINTAINERS | 6 +++ hw/avr/Makefile.objs | 21 +++++++++ hw/avr/sample.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 hw/avr/Makefile.objs create mode 100644 hw/avr/sample.c diff --git a/MAINTAINERS b/MAINTAINERS index d1439a8..1435040 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -110,6 +110,12 @@ F: disas/arm.c F: disas/arm-a64.cc F: disas/libvixl/ +AVR +M: Michael Rolnik +S: Maintained +F: target-avr/ +F: hw/avr/ + CRIS M: Edgar E. Iglesias S: Maintained diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs new file mode 100644 index 0000000..8f537c9 --- /dev/null +++ b/hw/avr/Makefile.objs @@ -0,0 +1,21 @@ +# +# QEMU AVR CPU +# +# Copyright (c) 2016 Michael Rolnik +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see +# +# + +obj-y += sample.o diff --git a/hw/avr/sample.c b/hw/avr/sample.c new file mode 100644 index 0000000..2c1cd84 --- /dev/null +++ b/hw/avr/sample.c @@ -0,0 +1,117 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2016 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + */ + +/* + * NOTE: + * This is not a real AVR board !!! This is an example !!! + * + * This example can be used to build a real AVR board. + * + * This example board loads provided binary file into flash memory and + * executes it from 0x00000000 address in the code memory space. + * + * This example does not implement/install any AVR specific on board + * devices except SampleIO device which is an example as well. + * + * Currently used for AVR CPU validation + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "cpu.h" +#include "hw/hw.h" +#include "sysemu/sysemu.h" +#include "sysemu/qtest.h" +#include "ui/console.h" +#include "hw/boards.h" +#include "hw/devices.h" +#include "hw/loader.h" +#include "qemu/error-report.h" +#include "exec/address-spaces.h" +#include "include/hw/sysbus.h" + +#define VIRT_BASE_FLASH 0x00000000 +#define VIRT_BASE_ISRAM 0x00000100 +#define VIRT_BASE_EXMEM 0x00001100 +#define VIRT_BASE_EEPROM 0x00000000 + +#define SIZE_FLASH 0x00020000 +#define SIZE_ISRAM 0x00001000 +#define SIZE_EXMEM 0x00010000 +#define SIZE_EEPROM 0x00001000 +#define SIZE_IOREG SIZE_REGS + +#define PHYS_BASE_FLASH (PHYS_BASE_CODE) + +#define PHYS_BASE_ISRAM (PHYS_BASE_DATA) +#define PHYS_BASE_EXMEM (PHYS_BASE_ISRAM + SIZE_ISRAM) +#define PHYS_BASE_EEPROM (PHYS_BASE_EXMEM + SIZE_EXMEM) + +#define PHYS_BASE_IOREG (PHYS_BASE_REGS + 0x20) + +static void sample_init(MachineState *machine) +{ + MemoryRegion *address_space_mem = get_system_memory(); + + MemoryRegion *ram; + MemoryRegion *flash; + unsigned ram_size = SIZE_ISRAM + SIZE_EXMEM; + + AVRCPU *cpu_avr ATTRIBUTE_UNUSED; + + ram = g_new(MemoryRegion, 1); + flash = g_new(MemoryRegion, 1); + + cpu_avr = cpu_avr_init("avr5"); + + memory_region_allocate_system_memory(ram, NULL, "avr.ram", ram_size); + memory_region_add_subregion(address_space_mem, PHYS_BASE_ISRAM, ram); + + memory_region_init_rom(flash, NULL, "avr.flash", SIZE_FLASH, &error_fatal); + memory_region_add_subregion(address_space_mem, PHYS_BASE_FLASH, flash); + vmstate_register_ram_global(flash); + + const char *firmware = NULL; + const char *filename; + + if (machine->firmware) { + firmware = machine->firmware; + } + + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); + if (!filename) { + error_report("Could not find flash image file '%s'", firmware); + exit(1); + } + + load_image_targphys(filename, PHYS_BASE_FLASH, SIZE_FLASH); +} + +static void sample_machine_init(MachineClass *mc) +{ + mc->desc = "AVR sample/example board"; + mc->init = sample_init; + mc->is_default = 1; +} + +DEFINE_MACHINE("sample", sample_machine_init) +