From patchwork Mon Jun 6 10:37:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 630790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3rNWSX20m3z9sf9 for ; Mon, 6 Jun 2016 20:40:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yclVlRra; dkim-atps=neutral Received: from localhost ([::1]:41226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9rxa-0005Te-AB for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2016 06:40:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9rw6-0004GE-KG for qemu-devel@nongnu.org; Mon, 06 Jun 2016 06:39:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9rw4-0001wC-By for qemu-devel@nongnu.org; Mon, 06 Jun 2016 06:39:10 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9rw3-0001vz-Rk for qemu-devel@nongnu.org; Mon, 06 Jun 2016 06:39:08 -0400 Received: by mail-wm0-x241.google.com with SMTP id k184so8969111wme.2 for ; Mon, 06 Jun 2016 03:39:07 -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=HKYT+hGncX/QMX8rht9Q7g+kCxKA5o3yQiWRkLOHWig=; b=yclVlRraE+XHjb06WSVTgttB5di0TvHGF2Z2yIggqqIqLouteqyxrZ+FvKrPJAYzEK h7WonQyCCZckCZ7skuakRajwNfikOxXKwVoz8Juz2PEHBr6vHxvl7Y77LSlE+bR0TtpX 6lOvg4VaEe7qhO1N5peAyNt1iMeVm06GYWn9ylToBbgqdvDYGcjMf6jQ9oqdcoWKx74E ZQDWtGxPwQbttI94vYcrG3jDcC3h1XVZlcUR4oSp/WnE8LcVl6g2j7KRUkbuIwGAXYCa ttjzRu3vaVVMO4FOj/LO2wyaN/uBsDGHBD0+btPfMJvl78NLzNpdsqmTwGWiCgvLtMex iJww== 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=HKYT+hGncX/QMX8rht9Q7g+kCxKA5o3yQiWRkLOHWig=; b=WqcGv4OyzhRGE9TqpqGtake7+SeLa3KAX/BJNTY5vQqH5mZSsPJGu8knO6r+Kwy6VC tM41S3Z0T9qLhicAlY03v2+ujsoXOMSugr1eOaLpysuumEPB3TA+1aiRWBeujx1bpgmf o99COTUchBDc4AJWoEa7tlAQ5DKifzU+zmDKF2UmV6FHqc9g1ZNSKk7dihr5Mn50L8lM qMMb3gkqr8SJJNDRaH2cl55XZUJmKindH/dTcgZFxfuIEZEzrYVJKb+FqRXBFQKM95Lt G1HNvdtTb24PqLORwZUCXCiEYHvB6DEdTqRVIlGuE1Y/sgbH0cPnEL9OXWZqOL9X1TqG t8Ww== X-Gm-Message-State: ALyK8tKGQ5CcqSANVICBzn5W5gDWwjzFRV/aGqUZ+zekhajZWqj0H5n/Xp481HkNmTuFhg== X-Received: by 10.194.192.70 with SMTP id he6mr11865492wjc.64.1465209547025; Mon, 06 Jun 2016 03:39:07 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([31.210.186.130]) by smtp.gmail.com with ESMTPSA id d195sm13581428wmd.12.2016.06.06.03.39.05 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 06 Jun 2016 03:39:06 -0700 (PDT) From: Michael Rolnik X-Google-Original-From: Michael Rolnik To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 13:37:54 +0300 Message-Id: <1465209480-71364-4-git-send-email-rolnik@amazon.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1465209480-71364-1-git-send-email-rolnik@amazon.com> References: <1465209480-71364-1-git-send-email-rolnik@amazon.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 v4 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: Michael Rolnik , Michael Rolnik , rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Michael Rolnik --- hw/Makefile.objs | 1 + hw/avr/Makefile.objs | 1 + hw/avr/sample-io.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++ hw/avr/sample.c | 118 ++++++++++++++++++++++++++++ 4 files changed, 337 insertions(+) create mode 100644 hw/avr/Makefile.objs create mode 100644 hw/avr/sample-io.c create mode 100644 hw/avr/sample.c diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4a07ed4..262ca15 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -33,6 +33,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/ devices-dirs-$(CONFIG_SMBIOS) += smbios/ +devices-dirs-$(CONFIG_SOFTMMU) += avr/ devices-dirs-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs new file mode 100644 index 0000000..9f6be2f --- /dev/null +++ b/hw/avr/Makefile.objs @@ -0,0 +1 @@ +obj-y += sample.o sample-io.o diff --git a/hw/avr/sample-io.c b/hw/avr/sample-io.c new file mode 100644 index 0000000..7bf5e48 --- /dev/null +++ b/hw/avr/sample-io.c @@ -0,0 +1,217 @@ +/* + * 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 + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "cpu.h" +#include "include/hw/sysbus.h" + +#define TYPE_SAMPLEIO "SampleIO" +#define SAMPLEIO(obj) OBJECT_CHECK(SAMPLEIOState, (obj), TYPE_SAMPLEIO) + +#ifndef DEBUG_SAMPLEIO +#define DEBUG_SAMPLEIO 1 +#endif + +#define DPRINTF(fmt, args...) \ + do { \ + if (DEBUG_SAMPLEIO) { \ + fprintf(stderr, "[%s]%s: " fmt , TYPE_SAMPLEIO, __func__, ##args);\ + } \ + } \ + while (0) + +#define AVR_IO_CPU_REGS_SIZE 0x0020 +#define AVR_IO_CPU_IO_SIZE 0x0040 +#define AVR_IO_EXTERN_IO_SIZE 0x00a0 +#define AVR_IO_SIZE (AVR_IO_CPU_REGS_SIZE \ + + AVR_IO_CPU_IO_SIZE \ + + AVR_IO_EXTERN_IO_SIZE) + +#define AVR_IO_CPU_REGS_BASE 0x0000 +#define AVR_IO_CPU_IO_BASE (AVR_IO_CPU_REGS_BASE \ + + AVR_IO_CPU_REGS_SIZE) +#define AVR_IO_EXTERN_IO_BASE (AVR_IO_CPU_IO_BASE \ + + AVR_IO_CPU_IO_SIZE) + + +typedef struct SAMPLEIOState { + SysBusDevice parent; + + MemoryRegion iomem; + + AVRCPU *cpu; + + uint8_t io[0x40]; + uint8_t exio[0xa0]; +} SAMPLEIOState; + +static uint64_t sample_io_read(void *opaque, hwaddr offset, unsigned size); +static void sample_io_write(void *opaque, hwaddr offset, uint64_t value, unsigned size); +static int sample_io_init(DeviceState *sbd); +static void sample_io_class_init(ObjectClass *klass, void *data); +static void sample_io_register_types(void); + +static void write_Rx(CPUAVRState *env, int inst, uint8_t data); +static uint8_t read_Rx(CPUAVRState *env, int inst); + +static const +MemoryRegionOps sample_io_ops = { + .read = sample_io_read, + .write = sample_io_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static +Property sample_io_properties[] = { + DEFINE_PROP_END_OF_LIST(), +}; +static const +VMStateDescription sample_io_vmstate = { + .name = TYPE_SAMPLEIO, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) + { + VMSTATE_END_OF_LIST() + } +}; + +void write_Rx(CPUAVRState *env, int inst, uint8_t data) +{ + env->r[inst] = data; +} +uint8_t read_Rx(CPUAVRState *env, int inst) +{ + return env->r[inst]; +} + +static +void sample_io_reset(DeviceState *dev) +{ + DPRINTF("\n"); +} + +static +uint64_t sample_io_read(void *opaque, hwaddr offset, unsigned size) +{ + SAMPLEIOState *s = SAMPLEIO(opaque); + AVRCPU *cpu = s->cpu; + CPUAVRState *env = &cpu->env; + uint64_t res = 0; + + assert(size == 1); + + if (AVR_IO_CPU_REGS_BASE <= offset + && offset < (AVR_IO_CPU_REGS_BASE + AVR_IO_CPU_REGS_SIZE)) { + res = read_Rx(env, offset - AVR_IO_CPU_REGS_BASE); + } else if (AVR_IO_CPU_IO_BASE <= offset + && offset < (AVR_IO_CPU_IO_BASE + AVR_IO_CPU_IO_SIZE)) { + /* TODO: do IO related stuff here */ + res = s->io[offset - AVR_IO_CPU_IO_BASE]; + } else if (AVR_IO_EXTERN_IO_BASE <= offset + && offset < (AVR_IO_EXTERN_IO_BASE + AVR_IO_EXTERN_IO_SIZE)) { + /* TODO: do IO related stuff here */ + res = s->io[offset - AVR_IO_EXTERN_IO_BASE]; + } else { + g_assert_not_reached(); + } + + return res; +} + +static +void sample_io_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) +{ + SAMPLEIOState *s = SAMPLEIO(opaque); + AVRCPU *cpu = s->cpu; + CPUAVRState *env = &cpu->env; + + assert(size == 1); + + if (AVR_IO_CPU_REGS_BASE <= offset + && offset < (AVR_IO_CPU_REGS_BASE + AVR_IO_CPU_REGS_SIZE)) { + return write_Rx(env, offset - AVR_IO_CPU_REGS_BASE, value); + } else if (AVR_IO_CPU_IO_BASE <= offset + && offset < (AVR_IO_CPU_IO_BASE + AVR_IO_CPU_IO_SIZE)) { + /* TODO: do IO related stuff here */ + s->io[offset - AVR_IO_CPU_IO_BASE] = value; + } else if (AVR_IO_EXTERN_IO_BASE <= offset + && offset < (AVR_IO_EXTERN_IO_BASE + AVR_IO_EXTERN_IO_SIZE)) { + /* TODO: do IO related stuff here */ + s->io[offset - AVR_IO_EXTERN_IO_BASE] = value; + } else { + g_assert_not_reached(); + } +} + +static +int sample_io_init(DeviceState *dev) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + SAMPLEIOState *s = SAMPLEIO(dev); + + assert(AVR_IO_SIZE <= TARGET_PAGE_SIZE); + + s->cpu = AVR_CPU(qemu_get_cpu(0)); + + memory_region_init_io( + &s->iomem, + OBJECT(s), + &sample_io_ops, + s, + TYPE_SAMPLEIO, + AVR_IO_SIZE); + sysbus_init_mmio(sbd, &s->iomem); + + return 0; +} + +static +void sample_io_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + DPRINTF("\n"); + + dc->init = sample_io_init; + dc->reset = sample_io_reset; + dc->desc = "at90 io regs"; + dc->vmsd = &sample_io_vmstate; + dc->props = sample_io_properties; +} + +static const +TypeInfo sample_io_info = { + .name = TYPE_SAMPLEIO, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(SAMPLEIOState), + .class_init = sample_io_class_init, +}; + +static +void sample_io_register_types(void) +{ + DPRINTF("\n"); + type_register_static(&sample_io_info); +} + +type_init(sample_io_register_types) diff --git a/hw/avr/sample.c b/hw/avr/sample.c new file mode 100644 index 0000000..c616aae --- /dev/null +++ b/hw/avr/sample.c @@ -0,0 +1,118 @@ +/* + * 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 + * + */ + +#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_IOREG 0x00000000 +#define VIRT_BASE_ISRAM 0x00000100 +#define VIRT_BASE_EXMEM 0x00001100 +#define VIRT_BASE_EEPROM 0x00000000 + +#define VIRT_BASE_BOOT 0x0001e000 +#define PHYS_BASE_BOOT (PHYS_BASE_FLASH + VIRT_BASE_BOOT) + +#define SIZE_FLASH 0x00020000 +#define SIZE_IOREG 0x00000100 +#define SIZE_ISRAM 0x00001000 +#define SIZE_EXMEM 0x00010000 +#define SIZE_EEPROM 0x00001000 + +#define PHYS_BASE_FLASH (PHYS_CODE_BASE) +#define PHYS_BASE_IOREG (PHYS_DATA_BASE) +#define PHYS_BASE_ISRAM (PHYS_BASE_IOREG + SIZE_IOREG) +#define PHYS_BASE_EXMEM (PHYS_BASE_ISRAM + SIZE_ISRAM) +#define PHYS_BASE_EEPROM (PHYS_BASE_EXMEM + SIZE_EXMEM) + + +static void sample_init(MachineState *machine) +{ + MemoryRegion *address_space_mem = get_system_memory(); + + MemoryRegion *flash; + MemoryRegion *isram; + MemoryRegion *exmem; + + AVRCPU *cpu_avr; + DeviceState *io; + SysBusDevice *bus; + + flash = g_new(MemoryRegion, 1); + isram = g_new(MemoryRegion, 1); + exmem = g_new(MemoryRegion, 1); + + cpu_avr = cpu_avr_init("avr5"); + io = qdev_create(NULL, "SampleIO"); + bus = SYS_BUS_DEVICE(io); + qdev_init_nofail(io); + + memory_region_init_ram(flash, NULL, "flash", SIZE_FLASH, &error_fatal); + memory_region_init_ram(isram, NULL, "isram", SIZE_ISRAM, &error_fatal); + memory_region_init_ram(exmem, NULL, "exmem", SIZE_EXMEM, &error_fatal); + + memory_region_add_subregion(address_space_mem, PHYS_BASE_FLASH, flash); + memory_region_add_subregion(address_space_mem, PHYS_BASE_ISRAM, isram); + memory_region_add_subregion(address_space_mem, PHYS_BASE_EXMEM, exmem); + + vmstate_register_ram_global(flash); + vmstate_register_ram_global(isram); + vmstate_register_ram_global(exmem); + + memory_region_set_readonly(flash, true); + + char const *firmware = NULL; + char const *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); + + sysbus_mmio_map(bus, 0, PHYS_BASE_IOREG); +} + +static void sample_machine_init(MachineClass *mc) +{ + mc->desc = "sample"; + mc->init = sample_init; + mc->is_default = 1; +} + +DEFINE_MACHINE("sample", sample_machine_init)