From patchwork Tue Sep 9 08:24:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 387205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 56BA014011D for ; Tue, 9 Sep 2014 18:25:12 +1000 (EST) Received: from localhost ([::1]:48203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGje-0003iF-47 for incoming@patchwork.ozlabs.org; Tue, 09 Sep 2014 04:25:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGit-0002M7-I5 for qemu-devel@nongnu.org; Tue, 09 Sep 2014 04:24:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRGin-0007KY-1j for qemu-devel@nongnu.org; Tue, 09 Sep 2014 04:24:23 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:38994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGim-0007J0-MS for qemu-devel@nongnu.org; Tue, 09 Sep 2014 04:24:16 -0400 Received: by mail-pa0-f44.google.com with SMTP id kx10so4929379pab.17 for ; Tue, 09 Sep 2014 01:24:14 -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=+3DCrw5Tk3jdXYEu7tG7u+oKof11l9kXZLFZQUnAydc=; b=IvS4RmtytKXzJtwfNv9HHF1gboAacqYY322mwXqIFjeNXDhTpAaBKdt77ypjTYHpxM C2dwWruyAIcWCNzX/tod8Dxs6eGfeHgoz0cXyUjwKNVlGYdfKvOIV30cP+6N2jZFH+DN 1AgltFVF+ioxvBkpOkNj4CP1ZF/A1shwzYLzeydafXgMSa0P3AxzX4l4xgnH0jMrTV9l GnMyxshucUF0pKveRkdD4OdGBQatQmvzCeYxVVaE37OZyyh089vv16ZLnvs6HVmctPOS ZujyjrUBYzdlAj+VXfCWU7pAwfimEXI4tL4VBPL2rtEMgV17oQVPR2dVVHLAAytH2WVi LsOQ== X-Received: by 10.66.186.167 with SMTP id fl7mr54207120pac.14.1410251054680; Tue, 09 Sep 2014 01:24:14 -0700 (PDT) Received: from localhost (123-243-147-200.static.tpgi.com.au. [123.243.147.200]) by mx.google.com with ESMTPSA id pa2sm10983440pdb.84.2014.09.09.01.24.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 09 Sep 2014 01:24:14 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 9 Sep 2014 18:24:10 +1000 Message-Id: <29f8fc474a8b2834da55e2b152ff547eceaf7780.1410250628.git.alistair23@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22c Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, konstanty@ieee.org Subject: [Qemu-devel] [RFC v1 3/6] stm32f205_SYSCFG: Add the stm32f205 SYSCFG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds the stm32f205 System Configuration Controller. This is used to configure what memory is mapped at address 0 (although that is not supported) as well as configure how the EXTI interrupts work (also not supported at the moment). This device is not required for basic examples, but more complex systems will require it (as well as the EXTI device) Signed-off-by: Alistair Francis --- V2: - Update the commit message - Small changes thanks to Peter C - Rename for the Netduino 2 and it's SoC hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 +++++++++++++++++++++++++++++++++++++ include/hw/misc/stm32f205_syscfg.h | 59 ++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 hw/misc/stm32f205_syscfg.c create mode 100644 include/hw/misc/stm32f205_syscfg.h diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 979e532..83a7703 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -39,5 +39,6 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o +obj-$(CONFIG_NETDUINO2) += stm32f205_syscfg.o obj-$(CONFIG_PVPANIC) += pvpanic.o diff --git a/hw/misc/stm32f205_syscfg.c b/hw/misc/stm32f205_syscfg.c new file mode 100644 index 0000000..226bf74 --- /dev/null +++ b/hw/misc/stm32f205_syscfg.c @@ -0,0 +1,160 @@ +/* + * STM32F205xx SYSCFG + * + * Copyright (c) 2014 Alistair Francis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "hw/misc/stm32f205_syscfg.h" + +#ifndef STM_SYSCFG_ERR_DEBUG +#define STM_SYSCFG_ERR_DEBUG 1 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (STM_SYSCFG_ERR_DEBUG >= lvl) { \ + fprintf(stderr, "stm32f205xx_syscfg: %s:" fmt, __func__, ## args); \ + } \ +} while (0); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static void syscfg_reset(DeviceState *dev) +{ + Stm32f205SyscfgState *s = STM32F205xx_SYSCFG(dev); + + s->syscfg_memrmp = 0x00000000; + s->syscfg_pmc = 0x00000000; + s->syscfg_exticr1 = 0x00000000; + s->syscfg_exticr2 = 0x00000000; + s->syscfg_exticr3 = 0x00000000; + s->syscfg_exticr4 = 0x00000000; + s->syscfg_cmpcr = 0x00000000; +} + +static uint64_t stm32f205xx_syscfg_read(void *opaque, hwaddr addr, + unsigned int size) +{ + Stm32f205SyscfgState *s = opaque; + + DB_PRINT("0x%x\n", (uint) addr); + + switch (addr) { + case SYSCFG_MEMRMP: + return s->syscfg_memrmp; + case SYSCFG_PMC: + return s->syscfg_pmc; + case SYSCFG_EXTICR1: + return s->syscfg_exticr1; + case SYSCFG_EXTICR2: + return s->syscfg_exticr2; + case SYSCFG_EXTICR3: + return s->syscfg_exticr3; + case SYSCFG_EXTICR4: + return s->syscfg_exticr4; + case SYSCFG_CMPCR: + return s->syscfg_cmpcr; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "STM32F205xx_syscfg_read: Bad offset %x\n", (int)addr); + return 0; + } + + return 0; +} + +static void stm32f205xx_syscfg_write(void *opaque, hwaddr addr, + uint64_t val64, unsigned int size) +{ + Stm32f205SyscfgState *s = opaque; + uint32_t value = (uint32_t) val64; + + DB_PRINT("0x%x, 0x%x\n", value, (uint) addr); + + switch (addr) { + case SYSCFG_MEMRMP: + qemu_log_mask(LOG_UNIMP, + "STM32F205xx_syscfg_write: Changeing the memory " \ + "mapping isn't supported in QEMU\n"); + return; + case SYSCFG_PMC: + qemu_log_mask(LOG_UNIMP, + "STM32F205xx_syscfg_write: Peripheral mode " \ + "configuration isn't supported in QEMU\n"); + return; + case SYSCFG_EXTICR1: + s->syscfg_exticr1 = (value & 0xFF); + return; + case SYSCFG_EXTICR2: + s->syscfg_exticr2 = (value & 0xFF); + return; + case SYSCFG_EXTICR3: + s->syscfg_exticr3 = (value & 0xFF); + return; + case SYSCFG_EXTICR4: + s->syscfg_exticr4 = (value & 0xFF); + return; + case SYSCFG_CMPCR: + s->syscfg_cmpcr = value; + return; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "STM32F205xx_syscfg_write: Bad offset %x\n", (int)addr); + } +} + +static const MemoryRegionOps stm32f205xx_syscfg_ops = { + .read = stm32f205xx_syscfg_read, + .write = stm32f205xx_syscfg_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static void stm32f205xx_syscfg_init(Object *obj) +{ + Stm32f205SyscfgState *s = STM32F205xx_SYSCFG(obj); + + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); + + memory_region_init_io(&s->mmio, obj, &stm32f205xx_syscfg_ops, s, + TYPE_STM32F205_SYSCFG, 0x2000); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static void stm32f205xx_syscfg_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->reset = syscfg_reset; +} + +static const TypeInfo stm32f205xx_syscfg_info = { + .name = TYPE_STM32F205_SYSCFG, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(Stm32f205SyscfgState), + .instance_init = stm32f205xx_syscfg_init, + .class_init = stm32f205xx_syscfg_class_init, +}; + +static void stm32f205xx_syscfg_register_types(void) +{ + type_register_static(&stm32f205xx_syscfg_info); +} + +type_init(stm32f205xx_syscfg_register_types) diff --git a/include/hw/misc/stm32f205_syscfg.h b/include/hw/misc/stm32f205_syscfg.h new file mode 100644 index 0000000..ab26c89 --- /dev/null +++ b/include/hw/misc/stm32f205_syscfg.h @@ -0,0 +1,59 @@ +/* + * STM32F205xx SYSCFG + * + * Copyright (c) 2014 Alistair Francis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef HW_ST_SYSCFG_H +#define HW_ST_SYSCFG_H + +#include "hw/sysbus.h" +#include "hw/hw.h" + +#define SYSCFG_MEMRMP 0x00 +#define SYSCFG_PMC 0x04 +#define SYSCFG_EXTICR1 0x08 +#define SYSCFG_EXTICR2 0x0C +#define SYSCFG_EXTICR3 0x10 +#define SYSCFG_EXTICR4 0x14 +#define SYSCFG_CMPCR 0x20 + +#define TYPE_STM32F205_SYSCFG "stm32f205xx-syscfg" +#define STM32F205xx_SYSCFG(obj) \ + OBJECT_CHECK(Stm32f205SyscfgState, (obj), TYPE_STM32F205_SYSCFG) + +typedef struct { + SysBusDevice parent_obj; + + MemoryRegion mmio; + + uint32_t syscfg_memrmp; + uint32_t syscfg_pmc; + uint32_t syscfg_exticr1; + uint32_t syscfg_exticr2; + uint32_t syscfg_exticr3; + uint32_t syscfg_exticr4; + uint32_t syscfg_cmpcr; + + qemu_irq irq; +} Stm32f205SyscfgState; + +#endif