From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlSvK-0000N4-9m for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:24:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlSvF-0006GD-LU for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:24:10 -0500 Received: from [222.73.24.84] (port=2154 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlSvE-0006G1-Up for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:24:05 -0500 Message-ID: <52953B40.1050406@cn.fujitsu.com> Date: Wed, 27 Nov 2013 08:22:24 +0800 From: Li Guang MIME-Version: 1.0 References: <1385450531-3170-1-git-send-email-lig.fnst@cn.fujitsu.com> <1385450531-3170-4-git-send-email-lig.fnst@cn.fujitsu.com> In-Reply-To: Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1; format=flowed Subject: Re: [Qemu-devel] [PATCH v4 3/4] hw/arm: add sunxi machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: Peter Maydell , =?ISO-8859-1?Q?Andreas_F=E4rber?= , "qemu-devel@nongnu.org Developers" Peter Crosthwaite wrote: > On Tue, Nov 26, 2013 at 5:22 PM, liguang wrote: > >> Signed-off-by: liguang >> --- >> hw/arm/Makefile.objs | 1 + >> hw/arm/sunxi-soc.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 99 insertions(+), 0 deletions(-) >> create mode 100644 hw/arm/sunxi-soc.c >> >> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs >> index 3671b42..f9f3071 100644 >> --- a/hw/arm/Makefile.objs >> +++ b/hw/arm/Makefile.objs >> @@ -5,3 +5,4 @@ obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o >> >> obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o >> obj-y += omap1.o omap2.o strongarm.o >> +obj-y += sunxi-soc.o >> diff --git a/hw/arm/sunxi-soc.c b/hw/arm/sunxi-soc.c >> new file mode 100644 >> index 0000000..b45af6d >> --- /dev/null >> +++ b/hw/arm/sunxi-soc.c >> @@ -0,0 +1,98 @@ >> +/* >> + * Allwinner sunxi series SoC emulation >> + * >> + * Copyright (C) 2013 Li Guang >> + * Written by Li Guang >> + * >> + * 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. >> + */ >> + >> +#include "hw/sysbus.h" >> +#include "hw/devices.h" >> +#include "hw/boards.h" >> +#include "hw/arm/arm.h" >> +#include "hw/ptimer.h" >> +#include "hw/char/serial.h" >> +#include "hw/timer/sunxi-pit.h" >> +#include "hw/intc/sunxi-pic.h" >> + >> +#include "sysemu/sysemu.h" >> +#include "exec/address-spaces.h" >> + >> + >> +#define SUNXI_PIC_REG_BASE 0x01c20400 >> +#define SUNXI_PIT_REG_BASE 0x01c20c00 >> +#define SUNXI_UART0_REG_BASE 0x01c28000 >> + >> +static struct arm_boot_info sunxi_binfo = { >> + .loader_start = 0x40000000, >> + .board_id = 0x1008, >> +}; >> + >> +static void sunxi_init(QEMUMachineInitArgs *args) >> > I would check with Andreas/PMM on what the go is with SoCs regarding > container devices and boards. My (vague) understanding is that SoCs > should be container devices and boards instantiate those containers > with off-chip connectivity. This seems flat to me, with everything on > board level. > > well, interesting thought. IMO, SoC is a board. >> +{ >> + 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; >> + ARMCPU *cpu; >> + MemoryRegion *address_space_mem = get_system_memory(); >> + MemoryRegion *ram = g_new(MemoryRegion, 1); >> + MemoryRegion *ram_alias = g_new(MemoryRegion, 1); >> + qemu_irq pic[95]; >> > [SUNXI_PIC_INT_NR] > > > yes, will fix. Thanks! Li Guang > >> + DeviceState *dev; >> + uint8_t i; >> + >> + /*here we currently support sunxi-4i*/ >> + cpu_model = "cortex-a8"; >> + cpu = cpu_arm_init(cpu_model); >> + if (!cpu) { >> + fprintf(stderr, "Unable to find CPU definition\n"); >> + exit(1); >> + } >> + >> + memory_region_init_ram(ram, NULL, "sunxi-soc.ram", ram_size); >> + memory_region_add_subregion(address_space_mem, 0, ram); >> + memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size); >> + memory_region_add_subregion(address_space_mem, 0x40000000, ram_alias); >> + >> + dev = sysbus_create_varargs(TYPE_SUNXI_PIC, SUNXI_PIC_REG_BASE, >> + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ), >> + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ), >> + NULL); >> + for (i = 0; i< SUNXI_PIC_INT_NR; i++) { >> + pic[i] = qdev_get_gpio_in(dev, i); >> + } >> + >> + sysbus_create_varargs(TYPE_SUNXI_PIT, SUNXI_PIT_REG_BASE, pic[22], pic[23], >> + pic[24], pic[25], pic[67], pic[68], NULL); >> + >> + serial_mm_init(address_space_mem, SUNXI_UART0_REG_BASE, 2, pic[1], 115200, >> + serial_hds[0], DEVICE_NATIVE_ENDIAN); >> + >> + sunxi_binfo.ram_size = ram_size; >> + sunxi_binfo.kernel_filename = kernel_filename; >> + sunxi_binfo.kernel_cmdline = kernel_cmdline; >> + arm_load_kernel(cpu,&sunxi_binfo); >> +} >> + >> +static QEMUMachine sunxi_machine = { >> + .name = "sunxi", >> + .desc = "Allwinner's SoC (sunxi series)", >> + .init = sunxi_init, >> +}; >> + >> +static void sunxi_machine_init(void) >> +{ >> + qemu_register_machine(&sunxi_machine); >> +} >> + >> +machine_init(sunxi_machine_init); >> -- >> 1.7.2.5 >> >> >> >