diff mbox

[v11,5/6] arm: SoC model for Calxeda Highbank

Message ID 1326987824-27980-6-git-send-email-mark.langsdorf@calxeda.com
State New
Headers show

Commit Message

Mark Langsdorf Jan. 19, 2012, 3:43 p.m. UTC
From: Rob Herring <rob.herring@calxeda.com>

Adds support for Calxeda's Highbank SoC.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
---
Changes from v10
	Added secondary core boot functions
Changes from v9
        Made typedef struct names in CamelCase
Changes from v7, v8
        None
Changes from v3, v4, v5, v6
        Skipped
Changes from v2
        Created a reset function for highbank_regs
        Handled creation of regs i/o memory region in a sensible manner
        Added code to boot secondary CPUs properly
Changes from v1
        Restructed the loading of sysram.bin and made it more clearly optional
        Made the regs structure into a proper qdev/sysbus object
        Removed some unnecessary include files
        Clarified the GPL version
        Simplified the reset function
        Removed the automatic detection and resetting of ram_size. Image MUST
be loaded with -m 4089 or it will crash
        Added a guard for xgmac creation
        Added a fuller description in the QEMUMachine .desc field

 Makefile.target |    1 +
 hw/highbank.c   |  321 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 322 insertions(+), 0 deletions(-)
 create mode 100644 hw/highbank.c

Comments

Peter Maydell Jan. 19, 2012, 7:15 p.m. UTC | #1
On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
> +    highbank_binfo.board_id = -1; /* provided by deviceTree */

This doesn't work, because arm_boot.c does:
        bootloader[1] |= info->board_id & 0xff;
        bootloader[2] |= (info->board_id >> 8) & 0xff;

and so when you try to boot the kernel it does this:

===begin===
cam-vm-266:maverick:qemu-jeos$
~/linaro/qemu-from-laptop/qemu/arm-softmmu/qemu-system-arm -kernel
build-arm/linux/arch/arm/boot/zImage -initrd build-arm/initramfs.img
-M highbank -serial stdio

Error: unrecognized/unsupported machine ID (r1 = 0x0000ffff).

Available machine support:

ID (hex)        NAME
ffffffff        Highbank

Please check your kernel config and/or bootloader.
===endit===

-- PMM
Mark Langsdorf Jan. 19, 2012, 7:25 p.m. UTC | #2
On 01/19/2012 01:15 PM, Peter Maydell wrote:
> On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
> 
> This doesn't work, because arm_boot.c does:
>         bootloader[1] |= info->board_id & 0xff;
>         bootloader[2] |= (info->board_id >> 8) & 0xff;
> 
> and so when you try to boot the kernel it does this:
> 
> ===begin===
> cam-vm-266:maverick:qemu-jeos$
> ~/linaro/qemu-from-laptop/qemu/arm-softmmu/qemu-system-arm -kernel
> build-arm/linux/arch/arm/boot/zImage -initrd build-arm/initramfs.img
> -M highbank -serial stdio
> 
> Error: unrecognized/unsupported machine ID (r1 = 0x0000ffff).
> 
> Available machine support:
> 
> ID (hex)        NAME
> ffffffff        Highbank
> 
> Please check your kernel config and/or bootloader.
> ===endit===

Works for me, but it requires a kernel build with the device tree
dtb appended to it.

