* [Qemu-devel] [PATCH 1/4] hw/arm: add new machine type sunxi
2013-11-20 7:53 [Qemu-devel] [PATCH 0/4] add sunxi machine liguang
@ 2013-11-20 7:53 ` liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 2/4] hw/arm/sunxi-soc: add interrupt controller liguang
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: liguang @ 2013-11-20 7:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, liguang
sunxi series are SOCs from Allwinner,
including sunxi-4i/5i/6i/7i ...
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
hw/arm/Makefile.objs | 2 +-
hw/arm/sunxi-soc.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletions(-)
create mode 100644 hw/arm/sunxi-soc.c
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 3671b42..3024ccb 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -4,4 +4,4 @@ obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o
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 += omap1.o omap2.o strongarm.o sunxi-soc.o
diff --git a/hw/arm/sunxi-soc.c b/hw/arm/sunxi-soc.c
new file mode 100644
index 0000000..f6849eb
--- /dev/null
+++ b/hw/arm/sunxi-soc.c
@@ -0,0 +1,30 @@
+#include "hw/sysbus.h"
+#include "hw/devices.h"
+#include "hw/boards.h"
+#include "hw/arm/arm.h"
+#include "sysemu/sysemu.h"
+
+
+
+static void sunxi_init(QEMUMachineInitArgs *args)
+{
+}
+
+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);
+
+static void sunxi_register_types(void)
+{
+}
+
+type_init(sunxi_register_types);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PATCH 2/4] hw/arm/sunxi-soc: add interrupt controller
2013-11-20 7:53 [Qemu-devel] [PATCH 0/4] add sunxi machine liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 1/4] hw/arm: add new machine type sunxi liguang
@ 2013-11-20 7:53 ` liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 3/4] hw/arm/sunxi-soc: add sunxi timer liguang
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: liguang @ 2013-11-20 7:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, liguang
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
hw/arm/sunxi-soc.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 290 insertions(+), 0 deletions(-)
diff --git a/hw/arm/sunxi-soc.c b/hw/arm/sunxi-soc.c
index f6849eb..1b369ba 100644
--- a/hw/arm/sunxi-soc.c
+++ b/hw/arm/sunxi-soc.c
@@ -5,6 +5,296 @@
#include "sysemu/sysemu.h"
+#define TYPE_SUNXI_PIC "sunxi_PIC"
+#define SUNXI_PIC(obj) OBJECT_CHECK(SunxiPICState, (obj), TYPE_SUNXI_PIC)
+
+#define PIC_VECTOR 0
+#define PIC_BASE_ADDR 4
+#define PIC_PROTECT 8
+#define PIC_NMI 0xc
+#define PIC_IRQ_PENDING0 0x10
+#define PIC_IRQ_PENDING1 0x14
+#define PIC_IRQ_PENDING2 0x18
+#define PIC_FIQ_PENDING0 0x20
+#define PIC_FIQ_PENDING1 0x24
+#define PIC_FIQ_PENDING2 0x28
+#define PIC_SELECT0 0x30
+#define PIC_SELECT1 0x34
+#define PIC_SELECT2 0x38
+#define PIC_ENABLE0 0x40
+#define PIC_ENABLE1 0x44
+#define PIC_ENABLE2 0x48
+#define PIC_MASK0 0x50
+#define PIC_MASK1 0x54
+#define PIC_MASK2 0x58
+
+typedef struct SunxiPICState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+ /*< public >*/
+ MemoryRegion iomem;
+ qemu_irq parent_fiq;
+ qemu_irq parent_irq;
+ uint32_t vector;
+ uint32_t base_addr;
+ uint32_t protect;
+ uint32_t nmi;
+ uint32_t irq_pending0;
+ uint32_t irq_pending1;
+ uint32_t irq_pending2;
+ uint32_t select0;
+ uint32_t select1;
+ uint32_t select2;
+ uint32_t enable0;
+ uint32_t enable1;
+ uint32_t enable2;
+ uint32_t mask0;
+ uint32_t mask1;
+ uint32_t mask2;
+ /*priority setting here*/
+} SunxiPICState;
+
+static void sunxi_pic_update(SunxiPICState *s)
+{
+ uint32_t flags = 0;
+
+ flags = s->irq_pending0 & s->irq_pending1 & s->irq_pending0;
+ qemu_set_irq(s->parent_irq, flags != 0);
+ flags = s->select0 & s->select1 & s->select2;
+ qemu_set_irq(s->parent_fiq, flags != 0);
+}
+
+static void sunxi_pic_set_irq(void *opaque, int irq, int level)
+{
+ SunxiPICState *s = opaque;
+ bool allow_irq = false;
+
+ if (level) {
+ if (irq < 32) {
+ set_bit(irq, (void *)&s->irq_pending0);
+ if (test_bit(irq, (void *)&s->enable0) &&
+ !test_bit(irq, (void *)&s->mask0)) {
+ allow_irq = true;
+ }
+ } else if (irq < 64) {
+ set_bit(irq, (void *)&s->irq_pending1);
+ if (test_bit(irq, (void *)&s->enable1) &&
+ !test_bit(irq, (void *)&s->mask1)) {
+ allow_irq = true;
+ }
+ } else if (irq < 95) {
+ set_bit(irq, (void *)&s->irq_pending2);
+ if (test_bit(irq, (void *)&s->enable2) &&
+ !test_bit(irq, (void *)&s->mask2)) {
+ allow_irq = true;
+ }
+ }
+ } else {
+ if (irq < 32) {
+ clear_bit(irq, (void *)&s->irq_pending0);
+ } else if (irq < 64) {
+ clear_bit(irq, (void *)&s->irq_pending1);
+ } else if (irq < 95) {
+ clear_bit(irq, (void *)&s->irq_pending2);
+ }
+ }
+ if (allow_irq) {
+ sunxi_pic_update(s);
+ }
+}
+
+static uint64_t sunxi_pic_read(void *opaque, hwaddr offset, unsigned size)
+{
+ SunxiPICState *s = opaque;
+
+ switch (offset) {
+ case PIC_VECTOR:
+ return s->vector;
+ break;
+ case PIC_BASE_ADDR:
+ return s->base_addr;
+ break;
+ case PIC_PROTECT:
+ return s->protect;
+ break;
+ case PIC_NMI:
+ return s->nmi;
+ break;
+ case PIC_IRQ_PENDING0:
+ case PIC_FIQ_PENDING0:
+ return s->irq_pending0;
+ break;
+ case PIC_IRQ_PENDING1:
+ case PIC_FIQ_PENDING1:
+ return s->irq_pending1;
+ break;
+ case PIC_IRQ_PENDING2:
+ case PIC_FIQ_PENDING2:
+ return s->irq_pending2;
+ break;
+ case PIC_SELECT0:
+ return s->select0;
+ break;
+ case PIC_SELECT1:
+ return s->select1;
+ break;
+ case PIC_SELECT2:
+ return s->select2;
+ break;
+ case PIC_ENABLE0:
+ return s->enable0;
+ break;
+ case PIC_ENABLE1:
+ return s->enable1;
+ break;
+ case PIC_ENABLE2:
+ return s->enable2;
+ break;
+ case PIC_MASK0:
+ return s->mask0;
+ break;
+ case PIC_MASK1:
+ return s->mask1;
+ break;
+ case PIC_MASK2:
+ return s->mask2;
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static void sunxi_pic_write(void *opaque, hwaddr offset, uint64_t value,
+ unsigned size)
+{
+ SunxiPICState *s = opaque;
+ uint8_t index = 0;
+
+ switch (offset) {
+ case PIC_VECTOR:
+ s->vector = value & ~0x3;
+ break;
+ case PIC_BASE_ADDR:
+ s->base_addr = value & ~0x3;
+ case PIC_PROTECT:
+ case PIC_NMI:
+ break;
+ case PIC_IRQ_PENDING0:
+ case PIC_FIQ_PENDING0:
+ for (index = 0; index < sizeof(uint32_t); index++) {
+ if (test_bit(index, (void *)&value)) {
+ clear_bit(index, (void *)&s->irq_pending0);
+ }
+ }
+ break;
+ case PIC_IRQ_PENDING1:
+ case PIC_FIQ_PENDING1:
+ for (index = 0; index < sizeof(uint32_t); index++) {
+ if (test_bit(index, (void *)&value)) {
+ clear_bit(index, (void *)&s->irq_pending1);
+ }
+ }
+ break;
+ case PIC_IRQ_PENDING2:
+ case PIC_FIQ_PENDING2:
+ for (index = 0; index < sizeof(uint32_t); index++) {
+ if (test_bit(index, (void *)&value)) {
+ clear_bit(index, (void *)&s->irq_pending2);
+ }
+ }
+ break;
+ case PIC_SELECT0:
+ s->select0 = value;
+ break;
+ case PIC_SELECT1:
+ s->select1 = value;
+ break;
+ case PIC_SELECT2:
+ s->select2 = value;
+ break;
+ case PIC_ENABLE0:
+ s->enable0 = value;
+ break;
+ case PIC_ENABLE1:
+ s->enable1 = value;
+ break;
+ case PIC_ENABLE2:
+ s->enable2 = value;
+ break;
+ case PIC_MASK0:
+ s->mask0 = value;
+ break;
+ case PIC_MASK1:
+ s->mask1 = value;
+ break;
+ case PIC_MASK2:
+ s->mask2 = value;
+ default:
+ break;
+ }
+
+ sunxi_pic_update(s);
+}
+
+static const MemoryRegionOps sunxi_pic_ops = {
+ .read = sunxi_pic_read,
+ .write = sunxi_pic_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static int sunxi_pic_init(SysBusDevice *dev)
+{
+ SunxiPICState *s = SUNXI_PIC(dev);
+
+ qdev_init_gpio_in(DEVICE(dev), sunxi_pic_set_irq, 95);
+ sysbus_init_irq(dev, &s->parent_irq);
+ sysbus_init_irq(dev, &s->parent_fiq);
+ memory_region_init_io(&s->iomem, OBJECT(s), &sunxi_pic_ops, s,
+ "sunxi-pic", 0x400);
+ sysbus_init_mmio(dev, &s->iomem);
+
+ return 0;
+}
+
+static void sunxi_pic_reset(DeviceState *d)
+{
+ SunxiPICState *s = SUNXI_PIC(d);
+
+ s->base_addr = 0;
+ s->protect = 0;
+ s->nmi = 0;
+ s->vector = 0;
+ s->irq_pending0 = 0;
+ s->irq_pending1 = 0;
+ s->irq_pending2 = 0;
+ s->select0 = 0;
+ s->select1 = 0;
+ s->select2 = 0;
+ s->enable0 = 0;
+ s->enable1 = 0;
+ s->enable2 = 0;
+ s->mask0 = 0;
+ s->mask1 = 0;
+ s->mask2 = 0;
+}
+
+static void sunxi_pic_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+ k->init = sunxi_pic_init;
+ dc->reset = sunxi_pic_reset;
+ }
+
+static const TypeInfo sunxi_pic_info = {
+ .name = TYPE_SUNXI_PIC,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(SunxiPICState),
+ .class_init = sunxi_pic_class_init,
+};
static void sunxi_init(QEMUMachineInitArgs *args)
{
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PATCH 3/4] hw/arm/sunxi-soc: add sunxi timer
2013-11-20 7:53 [Qemu-devel] [PATCH 0/4] add sunxi machine liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 1/4] hw/arm: add new machine type sunxi liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 2/4] hw/arm/sunxi-soc: add interrupt controller liguang
@ 2013-11-20 7:53 ` liguang
2013-11-20 7:53 ` [Qemu-devel] [PATCH 4/4] hw/arm/sunxi-soc: really initialize sunxi machine liguang
2013-11-20 9:26 ` [Qemu-devel] [PATCH 0/4] add " Peter Maydell
4 siblings, 0 replies; 7+ messages in thread
From: liguang @ 2013-11-20 7:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, liguang
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
hw/arm/sunxi-soc.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 209 insertions(+), 0 deletions(-)
diff --git a/hw/arm/sunxi-soc.c b/hw/arm/sunxi-soc.c
index 1b369ba..960539a 100644
--- a/hw/arm/sunxi-soc.c
+++ b/hw/arm/sunxi-soc.c
@@ -2,6 +2,7 @@
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm/arm.h"
+#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
@@ -296,6 +297,214 @@ static const TypeInfo sunxi_pic_info = {
.class_init = sunxi_pic_class_init,
};
+
+#define TYPE_SUNXI_PIT "sunix-timer"
+#define SUNXI_PIT(obj) OBJECT_CHECK(SunxiPITState, (obj), TYPE_SUNXI_PIT)
+
+#define SUNXI_TIMER_NR 6
+#define SUNXI_TIMER_IRQ 0x1
+#define SUNXI_WDOG_IRQ 0x100
+
+#define SUNXI_TIMER_IRQ_EN 0
+#define SUNXI_TIMER_IRQ_ST 0x4
+#define SUNXI_TIMER_CONTROL 0x0
+#define SUNXI_TIMER_INTERVAL 0x4
+#define SUNXI_TIMER_COUNT 0x8
+#define SUNXI_WDOG_CONTROL 0x90
+#define SUNXI_WDOG_MODE 0x94
+#define SUNXI_WDOG_COUNT_LO 0xa4
+#define SUNXI_WDOG_COUNT_HI 0xa8
+#define SUNXI_TIMER_BASE 0x10
+
+typedef struct SunxiPITState {
+ SysBusDevice busdev;
+ qemu_irq irq[SUNXI_TIMER_NR];
+ ptimer_state *timer[6];
+ MemoryRegion iomem;
+ uint32_t irq_enable;
+ uint32_t irq_status;
+ uint32_t control[6];
+ uint32_t interval[6];
+ uint32_t count[6];
+ uint32_t watch_dog_mode;
+ uint32_t watch_dog_control;
+ uint32_t watch_dog_count_lo;
+ uint32_t watch_dog_count_hi;
+} SunxiPITState;
+
+static uint64_t sunxi_pit_read(void *opaque, hwaddr offset, unsigned size)
+{
+ SunxiPITState *s = SUNXI_PIT(opaque);
+ uint8_t index = 0;
+
+ switch (offset) {
+ case SUNXI_TIMER_IRQ_EN:
+ return s->irq_enable;
+ break;
+ case SUNXI_TIMER_IRQ_ST:
+ return s->irq_status;
+ break;
+ case SUNXI_TIMER_BASE ... SUNXI_TIMER_BASE * 6 + SUNXI_TIMER_COUNT:
+ index = offset & 0xf0;
+ switch (offset & 0x0f) {
+ case SUNXI_TIMER_CONTROL:
+ return s->control[index];
+ break;
+ case SUNXI_TIMER_INTERVAL:
+ return s->interval[index];
+ break;
+ case SUNXI_TIMER_COUNT:
+ s->count[index] = ptimer_get_count(s->timer[index]);
+ return s->count[index];
+ default:
+ break;
+ }
+ break;
+ case SUNXI_WDOG_CONTROL:
+ break;
+ case SUNXI_WDOG_MODE:
+ break;
+ case SUNXI_WDOG_COUNT_LO:
+ break;
+ case SUNXI_WDOG_COUNT_HI:
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static void sunxi_pit_write(void *opaque, hwaddr offset, uint64_t value,
+ unsigned size)
+{
+ SunxiPITState *s = SUNXI_PIT(opaque);
+ uint8_t index = 0;
+
+ switch (offset) {
+ case SUNXI_TIMER_IRQ_EN:
+ s->irq_enable = value;
+ break;
+ case SUNXI_TIMER_IRQ_ST:
+ for (index = 0; index < sizeof(uint32_t); index++) {
+ if (test_bit(index, (void *)&value)) {
+ clear_bit(index, (void *)&s->irq_status);
+ }
+ }
+ break;
+ case SUNXI_TIMER_BASE ... SUNXI_TIMER_BASE * 6 + SUNXI_TIMER_COUNT:
+ index = (offset & 0xf0) - 1;
+ index >>= 4;
+ switch (offset & 0x0f) {
+ case SUNXI_TIMER_CONTROL:
+ s->control[index] = value;
+ if (s->control[index] & 0x1) {
+ ptimer_run(s->timer[index], 0);
+ } else {
+ ptimer_stop(s->timer[index]);
+ }
+ break;
+ case SUNXI_TIMER_INTERVAL:
+ s->interval[index] = value;
+ ptimer_set_limit(s->timer[index], s->interval[index],
+ s->control[index] & 0x2);
+ break;
+ case SUNXI_TIMER_COUNT:
+ s->count[index] = value;
+ default:
+ break;
+ }
+ break;
+ case SUNXI_WDOG_CONTROL:
+ s->watch_dog_control = value;
+ break;
+ case SUNXI_WDOG_MODE:
+ s->watch_dog_mode = value;
+ break;
+ case SUNXI_WDOG_COUNT_LO:
+ s->watch_dog_count_lo = value;
+ break;
+ case SUNXI_WDOG_COUNT_HI:
+ s->watch_dog_count_hi = value;
+ default:
+ break;
+ }
+}
+
+static const MemoryRegionOps sunxi_pit_ops = {
+ .read = sunxi_pit_read,
+ .write = sunxi_pit_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void sunxi_pit_reset(DeviceState *dev)
+{
+ SunxiPITState *s = SUNXI_PIT(dev);
+ uint8_t i = 0;
+
+ s->irq_enable = 0;
+ s->irq_status = 0;
+ for (i = 0; i < 6; i++) {
+ s->control[i] = 0x4;
+ s->interval[i] = 0;
+ s->count[i] = 0;
+ ptimer_stop(s->timer[i]);
+ ptimer_set_limit(s->timer[i], 0XFFFFFFFFUL, 1);
+ }
+ s->watch_dog_mode = 0;
+ s->watch_dog_control = 0;
+ s->watch_dog_count_lo = 0;
+ s->watch_dog_count_hi = 0;
+}
+
+static void sunxi_pit_timer_cb(void *opaque)
+{
+ SunxiPITState *s = SUNXI_PIT(opaque);
+ uint8_t i = 0;
+
+ for (i = 0; i < SUNXI_TIMER_NR; i++) {
+ if (s->irq_status & s->irq_enable & (1 << i)) {
+ qemu_irq_raise(s->irq[i]);
+ } else {
+ qemu_irq_raise(s->irq[i]);
+ }
+ }
+}
+
+static void sunxi_pit_realize(DeviceState *dev, Error **errp)
+{
+ SunxiPITState *s = SUNXI_PIT(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ QEMUBH *bh;
+ uint8_t i = 0;
+
+ for (i = 0; i < SUNXI_TIMER_NR; i++) {
+ sysbus_init_irq(sbd, &s->irq[i]);
+ }
+ memory_region_init_io(&s->iomem, OBJECT(s), &sunxi_pit_ops, s,
+ TYPE_SUNXI_PIT, 0x400);
+ sysbus_init_mmio(sbd, &s->iomem);
+ bh = qemu_bh_new(sunxi_pit_timer_cb, s);
+ for (i = 0; i < SUNXI_TIMER_NR; i++) {
+ s->timer[i] = ptimer_init(bh);
+ }
+}
+
+static void sunxi_pit_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = sunxi_pit_realize;
+ dc->reset = sunxi_pit_reset;
+ dc->desc = "sunxi timer";
+}
+
+static const TypeInfo sunxi_pit_info = {
+ .name = TYPE_SUNXI_PIT,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(SunxiPITState),
+ .class_init = sunxi_pit_class_init,
+};
+
static void sunxi_init(QEMUMachineInitArgs *args)
{
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PATCH 4/4] hw/arm/sunxi-soc: really initialize sunxi machine
2013-11-20 7:53 [Qemu-devel] [PATCH 0/4] add sunxi machine liguang
` (2 preceding siblings ...)
2013-11-20 7:53 ` [Qemu-devel] [PATCH 3/4] hw/arm/sunxi-soc: add sunxi timer liguang
@ 2013-11-20 7:53 ` liguang
2013-11-20 9:26 ` [Qemu-devel] [PATCH 0/4] add " Peter Maydell
4 siblings, 0 replies; 7+ messages in thread
From: liguang @ 2013-11-20 7:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, liguang
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
hw/arm/sunxi-soc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/hw/arm/sunxi-soc.c b/hw/arm/sunxi-soc.c
index 960539a..0338e03 100644
--- a/hw/arm/sunxi-soc.c
+++ b/hw/arm/sunxi-soc.c
@@ -4,6 +4,9 @@
#include "hw/arm/arm.h"
#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
+#include "exec/address-spaces.h"
+#include "hw/char/serial.h"
+
#define TYPE_SUNXI_PIC "sunxi_PIC"
@@ -505,8 +508,75 @@ static const TypeInfo sunxi_pit_info = {
.class_init = sunxi_pit_class_init,
};
+#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 = 0x48000000,
+ .board_id = 0x1623,
+};
+
static void sunxi_init(QEMUMachineInitArgs *args)
{
+ 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];
+ 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 < 95; 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);
+/*
+ serial_mm_init(address_space_mem, SUNXI_UART1_REG_BASE, 2, pic[2], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART2_REG_BASE, 2, pic[3], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART3_REG_BASE, 2, pic[4], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART4_REG_BASE, 2, pic[17], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART5_REG_BASE, 2, pic[18], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART6_REG_BASE, 2, pic[19], 115200,
+ serial_hds[0], DEVICE_NATIVE_ENDIAN);
+ serial_mm_init(address_space_mem, SUNXI_UART7_REG_BASE, 2, pic[20], 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 = {
@@ -524,6 +594,8 @@ machine_init(sunxi_machine_init);
static void sunxi_register_types(void)
{
+ type_register_static(&sunxi_pic_info);
+ type_register_static(&sunxi_pit_info);
}
type_init(sunxi_register_types);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 0/4] add sunxi machine
2013-11-20 7:53 [Qemu-devel] [PATCH 0/4] add sunxi machine liguang
` (3 preceding siblings ...)
2013-11-20 7:53 ` [Qemu-devel] [PATCH 4/4] hw/arm/sunxi-soc: really initialize sunxi machine liguang
@ 2013-11-20 9:26 ` Peter Maydell
2013-11-20 23:55 ` Li Guang
4 siblings, 1 reply; 7+ messages in thread
From: Peter Maydell @ 2013-11-20 9:26 UTC (permalink / raw)
To: liguang; +Cc: QEMU Developers
On 20 November 2013 07:53, liguang <lig.fnst@cn.fujitsu.com> wrote:
> this patch-set implemented a device-reduced
> machine type for Allwinner's sunxi series SoC,
> like sunxi-4i/5i/7i ...
> Li Guang (4)
> hw/arm: add new machine type sunxi
> hw/arm/sunxi-soc: add interrupt controller
> hw/arm/sunxi-soc: add sunxi timer
> hw/arm/sunxi-soc: really initialize sunxi machine
Hi. Thanks for this patch set. I see you've put all the code
into one file in hw/arm, but we prefer each device model
to go in its own file in the right subdirectory of hw/. So
you put the interrupt controller under hw/intc/, the
timer under hw/timer/, and only the top level board model
lives under hw/arm. If you could restructure the
patches this way that would be great.
You'll also need to add VMState descriptions to your
devices so they can be migrated.
thanks
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 0/4] add sunxi machine
2013-11-20 9:26 ` [Qemu-devel] [PATCH 0/4] add " Peter Maydell
@ 2013-11-20 23:55 ` Li Guang
0 siblings, 0 replies; 7+ messages in thread
From: Li Guang @ 2013-11-20 23:55 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
Hi, Peter
Peter Maydell wrote:
> On 20 November 2013 07:53, liguang<lig.fnst@cn.fujitsu.com> wrote:
>
>> this patch-set implemented a device-reduced
>> machine type for Allwinner's sunxi series SoC,
>> like sunxi-4i/5i/7i ...
>>
>
>> Li Guang (4)
>> hw/arm: add new machine type sunxi
>> hw/arm/sunxi-soc: add interrupt controller
>> hw/arm/sunxi-soc: add sunxi timer
>> hw/arm/sunxi-soc: really initialize sunxi machine
>>
> Hi. Thanks for this patch set. I see you've put all the code
> into one file in hw/arm, but we prefer each device model
> to go in its own file in the right subdirectory of hw/. So
> you put the interrupt controller under hw/intc/, the
> timer under hw/timer/, and only the top level board model
> lives under hw/arm. If you could restructure the
> patches this way that would be great.
>
> You'll also need to add VMState descriptions to your
> devices so they can be migrated.
>
>
OK, let me split it into 3 files, and try to add VMstate.
Thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread