From patchwork Sun Dec 15 14:59:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Green X-Patchwork-Id: 301354 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 956AC2C009F for ; Mon, 16 Dec 2013 02:00:08 +1100 (EST) Received: from localhost ([::1]:51300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsDAr-0008DN-P6 for incoming@patchwork.ozlabs.org; Sun, 15 Dec 2013 10:00:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsDAK-0007y5-C7 for qemu-devel@nongnu.org; Sun, 15 Dec 2013 09:59:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsDAE-0001md-5W for qemu-devel@nongnu.org; Sun, 15 Dec 2013 09:59:32 -0500 Received: from mail-qc0-f173.google.com ([209.85.216.173]:50828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsDAE-0001mZ-0s for qemu-devel@nongnu.org; Sun, 15 Dec 2013 09:59:26 -0500 Received: by mail-qc0-f173.google.com with SMTP id m20so2991544qcx.18 for ; Sun, 15 Dec 2013 06:59:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:organization:cc:date:message-id :user-agent:mime-version:content-type; bh=Frf52oQa7MftN4XJoy2hZMx82Q8w94AQ1dqu6EEnuP0=; b=FPlyttt79+6xZOvMchnE4YgxoVP6nedDkhkvZlMRphuB2P1+qAIME5OQdjJJzRiYP1 SJqHdWgpRCfJRc505TIjf0nwoXcAKOdwR5/KH5NwLN7kGZgmCcYLXL5JIskBETsyMwxX M9c856E5GgZo1/bQzhXofubGIGhzdnrQrQSY9D4FQf7SjQSOjYFghtZCihGYrXQ/OrSY Lbsj3WwoICU/rR/2mKfizNWxOra7ZrpPb0gl/v44+C4og7Q2RpuAjAgvqb3PXti6Vhb/ OSDkgjhPDlNbzad4uVBBZU/AqEOJL2mC6XK2hhnuWoihYsny458xRdin98XKNjjfB+o8 zwbQ== X-Gm-Message-State: ALoCoQmtcBB+6uZTuQxMeyXzwWZSawOJgd7wxAJA/7ZOQTOsCmQG+fX/qTEcWXclRgJ4WzitICsZ X-Received: by 10.224.11.68 with SMTP id s4mr24270168qas.88.1387119565608; Sun, 15 Dec 2013 06:59:25 -0800 (PST) Received: from localhost (dsl-173-206-82-201.tor.primus.ca. [173.206.82.201]) by mx.google.com with ESMTPSA id fc16sm29128935qeb.3.2013.12.15.06.59.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Dec 2013 06:59:25 -0800 (PST) From: Anthony Green To: qemu-devel@nongnu.org Organization: Moxie Logic Date: Sun, 15 Dec 2013 09:59:18 -0500 Message-ID: <87eh5ekvnd.fsf@moxielogic.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.173 Cc: peter.crosthwaite@xilinx.com Subject: [Qemu-devel] [PATCH v2 2/2] Add Marin SoC support 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 And here is the base SoC support... Signed-off-by: Anthony Green --- hw/moxie/Makefile.objs | 2 +- hw/moxie/marin.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 hw/moxie/marin.c diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs index bfc9001..4fa3b30 100644 --- a/hw/moxie/Makefile.objs +++ b/hw/moxie/Makefile.objs @@ -1,2 +1,2 @@ # moxie boards -obj-y += moxiesim.o +obj-y += moxiesim.o marin.o diff --git a/hw/moxie/marin.c b/hw/moxie/marin.c new file mode 100644 index 0000000..09837ae --- /dev/null +++ b/hw/moxie/marin.c @@ -0,0 +1,166 @@ +/* + * QEMU/marin SoC emulation + * + * Emulates the FPGA-hosted Marin SoC + * + * Copyright (c) 2013 Anthony Green + * + * 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/sysbus.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "hw/loader.h" +#include "exec/address-spaces.h" + +typedef struct { + uint64_t ram_size; + const char *kernel_filename; + const char *kernel_cmdline; + const char *initrd_filename; +} LoaderParams; + +static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) +{ + uint64_t entry, kernel_low, kernel_high; + long kernel_size; + long initrd_size; + ram_addr_t initrd_offset; + + kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, + &entry, &kernel_low, &kernel_high, 1, + ELF_MACHINE, 0); + + if (!kernel_size) { + error_report("Could not load kernel '%s'", + loader_params->kernel_filename); + exit(1); + } + + /* load initrd */ + initrd_size = 0; + initrd_offset = 0; + if (loader_params->initrd_filename) { + initrd_size = get_image_size(loader_params->initrd_filename); + if (initrd_size > 0) { + initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) + & TARGET_PAGE_MASK; + if (initrd_offset + initrd_size > loader_params->ram_size) { + error_report("Memory too small for initial ram disk '%s'", + loader_params->initrd_filename); + exit(1); + } + initrd_size = load_image_targphys(loader_params->initrd_filename, + initrd_offset, + ram_size); + } + if (initrd_size == (target_ulong)-1) { + error_report("Could not load initial ram disk '%s'", + loader_params->initrd_filename); + exit(1); + } + } +} + +static void main_cpu_reset(void *opaque) +{ + MoxieCPU *cpu = opaque; + + cpu_reset(CPU(cpu)); +} + +static inline DeviceState *marin_uart_create(hwaddr base, + qemu_irq irq) +{ + DeviceState *dev; + + dev = qdev_create(NULL, "marin-uart"); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); + + return dev; +} + +static void marin_init(QEMUMachineInitArgs *args) +{ + MoxieCPU *cpu = NULL; + ram_addr_t ram_size = args->ram_size; + const char *cpu_model = args->cpu_model; + const char *kernel_filename = args->kernel_filename; + const char *kernel_cmdline = args->kernel_cmdline; + const char *initrd_filename = args->initrd_filename; + CPUMoxieState *env; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *ocram = g_new(MemoryRegion, 1); + MemoryRegion *ram = g_new(MemoryRegion, 1); + MemoryRegion *rom = g_new(MemoryRegion, 1); + hwaddr ram_base = 0x30000000; + LoaderParams loader_params; + + /* Init CPUs. */ + if (cpu_model == NULL) { + cpu_model = "MoxieLite-moxie-cpu"; + } + cpu = cpu_moxie_init(cpu_model); + if (!cpu) { + error_report("Unable to find CPU definition"); + exit(1); + } + env = &cpu->env; + + qemu_register_reset(main_cpu_reset, cpu); + + /* Allocate RAM. */ + memory_region_init_ram(ocram, NULL, "marin-onchip.ram", 0x1000*4); + vmstate_register_ram_global(ocram); + memory_region_add_subregion(address_space_mem, 0x10000000, ocram); + + memory_region_init_ram(ram, NULL, "marin-external.ram", ram_size); + vmstate_register_ram_global(ram); + memory_region_add_subregion(address_space_mem, ram_base, ram); + + memory_region_init_ram(rom, NULL, "moxie.rom", 128*0x1000); + vmstate_register_ram_global(rom); + memory_region_add_subregion(get_system_memory(), 0x1000, rom); + + if (kernel_filename) { + loader_params.ram_size = ram_size; + loader_params.kernel_filename = kernel_filename; + loader_params.kernel_cmdline = kernel_cmdline; + loader_params.initrd_filename = initrd_filename; + load_kernel(cpu, &loader_params); + } + + marin_uart_create(0xF0000008, env->irq[4]); +} + +static QEMUMachine marin_machine = { + .name = "marin", + .desc = "Marin SoC", + .init = marin_init, + .is_default = 1, +}; + +static void moxie_machine_init(void) +{ + qemu_register_machine(&marin_machine); +} + +machine_init(moxie_machine_init)