===begin===
mlangsdorf@mjl-dell:~/work/qemu$
./mainline_qemu/arm-softmmu/qemu-system-arm -nographic -M highbank
-kernel linux-2.6/kernel_with_dtb.img -drive
id=disk,if=ide,file=sataDisk -device ide-drive,drive=disk,bus=ide.0
-append "root=/dev/sda2 console=ttyAMA0,38400 debug earlyprintk" -m 4089
-smp 3
[    0.000000] Booting Linux on physical CPU 0
[    0.000000] Initializing cgroup subsys cpuset
[    0.000000] Initializing cgroup subsys cpu
[    0.000000] Linux version 3.2.0+ (mlangsdorf@mjl-dell) (gcc version
4.6.1 (Ubuntu/Linaro 4.6.1-9ubuntu3) ) #72 SMP Wed Jan 18 15:10:31 CST 2012
[    0.000000] CPU: ARMv7 Processor [410fc090] revision 0 (ARMv7),
cr=10c5387d
[    0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing
instruction cache
[    0.000000] Machine: Highbank, model: Calxeda Highbank
[    0.000000] Memory policy: ECC disabled, Data cache writealloc
[    0.000000] On node 0 totalpages: 1046784
===endit===

--Mark Langsdorf
Calxeda, Inc.
Peter Maydell Jan. 19, 2012, 7:32 p.m. UTC | #3
On 19 January 2012 19:25, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
> On 01/19/2012 01:15 PM, Peter Maydell wrote:
>> On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
>
> Works for me, but it requires a kernel build with the device tree
> dtb appended to it.

How do I get hold of a valid dtb for this platform?

thanks
-- PMM
Mark Langsdorf Jan. 19, 2012, 7:35 p.m. UTC | #4
On 01/19/2012 01:32 PM, Peter Maydell wrote:
> On 19 January 2012 19:25, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>> On 01/19/2012 01:15 PM, Peter Maydell wrote:
>>> On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
>>
>> Works for me, but it requires a kernel build with the device tree
>> dtb appended to it.
> 
> How do I get hold of a valid dtb for this platform?

The dts is at:
http://lxr.linux.no/#linux+v3.2.1/arch/arm/boot/dts/highbank.dts

I usually cross compile with:
make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- highbank.dtb

--Mark Langsdorf
Calxeda, Inc.
Peter Maydell Jan. 19, 2012, 7:44 p.m. UTC | #5
On 19 January 2012 19:35, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
> On 01/19/2012 01:32 PM, Peter Maydell wrote:
>> On 19 January 2012 19:25, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>> On 01/19/2012 01:15 PM, Peter Maydell wrote:
>>>> On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>>>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
>>>
>>> Works for me, but it requires a kernel build with the device tree
>>> dtb appended to it.
>>
>> How do I get hold of a valid dtb for this platform?
>
> The dts is at:
> http://lxr.linux.no/#linux+v3.2.1/arch/arm/boot/dts/highbank.dts
>
> I usually cross compile with:
> make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- highbank.dtb

Right, thanks.

I have a kernel now that seems to boot but then
barfs with:
Freeing init memory: 124K
Kernel panic - not syncing: Attempted to kill init!

but that's probably a misconfiguration in my kernel.

-- PMM
Mark Langsdorf Jan. 19, 2012, 7:58 p.m. UTC | #6
On 01/19/2012 01:44 PM, Peter Maydell wrote:
> On 19 January 2012 19:35, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>> On 01/19/2012 01:32 PM, Peter Maydell wrote:
>>> On 19 January 2012 19:25, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>>> On 01/19/2012 01:15 PM, Peter Maydell wrote:
>>>>> On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>>>>>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
>>>>
>>>> Works for me, but it requires a kernel build with the device tree
>>>> dtb appended to it.
>>>
>>> How do I get hold of a valid dtb for this platform?
>>
>> The dts is at:
>> http://lxr.linux.no/#linux+v3.2.1/arch/arm/boot/dts/highbank.dts
>>
>> I usually cross compile with:
>> make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- highbank.dtb
> 
> Right, thanks.
> 
> I have a kernel now that seems to boot but then
> barfs with:
> Freeing init memory: 124K
> Kernel panic - not syncing: Attempted to kill init!
> 
> but that's probably a misconfiguration in my kernel.

You need to be passing -m 4089.

--Mark Langsdorf
Calxeda, Inc.
Peter Maydell Jan. 19, 2012, 7:59 p.m. UTC | #7
On 19 January 2012 19:58, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
> On 01/19/2012 01:44 PM, Peter Maydell wrote:
>> I have a kernel now that seems to boot but then
>> barfs with:
>> Freeing init memory: 124K
>> Kernel panic - not syncing: Attempted to kill init!
>>
>> but that's probably a misconfiguration in my kernel.
>
> You need to be passing -m 4089.

cam-vm-266:maverick:qemu-jeos$
~/linaro/qemu-from-laptop/qemu/arm-softmmu/qemu-system-arm -kernel
zImage-with-dtb  -initrd build-arm/initramfs.img -M highbank -serial
stdio -m 4089
qemu: at most 2047 MB RAM can be simulated

I'd rather not have a model that doesn't work on 32 bit hosts
if we can avoid it...

-- PMM
Peter Maydell Jan. 19, 2012, 8 p.m. UTC | #8
On 19 January 2012 15:43, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
> +    highbank_binfo.board_id = -1; /* provided by deviceTree */

I'm still not sure about this.

The linux Documentation/devicetree/booting-without-of.txt says
there are two calling conventions for booting here, ATAGS and
with-device-tree-blob, and that even with the device tree blob
method it is still considered "good practise" to pass a valid
machine number in r1. Can you point me to some documentation
that says that -1 is OK now?

(We probably ought to get round to actually implementing
a -dtb option to go with -kernel and -initrd.)

thanks
-- PMM
Mark Langsdorf Jan. 19, 2012, 8:48 p.m. UTC | #9
On 01/19/2012 01:59 PM, Peter Maydell wrote:
> On 19 January 2012 19:58, Mark Langsdorf <mark.langsdorf@calxeda.com> wrote:
>> On 01/19/2012 01:44 PM, Peter Maydell wrote:
>>> I have a kernel now that seems to boot but then
>>> barfs with:
>>> Freeing init memory: 124K
>>> Kernel panic - not syncing: Attempted to kill init!
>>>
>>> but that's probably a misconfiguration in my kernel.
>>
>> You need to be passing -m 4089.
> 
> cam-vm-266:maverick:qemu-jeos$
> ~/linaro/qemu-from-laptop/qemu/arm-softmmu/qemu-system-arm -kernel
> zImage-with-dtb  -initrd build-arm/initramfs.img -M highbank -serial
> stdio -m 4089
> qemu: at most 2047 MB RAM can be simulated
> 
> I'd rather not have a model that doesn't work on 32 bit hosts
> if we can avoid it...

The memory size is determined by the dts:
http://lxr.linux.no/#linux+v3.2.1/arch/arm/boot/dts/highbank.dts#L60

So you should be able to set it to whatever you want as long as the
values match. I've tested a boot with -m 2047 and the memory range
going from 0 to 0x7ff00000. That required regenerating the dtb and
re-appending it to the kernel image, though. I don't know of an
easy to handle that on the command line.

Is that sufficient for me to resend the patch with the changes
covered below?

>> +    highbank_binfo.board_id = -1; /* provided by deviceTree */
>
> I'm still not sure about this.
>
> The linux Documentation/devicetree/booting-without-of.txt says
> there are two calling conventions for booting here, ATAGS and
> with-device-tree-blob, and that even with the device tree blob
> method it is still considered "good practise" to pass a valid
> machine number in r1. Can you point me to some documentation
> that says that -1 is OK now?

I can't, so I'll change the value. We only intend to support
device tree booting.

--Mark Langsdorf
Calxeda, Inc.
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index 9bc0248..1c86522 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -342,6 +342,7 @@  obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
 obj-arm-y += arm_l2x0.o
 obj-arm-y += arm_mptimer.o
 obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
+obj-arm-y += highbank.o
 obj-arm-y += pl061.o
 obj-arm-y += xgmac.o
 obj-arm-y += arm-semi.o
diff --git a/hw/highbank.c b/hw/highbank.c
new file mode 100644
index 0000000..a9a3cb6
--- /dev/null
+++ b/hw/highbank.c
@@ -0,0 +1,321 @@ 
+/*
+ * Calxeda Highbank SoC emulation
+ *
+ * Copyright (c) 2010-2012 Calxeda
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2 or later, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "sysbus.h"
+#include "arm-misc.h"
+#include "primecell.h"
+#include "devices.h"
+#include "loader.h"
+#include "net.h"
+#include "sysemu.h"
+#include "boards.h"
+#include "sysbus.h"
+#include "blockdev.h"
+#include "exec-memory.h"
+
+#define SMP_BOOT_ADDR 0x100
+#define SMP_BOOT_REG  0x40       /* should be 0x40 + 0x10 * cpu */
+#define GIC_BASE_ADDR 0xfff10000
+
+#define NIRQ_GIC      160
+
+/* Board init.  */
+static void highbank_cpu_reset(void *opaque)
+{
+    CPUState *env = opaque;
+
+    env->cp15.c15_config_base_address = 0xfff10000;
+}
+
+static void hb_write_secondary(CPUState *env, const struct arm_boot_info *info)
+{
+    int n;
+    uint32_t smpboot[] = {
+        0xee100fb0, /* mrc p15, 0, r0, c0, c0, 5 - read current core id */
+        0xe210000f, /* ands r0, r0, #0x0f */
+        0xe3a03040, /* mov r3, #0x40 - jump address is 0x40 + 0x10 * core id */
+        0xe0830200, /* add r0, r3, r0, lsl #4 */
+        0xe59f2018, /* ldr r2, privbase */
+        0xe3a01001, /* mov r1, #1 */
+        0xe5821100, /* str r1, [r2, #256] */
+        0xe320f003, /* wfi */
+        0xe5901000, /* ldr     r1, [r0] */
+        0xe1110001, /* tst     r1, r1 */
+        0x0afffffb, /* beq     <wfi> */
+        0xe12fff11, /* bx      r1 */
+        GIC_BASE_ADDR      /* privbase: gic address.  */
+    };
+    for (n = 0; n < ARRAY_SIZE(smpboot); n++) {
+        smpboot[n] = tswap32(smpboot[n]);
+    }
+    rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot), SMP_BOOT_ADDR);
+}
+
+static void hb_reset_secondary(CPUState *env, const struct arm_boot_info *info)
+{
+    switch (info->nb_cpus) {
+    case 4:
+        stl_phys_notdirty(SMP_BOOT_REG + 0x30, 0);
+    case 3:
+        stl_phys_notdirty(SMP_BOOT_REG + 0x20, 0);
+    case 2:
+        stl_phys_notdirty(SMP_BOOT_REG + 0x10, 0);
+        env->regs[15] = SMP_BOOT_ADDR;
+        break;
+    default:
+        break;
+    }
+}
+
+#define NUM_REGS      0x200
+static void hb_regs_write(void *opaque, target_phys_addr_t offset,
+                          uint64_t value, unsigned size)
+{
+    uint32_t *regs = opaque;
+
+    if (offset == 0xf00) {
+        if (value == 1 || value == 2) {
+            qemu_system_reset_request();
+        } else if (value == 3) {
+            qemu_system_shutdown_request();
+        }
+    }
+
+    regs[offset/4] = value;
+}
+
+static uint64_t hb_regs_read(void *opaque, target_phys_addr_t offset,
+                             unsigned size)
+{
+    uint32_t *regs = opaque;
+    uint32_t value = regs[offset/4];
+
+    if ((offset == 0x100) || (offset == 0x108) || (offset == 0x10C)) {
+        value |= 0x30000000;
+    }
+
+    return value;
+}
+
+static const MemoryRegionOps hb_mem_ops = {
+    .read = hb_regs_read,
+    .write = hb_regs_write,
+    .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+typedef struct {
+    SysBusDevice busdev;
+    MemoryRegion *iomem;
+    uint32_t regs[NUM_REGS];
+} HighbankRegsState;
+
+static VMStateDescription vmstate_highbank_regs = {
+    .name = "highbank-regs",
+    .version_id = 0,
+    .minimum_version_id = 0,
+    .minimum_version_id_old = 0,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT32_ARRAY(regs, HighbankRegsState, NUM_REGS),
+        VMSTATE_END_OF_LIST(),
+    },
+};
+
+static void highbank_regs_reset(DeviceState *dev)
+{
+    SysBusDevice *sys_dev = sysbus_from_qdev(dev);
+    HighbankRegsState *s = FROM_SYSBUS(HighbankRegsState, sys_dev);
+
+    s->regs[0x40] = 0x05F20121;
+    s->regs[0x41] = 0x2;
+    s->regs[0x42] = 0x05F30121;
+    s->regs[0x43] = 0x05F40121;
+}
+
+static int highbank_regs_init(SysBusDevice *dev)
+{
+    HighbankRegsState *s = FROM_SYSBUS(HighbankRegsState, dev);
+
+    s->iomem = g_new(MemoryRegion, 1);
+    memory_region_init_io(s->iomem, &hb_mem_ops, s->regs, "highbank_regs",
+                          0x1000);
+    sysbus_init_mmio(dev, s->iomem);
+
+    return 0;
+}
+
+static SysBusDeviceInfo highbank_regs_info = {
+    .init       = highbank_regs_init,
+    .qdev.name  = "highbank-regs",
+    .qdev.desc  = "Calxeda Highbank registers",
+    .qdev.size  = sizeof(HighbankRegsState),
+    .qdev.vmsd  = &vmstate_highbank_regs,
+    .qdev.reset = highbank_regs_reset,
+};
+
+static void highbank_regs_register_device(void)
+{
+    sysbus_register_withprop(&highbank_regs_info);
+}
+
+device_init(highbank_regs_register_device)
+
+static struct arm_boot_info highbank_binfo;
+
+static void highbank_init(ram_addr_t ram_size,
+                     const char *boot_device,
+                     const char *kernel_filename, const char *kernel_cmdline,
+                     const char *initrd_filename, const char *cpu_model)
+{
+    CPUState *env = NULL;
+    DeviceState *dev;
+    SysBusDevice *busdev;
+    qemu_irq *irqp;
+    qemu_irq pic[128];
+    int n;
+    qemu_irq cpu_irq[4];
+    MemoryRegion *sysram;
+    MemoryRegion *dram;
+    MemoryRegion *sysmem;
+    char *sysboot_filename;
+
+    if (!cpu_model) {
+        cpu_model = "cortex-a9";
+    }
+
+    for (n = 0; n < smp_cpus; n++) {
+        env = cpu_init(cpu_model);
+        if (!env) {
+            fprintf(stderr, "Unable to find CPU definition\n");
+            exit(1);
+        }
+        irqp = arm_pic_init_cpu(env);
+        cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ];
+        qemu_register_reset(highbank_cpu_reset, env);
+    }
+
+    sysmem = get_system_memory();
+    dram = g_new(MemoryRegion, 1);
+    memory_region_init_ram(dram, "highbank.dram", ram_size);
+    /* SDRAM at address zero.  */
+    memory_region_add_subregion(sysmem, 0, dram);
+
+    sysram = g_new(MemoryRegion, 1);
+    memory_region_init_ram(sysram, "highbank.sysram", 0x8000);
+    memory_region_add_subregion(sysmem, 0xfff88000, sysram);
+    if (bios_name != NULL) {
+        sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+        if (sysboot_filename != NULL) {
+            uint32_t filesize = get_image_size(sysboot_filename);
+            if (load_image_targphys("sysram.bin", 0xfff88000, filesize) < 0) {
+                hw_error("Unable to load %s\n", bios_name);
+            }
+        } else {
+           hw_error("Unable to find %s\n", bios_name);
+        }
+    }
+
+    dev = qdev_create(NULL, "a9mpcore_priv");
+    qdev_prop_set_uint32(dev, "num-cpu", smp_cpus);
+    qdev_prop_set_uint32(dev, "num-irq", NIRQ_GIC);
+    qdev_init_nofail(dev);
+    busdev = sysbus_from_qdev(dev);
+    sysbus_mmio_map(busdev, 0, GIC_BASE_ADDR);
+    for (n = 0; n < smp_cpus; n++) {
+        sysbus_connect_irq(busdev, n, cpu_irq[n]);
+    }
+
+    for (n = 0; n < 128; n++) {
+        pic[n] = qdev_get_gpio_in(dev, n);
+    }
+
+    dev = qdev_create(NULL, "l2x0");
+    qdev_init_nofail(dev);
+    busdev = sysbus_from_qdev(dev);
+    sysbus_mmio_map(busdev, 0, 0xfff12000);
+
+    dev = qdev_create(NULL, "sp804");
+    qdev_prop_set_uint32(dev, "freq0", 150000000);
+    qdev_prop_set_uint32(dev, "freq1", 150000000);
+    qdev_init_nofail(dev);
+    busdev = sysbus_from_qdev(dev);
+    sysbus_mmio_map(busdev, 0, 0xfff34000);
+    sysbus_connect_irq(busdev, 0, pic[18]);
+    sysbus_create_simple("pl011", 0xfff36000, pic[20]);
+
+    dev = qdev_create(NULL, "highbank-regs");
+    qdev_init_nofail(dev);
+    busdev = sysbus_from_qdev(dev);
+    sysbus_mmio_map(busdev, 0, 0xfff3c000);
+
+    sysbus_create_simple("pl061", 0xfff30000, pic[14]);
+    sysbus_create_simple("pl061", 0xfff31000, pic[15]);
+    sysbus_create_simple("pl061", 0xfff32000, pic[16]);
+    sysbus_create_simple("pl061", 0xfff33000, pic[17]);
+    sysbus_create_simple("pl031", 0xfff35000, pic[19]);
+    sysbus_create_simple("pl022", 0xfff39000, pic[23]);
+
+    sysbus_create_simple("sysbus-ahci", 0xffe08000, pic[83]);
+
+    if (nd_table[0].vlan) {
+        qemu_check_nic_model(&nd_table[0], "xgmac");
+        dev = qdev_create(NULL, "xgmac");
+        qdev_set_nic_properties(dev, &nd_table[0]);
+        qdev_init_nofail(dev);
+        sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0xfff50000);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 0, pic[77]);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 1, pic[78]);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 2, pic[79]);
+
+        qemu_check_nic_model(&nd_table[1], "xgmac");
+        dev = qdev_create(NULL, "xgmac");
+        qdev_set_nic_properties(dev, &nd_table[1]);
+        qdev_init_nofail(dev);
+        sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0xfff51000);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 0, pic[80]);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 1, pic[81]);
+        sysbus_connect_irq(sysbus_from_qdev(dev), 2, pic[82]);
+    }
+
+    highbank_binfo.ram_size = ram_size;
+    highbank_binfo.kernel_filename = kernel_filename;
+    highbank_binfo.kernel_cmdline = kernel_cmdline;
+    highbank_binfo.initrd_filename = initrd_filename;
+    highbank_binfo.board_id = -1; /* provided by deviceTree */
+    highbank_binfo.nb_cpus = smp_cpus;
+    highbank_binfo.loader_start = 0;
+    highbank_binfo.write_secondary_boot = hb_write_secondary;
+    highbank_binfo.secondary_cpu_reset_hook = hb_reset_secondary;
+    arm_load_kernel(first_cpu, &highbank_binfo);
+}
+
+static QEMUMachine highbank_machine = {
+    .name = "highbank",
+    .desc = "Calxeda Highbank (ECX-1000)",
+    .init = highbank_init,
+    .use_scsi = 1,
+    .max_cpus = 4,
+    .no_vga = 1,
+};
+
+static void highbank_machine_init(void)
+{
+    qemu_register_machine(&highbank_machine);
+}
+
+machine_init(highbank_machine_init);