From patchwork Mon Jun 29 20:12:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Christophe Dubois X-Patchwork-Id: 489402 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 BC639140783 for ; Tue, 30 Jun 2015 06:17:00 +1000 (AEST) Received: from localhost ([::1]:43861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9fUA-0001bF-TN for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2015 16:16:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9fPf-0002Fo-04 for qemu-devel@nongnu.org; Mon, 29 Jun 2015 16:12:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9fPb-0000l3-Ek for qemu-devel@nongnu.org; Mon, 29 Jun 2015 16:12:18 -0400 Received: from zose-mta05.web4all.fr ([185.49.20.50]:56954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9fPa-0000kw-Ul for qemu-devel@nongnu.org; Mon, 29 Jun 2015 16:12:15 -0400 Received: from localhost (localhost [127.0.0.1]) by zose-mta05.web4all.fr (Postfix) with ESMTP id 8839B40663 for ; Mon, 29 Jun 2015 22:12:14 +0200 (CEST) Received: from zose-mta05.web4all.fr ([127.0.0.1]) by localhost (zose-mta05.web4all.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id UIgswMoMEJsy; Mon, 29 Jun 2015 22:12:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zose-mta05.web4all.fr (Postfix) with ESMTP id E8DF640743; Mon, 29 Jun 2015 22:12:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at zose-mta-05.w4a.fr Received: from zose-mta05.web4all.fr ([127.0.0.1]) by localhost (zose-mta05.web4all.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id YQpJ7WK3hGxw; Mon, 29 Jun 2015 22:12:13 +0200 (CEST) Received: from localhost.localdomain (smm49-1-78-235-240-156.fbx.proxad.net [78.235.240.156]) by zose-mta05.web4all.fr (Postfix) with ESMTPSA id 8AB2540663; Mon, 29 Jun 2015 22:12:13 +0200 (CEST) From: Jean-Christophe Dubois To: qemu-devel@nongnu.org Date: Mon, 29 Jun 2015 22:12:11 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.49.20.50 Cc: Jean-Christophe Dubois Subject: [Qemu-devel] [PATCH v8 10/11] i.MX25: Add support for the i.MX25 PDK 3DS 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 just adds the required memory arround the i.MX25 SOC. Signed-off-by: Jean-Christophe Dubois --- Changes since v1: * Added a ds1338 I2C device for qtest purpose. Changes since v2: * none Changes since v3: * Rework GPL header * use I2C constructor helper. Changes since v4: * use sysbus_create_simple() instead of I2C constructor helper Changes since v5: * Add ds1338 only for qtest mode. * small comment fixes. Changes since v6: * Allow for more than 4 serial if suppoted by Qemu. Changes since v7: * Move the SOC part into its own file. hw/arm/Makefile.objs | 2 +- hw/arm/imx25_3ds.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 hw/arm/imx25_3ds.c diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index b89c31d..c03228d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -13,4 +13,4 @@ obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o -obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o +obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_3ds.o diff --git a/hw/arm/imx25_3ds.c b/hw/arm/imx25_3ds.c new file mode 100644 index 0000000..ce97946 --- /dev/null +++ b/hw/arm/imx25_3ds.c @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2013 Jean-Christophe Dubois + * + * 3Dstack Board System emulation. + * + * Based on hw/arm/kzm.c + * + * Copyright (c) 2008 OKL and 2011 NICTA + * Written by Hans at OK-Labs + * Updated by Peter Chubb. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#include "hw/arm/fsl-imx25.h" +#include "hw/boards.h" +#include "qemu/error-report.h" +#include "exec/address-spaces.h" +#include "sysemu/qtest.h" +#include "hw/i2c/i2c.h" + +/* Memory map for 3D-Stack Emulation Baseboard: + * 0x00000000-0x00003fff 16k ROM IGNORED + * 0x00004000-0x00403fff Reserved IGNORED + * 0x00404000-0x00408fff 20k ROM IGNORED + * 0x00409000-0x0fffffff Reserved IGNORED + * 0x10000000-0x1fffffff Reserved IGNORED + * 0x20000000-0x2fffffff Reserved IGNORED + * 0x30000000-0x3fffffff Reserved IGNORED + * 0x40000000-0x43efffff Reserved IGNORED + * 0x43f00000-0x6fffffff I.MX25 Internal Register Space + * 0x43f00000 IO_AREA0 + * 0x43f80000 I2C0 EMULATED + * 0x43f84000 I2C2 EMULATED + * 0x43f98000 I2C1 EMULATED + * 0x43f90000 UART1 EMULATED + * 0x43f94000 UART2 EMULATED + * 0x43fb0000 UART4 IGNORED + * 0x43fb4000 UART5 IGNORED + * 0x5000c000 UART3 EMULATED + * 0x50038000 FEC EMULATED + * 0x53f80000 CCM EMULATED + * 0x53f84000 GPT 4 EMULATED + * 0x53f88000 GPT 3 EMULATED + * 0x53f8c000 GPT 2 EMULATED + * 0x53f90000 GPT 1 EMULATED + * 0x53f94000 PIT 1 EMULATED + * 0x53f98000 PIT 2 EMULATED + * 0x53f9c000 GPIO-4 EMULATED + * 0x53fa4000 GPIO-3 EMULATED + * 0x53fcc000 GPIO-1 EMULATED + * 0x53fd0000 GPIO-2 EMULATED + * 0x68000000 ASIC EMULATED + * 0x78000000-0x7801ffff SRAM EMULATED + * 0x78020000-0x7fffffff SRAM Aliasing EMULATED + * 0x80000000-0x87ffffff RAM + Alias EMULATED + * 0x90000000-0x9fffffff RAM + Alias EMULATED + * 0xa0000000-0xa7ffffff Flash IGNORED + * 0xa8000000-0xafffffff Flash IGNORED + * 0xb0000000-0xb1ffffff SRAM IGNORED + * 0xb2000000-0xb3ffffff SRAM IGNORED + * 0xb4000000-0xb5ffffff CS4 IGNORED + * 0xb6000000-0xb8000fff Reserved IGNORED + * 0xb8001000-0xb8001fff SDRAM CTRL reg IGNORED + * 0xb8002000-0xb8002fff WEIM CTRL reg IGNORED + * 0xb8003000-0xb8003fff M3IF CTRL reg IGNORED + * 0xb8004000-0xb8004fff EMI CTRL reg IGNORED + * 0xb8005000-0xbaffffff Reserved IGNORED + * 0xbb000000-0xbb000fff NAND flash area buf IGNORED + * 0xbb001000-0xbb0011ff NAND flash reserved IGNORED + * 0xbb001200-0xbb001dff Reserved IGNORED + * 0xbb001e00-0xbb001fff NAN flash CTRL reg IGNORED + * 0xbb012000-0xbfffffff Reserved IGNORED + * 0xc0000000-0xffffffff Reserved IGNORED + */ + +typedef struct imx25_3ds { + FslImx25State soc; + MemoryRegion ram[2]; + MemoryRegion ram_alias; + MemoryRegion sram; + MemoryRegion sram_alias; +} imx25_3ds; + +#define IMX25_SRAM_ADDRESS (0x78000000) +#define IMX25_SRAMSIZE (128*1024) +#define IMX25_CS_SRAMSIZE (128*1024*1024) +#define IMX25_3DS_ADDRESS (0x80000000) +#define IMX25_CS_RAMSIZE (256*1024*1024) + +static struct arm_boot_info imx25_3ds_binfo; + +static void imx25_3ds_init(MachineState *machine) +{ + imx25_3ds *s = g_new0(imx25_3ds, 1); + Error *err = NULL; + int i; + + object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25); + object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), + &error_abort); + + object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); + if (err != NULL) { + error_report("%s", error_get_pretty(err)); + exit(1); + } + + /* We need to initialize our memory */ + + if (machine->ram_size > (2 * IMX25_CS_RAMSIZE)) { + error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, " + "reduced to %x", machine->ram_size, + 2 * IMX25_CS_RAMSIZE); + machine->ram_size = 2 * IMX25_CS_RAMSIZE; + } + + /* create our main memory */ + for (i = 0; i <= (machine->ram_size / IMX25_CS_RAMSIZE); i++) { + ram_addr_t blk_size = machine->ram_size - (IMX25_CS_RAMSIZE * i); + char ram_name[20]; + + if (blk_size > IMX25_CS_RAMSIZE) { + blk_size = IMX25_CS_RAMSIZE; + } + + if (blk_size == 0) { + break; + } + + sprintf(ram_name, "imx25.ram%d", i); + + memory_region_init_ram(&s->ram[i], NULL, ram_name, blk_size, &error_abort); + vmstate_register_ram_global(&s->ram[i]); + memory_region_add_subregion(get_system_memory(), IMX25_3DS_ADDRESS + + (IMX25_CS_RAMSIZE * i), &s->ram[i]); + + /* Add ram alias */ + if (blk_size < IMX25_CS_RAMSIZE) { + char alias_name[20]; + + sprintf(alias_name, "ram.alias%d", i); + + memory_region_init_alias(&s->ram_alias, NULL, alias_name, + &s->ram[i], 0, + IMX25_CS_RAMSIZE - blk_size); + memory_region_add_subregion(get_system_memory(), IMX25_3DS_ADDRESS + + (IMX25_CS_RAMSIZE * i) + blk_size, + &s->ram_alias); + break; + } + } + + /* create the sram area */ + memory_region_init_ram(&s->sram, NULL, "imx25.sram", IMX25_SRAMSIZE, + &error_abort); + vmstate_register_ram_global(&s->sram); + memory_region_add_subregion(get_system_memory(), IMX25_SRAM_ADDRESS, + &s->sram); + + /* add sram alias */ + memory_region_init_alias(&s->sram_alias, NULL, "sram.alias", &s->sram, 0, + IMX25_CS_SRAMSIZE - IMX25_SRAMSIZE); + memory_region_add_subregion(get_system_memory(), + IMX25_SRAM_ADDRESS + IMX25_SRAMSIZE, + &s->sram_alias); + + imx25_3ds_binfo.ram_size = machine->ram_size; + imx25_3ds_binfo.kernel_filename = machine->kernel_filename; + imx25_3ds_binfo.kernel_cmdline = machine->kernel_cmdline; + imx25_3ds_binfo.initrd_filename = machine->initrd_filename; + imx25_3ds_binfo.loader_start = IMX25_3DS_ADDRESS; + imx25_3ds_binfo.board_id = 1771, + imx25_3ds_binfo.nb_cpus = 1; + + /* + * We test explicitly for qtest here as it is not done (yet?) in + * arm_load_kernel(). Without this the "make check" command would + * fail. + */ + if (!qtest_enabled()) { + arm_load_kernel(&s->soc.cpu, &imx25_3ds_binfo); + } else { + /* + * This I2C device doesn't exist on the real board. + * We add it here (only on qtest usage) to be able to do a bit + * of simple qtest. See "make check" for details. + */ + i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]), + "i2c"), + "ds1338", 0x68); + } +} + +static QEMUMachine imx25_3ds_machine = { + .name = "imx25_3ds", + .desc = "ARM i.MX25 PDK board (ARM926)", + .init = imx25_3ds_init, +}; + +static void imx25_3ds_machine_init(void) +{ + qemu_register_machine(&imx25_3ds_machine); +} + +machine_init(imx25_3ds_machine_init)