Commit d28e29a9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170914' into staging 



target-arm queue:
 * v7M: various code cleanups
 * v7M: set correct BFSR bits on bus fault
 * v7M: clear exclusive monitor on reset and exception entry/exit
 * v7M: don't apply priority mask to negative priorities
 * zcu102: support 'secure' and 'virtualization' machine properties
 * aarch64: fix ERET single stepping
 * gpex: implement PCI INTx routing
 * mps2-an511: fix UART overflow interrupt line wiring

# gpg: Signature made Thu 14 Sep 2017 18:50:48 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20170914:
  mps2-an511: Fix wiring of UART overflow interrupt lines
  hw/pci-host/gpex: Implement PCI INTx routing
  hw/arm/virt: Set INTx/gsi mapping
  hw/pci-host/gpex: Set INTx index/gsi mapping
  target/arm: Avoid an extra temporary for store_exclusive
  AArch64: Fix single stepping of ERET instruction
  xlnx-zcu102: Mark the EP108 machine as deprecated
  xlnx-zcu102: Add a machine level virtualization property
  xlnx-zcu102: Add a machine level secure property
  xlnx-zcu102: Manually create the machines
  xlnx-ep108: Rename to ZCU102
  target/arm: Rename 'type' to 'excret' in do_v7m_exception_exit()
  target/arm: Add and use defines for EXCRET constants
  target/arm: Remove unnecessary '| 0xf0000000' from do_v7m_exception_exit()
  nvic: Don't apply group priority mask to negative priorities
  target/arm: Get PRECISERR and IBUSERR the right way round
  target/arm: Clear exclusive monitor on v7M reset, exception entry/exit
  target/arm: Use M_REG_NUM_BANKS rather than hardcoding 2

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3dabde11 ce3bc112

hw/arm/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-y += omap1.o omap2.o strongarm.o 
obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o

obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o

obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o

obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o

obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-zcu102.o

obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o

obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o

obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o

hw/arm/mps2.c

+2 −2
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ static void mps2_common_init(MachineState *machine) 
            cmsdk_apb_uart_create(uartbase[i],

                                  qdev_get_gpio_in(txrx_orgate_dev, 0),

                                  qdev_get_gpio_in(txrx_orgate_dev, 1),

                                  qdev_get_gpio_in(orgate_dev, 0),

                                  qdev_get_gpio_in(orgate_dev, 1),

                                  qdev_get_gpio_in(orgate_dev, i * 2),

                                  qdev_get_gpio_in(orgate_dev, i * 2 + 1),

                                  NULL,

                                  uartchr, SYSCLK_FRQ);

        }

hw/arm/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ static void create_pcie(const VirtMachineState *vms, qemu_irq *pic) 


    for (i = 0; i < GPEX_NUM_IRQS; i++) {

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, pic[irq + i]);

        gpex_set_irq_num(GPEX_HOST(dev), i, irq + i);

    }



    pci = PCI_HOST_BRIDGE(dev);

hw/arm/xlnx-ep108.c→hw/arm/xlnx-zcu102.c

+259 −0
Original line number Diff line number Diff line 
/*

 * Xilinx ZynqMP EP108 board

 * Xilinx ZynqMP ZCU102 board

 *

 * Copyright (C) 2015 Xilinx Inc

 * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
@@ -25,16 +25,56 @@ 
#include "exec/address-spaces.h"

#include "qemu/log.h"



typedef struct XlnxEP108 {

typedef struct XlnxZCU102 {

    MachineState parent_obj;



    XlnxZynqMPState soc;

    MemoryRegion ddr_ram;

} XlnxEP108;



static struct arm_boot_info xlnx_ep108_binfo;

    bool secure;

    bool virt;

} XlnxZCU102;



static void xlnx_ep108_init(MachineState *machine)

#define TYPE_ZCU102_MACHINE   MACHINE_TYPE_NAME("xlnx-zcu102")

#define ZCU102_MACHINE(obj) \

    OBJECT_CHECK(XlnxZCU102, (obj), TYPE_ZCU102_MACHINE)



#define TYPE_EP108_MACHINE   MACHINE_TYPE_NAME("xlnx-ep108")

#define EP108_MACHINE(obj) \

    OBJECT_CHECK(XlnxZCU102, (obj), TYPE_EP108_MACHINE)



static struct arm_boot_info xlnx_zcu102_binfo;



static bool zcu102_get_secure(Object *obj, Error **errp)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);



    return s->secure;

}



static void zcu102_set_secure(Object *obj, bool value, Error **errp)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);



    s->secure = value;

}



static bool zcu102_get_virt(Object *obj, Error **errp)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);



    return s->virt;

}



static void zcu102_set_virt(Object *obj, bool value, Error **errp)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);



    s->virt = value;

}



static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine)

{

    XlnxEP108 *s = g_new0(XlnxEP108, 1);

    int i;

    uint64_t ram_size = machine->ram_size;
@@ -47,7 +87,7 @@ static void xlnx_ep108_init(MachineState *machine) 
    }



    if (ram_size < 0x08000000) {

        qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for EP108",

        qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for ZCU102",

                 ram_size);

    }
@@ -60,6 +100,10 @@ static void xlnx_ep108_init(MachineState *machine) 


    object_property_set_link(OBJECT(&s->soc), OBJECT(&s->ddr_ram),

                         "ddr-ram", &error_abort);

    object_property_set_bool(OBJECT(&s->soc), s->secure, "secure",

                             &error_fatal);

    object_property_set_bool(OBJECT(&s->soc), s->virt, "virtualization",

                             &error_fatal);



    object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
@@ -108,32 +152,108 @@ static void xlnx_ep108_init(MachineState *machine) 


    /* TODO create and connect IDE devices for ide_drive_get() */



    xlnx_ep108_binfo.ram_size = ram_size;

    xlnx_ep108_binfo.kernel_filename = machine->kernel_filename;

    xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline;

    xlnx_ep108_binfo.initrd_filename = machine->initrd_filename;

    xlnx_ep108_binfo.loader_start = 0;

    arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_ep108_binfo);

    xlnx_zcu102_binfo.ram_size = ram_size;

    xlnx_zcu102_binfo.kernel_filename = machine->kernel_filename;

    xlnx_zcu102_binfo.kernel_cmdline = machine->kernel_cmdline;

    xlnx_zcu102_binfo.initrd_filename = machine->initrd_filename;

    xlnx_zcu102_binfo.loader_start = 0;

    arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo);

}



static void xlnx_ep108_machine_init(MachineClass *mc)

static void xlnx_ep108_init(MachineState *machine)

{

    mc->desc = "Xilinx ZynqMP EP108 board";

    XlnxZCU102 *s = EP108_MACHINE(machine);



    xlnx_zynqmp_init(s, machine);

}



static void xlnx_ep108_machine_instance_init(Object *obj)

{

    XlnxZCU102 *s = EP108_MACHINE(obj);



    /* EP108, we don't support setting secure or virt */

    s->secure = false;

    s->virt = false;

}



static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "Xilinx ZynqMP EP108 board (Deprecated, please use xlnx-zcu102)";

    mc->init = xlnx_ep108_init;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

    mc->ignore_memory_transaction_failures = true;

}



DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init)

static const TypeInfo xlnx_ep108_machine_init_typeinfo = {

    .name       = MACHINE_TYPE_NAME("xlnx-ep108"),

    .parent     = TYPE_MACHINE,

    .class_init = xlnx_ep108_machine_class_init,

    .instance_init = xlnx_ep108_machine_instance_init,

    .instance_size = sizeof(XlnxZCU102),

};



static void xlnx_zcu102_machine_init(MachineClass *mc)

static void xlnx_ep108_machine_init_register_types(void)

{

    type_register_static(&xlnx_ep108_machine_init_typeinfo);

}



static void xlnx_zcu102_init(MachineState *machine)

{

    XlnxZCU102 *s = ZCU102_MACHINE(machine);



    xlnx_zynqmp_init(s, machine);

}



static void xlnx_zcu102_machine_instance_init(Object *obj)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);



    /* Default to secure mode being disabled */

    s->secure = false;

    object_property_add_bool(obj, "secure", zcu102_get_secure,

                             zcu102_set_secure, NULL);

    object_property_set_description(obj, "secure",

                                    "Set on/off to enable/disable the ARM "

                                    "Security Extensions (TrustZone)",

                                    NULL);



    /* Default to virt (EL2) being disabled */

    s->virt = false;

    object_property_add_bool(obj, "virtualization", zcu102_get_virt,

                             zcu102_set_virt, NULL);

    object_property_set_description(obj, "virtualization",

                                    "Set on/off to enable/disable emulating a "

                                    "guest CPU which implements the ARM "

                                    "Virtualization Extensions",

                                    NULL);

}



static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "Xilinx ZynqMP ZCU102 board";

    mc->init = xlnx_ep108_init;

    mc->init = xlnx_zcu102_init;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

    mc->ignore_memory_transaction_failures = true;

}



DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init)
 
static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {

    .name       = MACHINE_TYPE_NAME("xlnx-zcu102"),

    .parent     = TYPE_MACHINE,

    .class_init = xlnx_zcu102_machine_class_init,

    .instance_init = xlnx_zcu102_machine_instance_init,

    .instance_size = sizeof(XlnxZCU102),

};



static void xlnx_zcu102_machine_init_register_types(void)

{

    type_register_static(&xlnx_zcu102_machine_init_typeinfo);

}



type_init(xlnx_zcu102_machine_init_register_types)

type_init(xlnx_ep108_machine_init_register_types)

hw/arm/xlnx-zynqmp.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        object_property_set_bool(OBJECT(&s->apu_cpu[i]),

                                 s->secure, "has_el3", NULL);

        object_property_set_bool(OBJECT(&s->apu_cpu[i]),

                                 false, "has_el2", NULL);

                                 s->virt, "has_el2", NULL);

        object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR,

                                "reset-cbar", &error_abort);

        object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized",
@@ -427,6 +427,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
static Property xlnx_zynqmp_props[] = {

    DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu),

    DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false),

    DEFINE_PROP_BOOL("virtualization", XlnxZynqMPState, virt, false),

    DEFINE_PROP_BOOL("has_rpu", XlnxZynqMPState, has_rpu, false),

    DEFINE_PROP_LINK("ddr-ram", XlnxZynqMPState, ddr_ram, TYPE_MEMORY_REGION,

                     MemoryRegion *),