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

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



target-arm queue:
 * Implement priority handling properly via GICC_APR
 * Enable TZ extensions on the GIC if we're using them
 * Minor preparatory patches for EL3 support
 * cadence_gem: Correct Marvell PHY SPCFC reset value
 * Support AHCI in ZynqMP

# gpg: Signature made Tue 08 Sep 2015 17:48:33 BST using RSA key ID 14360CDE
# 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>"

* remotes/pmaydell/tags/pull-target-arm-20150908:
  xlnx-zynqmp: Connect the sysbus AHCI to ZynqMP
  xlnx-zynqmp.c: Convert some of the error_propagate() calls to error_abort
  ahci.c: Don't assume AHCIState's parent is AHCIPCIState
  ahci: Separate the AHCI state structure into the header
  cadence_gem: Correct Marvell PHY SPCFC reset value
  target-arm: Add AArch64 access to PAR_EL1
  target-arm: Correct opc1 for AT_S12Exx
  target-arm: Log the target EL when taking exceptions
  target-arm: Fix default_exception_el() function for the case when EL3 is not supported
  hw/arm/virt: Enable TZ extensions on the GIC if we are using them
  hw/arm/virt: Default to not providing TrustZone support
  hw/cpu/{a15mpcore, a9mpcore}: enable TrustZone in GIC if it is enabled in CPUs
  hw/intc/arm_gic_common: Configure IRQs as NS if doing direct NS kernel boot
  hw/arm: new interface for devices which need to behave differently for kernel boot
  qom: Add recursive version of object_child_for_each
  hw/intc/arm_gic: Actually set the active bits for active interrupts
  hw/intc/arm_gic: Drop running_irq and last_active arrays
  hw/intc/arm_gic: Fix handling of GICC_APR<n>, GICC_NSAPR<n> registers
  hw/intc/arm_gic: Running priority is group priority, not full priority
  armv7m_nvic: Implement ICSR without using internal GIC state

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 86112805 6fdf3282

hw/arm/boot.c

+34 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "config.h"

#include "hw/hw.h"

#include "hw/arm/arm.h"

#include "hw/arm/linux-boot-if.h"

#include "sysemu/sysemu.h"

#include "hw/boards.h"

#include "hw/loader.h"
@@ -555,6 +556,20 @@ static void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_t size_key, 
    fw_cfg_add_bytes(fw_cfg, data_key, data, size);

}



static int do_arm_linux_init(Object *obj, void *opaque)

{

    if (object_dynamic_cast(obj, TYPE_ARM_LINUX_BOOT_IF)) {

        ARMLinuxBootIf *albif = ARM_LINUX_BOOT_IF(obj);

        ARMLinuxBootIfClass *albifc = ARM_LINUX_BOOT_IF_GET_CLASS(obj);

        struct arm_boot_info *info = opaque;



        if (albifc->arm_linux_init) {

            albifc->arm_linux_init(albif, info->secure_boot);

        }

    }

    return 0;

}



static void arm_load_kernel_notify(Notifier *notifier, void *data)

{

    CPUState *cs;
@@ -778,6 +793,12 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) 
        if (info->nb_cpus > 1) {

            info->write_secondary_boot(cpu, info);

        }



        /* Notify devices which need to fake up firmware initialization

         * that we're doing a direct kernel boot.

         */

        object_child_foreach_recursive(object_get_root(),

                                       do_arm_linux_init, info);

    }

    info->is_linux = is_linux;
@@ -803,3 +824,16 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
        qemu_register_reset(do_cpu_reset, ARM_CPU(cs));

    }

}



static const TypeInfo arm_linux_boot_if_info = {

    .name = TYPE_ARM_LINUX_BOOT_IF,

    .parent = TYPE_INTERFACE,

    .class_size = sizeof(ARMLinuxBootIfClass),

};



static void arm_linux_boot_register_types(void)

{

    type_register_static(&arm_linux_boot_if_info);

}



type_init(arm_linux_boot_register_types)

hw/arm/virt.c

+10 −4
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static void create_v2m(VirtBoardInfo *vbi, qemu_irq *pic) 
    fdt_add_v2m_gic_node(vbi);

}



static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic)

static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic, bool secure)

{

    /* We create a standalone GIC v2 */

    DeviceState *gicdev;
@@ -413,6 +413,9 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic) 
     * interrupts; there are always 32 of the former (mandated by GIC spec).

     */

    qdev_prop_set_uint32(gicdev, "num-irq", NUM_IRQS + 32);

    if (!kvm_irqchip_in_kernel()) {

        qdev_prop_set_bit(gicdev, "has-security-extensions", secure);

    }

    qdev_init_nofail(gicdev);

    gicbusdev = SYS_BUS_DEVICE(gicdev);

    sysbus_mmio_map(gicbusdev, 0, vbi->memmap[VIRT_GIC_DIST].base);
@@ -967,7 +970,7 @@ static void machvirt_init(MachineState *machine) 


    create_flash(vbi);



    create_gic(vbi, pic);

    create_gic(vbi, pic, vms->secure);



    create_uart(vbi, pic);
@@ -1044,8 +1047,11 @@ static void virt_instance_init(Object *obj) 
{

    VirtMachineState *vms = VIRT_MACHINE(obj);



    /* EL3 is enabled by default on virt */

    vms->secure = true;

    /* EL3 is disabled by default on virt: this makes us consistent

     * between KVM and TCG for this board, and it also allows us to

     * boot UEFI blobs which assume no TrustZone support.

     */

    vms->secure = false;

    object_property_add_bool(obj, "secure", virt_get_secure,

                             virt_set_secure, NULL);

    object_property_set_description(obj, "secure",

hw/arm/xlnx-zynqmp.c

+20 −12
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
#define GIC_DIST_ADDR       0xf9010000

#define GIC_CPU_ADDR        0xf9020000



#define SATA_INTR           133

#define SATA_ADDR           0xFD0C0000

#define SATA_NUM_PORTS      2



static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {

    0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,

};
@@ -90,6 +94,9 @@ static void xlnx_zynqmp_init(Object *obj) 
        object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UART);

        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());

    }



    object_initialize(&s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI);

    qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default());

}



static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
@@ -162,12 +169,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        g_free(name);



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

                                "reset-cbar", &err);

        if (err) {

            error_propagate((errp), (err));

            return;

        }



                                "reset-cbar", &error_abort);

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

                                 &err);

        if (err) {
@@ -200,12 +202,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        g_free(name);



        object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "reset-hivecs",

                                 &err);

        if (err != NULL) {

            error_propagate(errp, err);

            return;

        }



                                 &error_abort);

        object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized",

                                 &err);

        if (err) {
@@ -250,6 +247,17 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,

                           gic_spi[uart_intr[i]]);

    }



    object_property_set_int(OBJECT(&s->sata), SATA_NUM_PORTS, "num-ports",

                            &error_abort);

    object_property_set_bool(OBJECT(&s->sata), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, SATA_ADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);

}



static Property xlnx_zynqmp_props[] = {

hw/cpu/a15mpcore.c

+13 −0
Original line number Diff line number Diff line
@@ -52,10 +52,23 @@ static void a15mp_priv_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *busdev;

    int i;

    Error *err = NULL;

    bool has_el3;

    Object *cpuobj;



    gicdev = DEVICE(&s->gic);

    qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu);

    qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq);



    if (!kvm_irqchip_in_kernel()) {

        /* Make the GIC's TZ support match the CPUs. We assume that

         * either all the CPUs have TZ, or none do.

         */

        cpuobj = OBJECT(qemu_get_cpu(0));

        has_el3 = object_property_find(cpuobj, "has_el3", &error_abort) &&

            object_property_get_bool(cpuobj, "has_el3", &error_abort);

        qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3);

    }



    object_property_set_bool(OBJECT(&s->gic), true, "realized", &err);

    if (err != NULL) {

        error_propagate(errp, err);

hw/cpu/a9mpcore.c

+11 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) 
                 *wdtbusdev;

    Error *err = NULL;

    int i;

    bool has_el3;

    Object *cpuobj;



    scudev = DEVICE(&s->scu);

    qdev_prop_set_uint32(scudev, "num-cpu", s->num_cpu);
@@ -62,6 +64,15 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) 
    gicdev = DEVICE(&s->gic);

    qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu);

    qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq);



    /* Make the GIC's TZ support match the CPUs. We assume that

     * either all the CPUs have TZ, or none do.

     */

    cpuobj = OBJECT(qemu_get_cpu(0));

    has_el3 = object_property_find(cpuobj, "has_el3", &error_abort) &&

        object_property_get_bool(cpuobj, "has_el3", &error_abort);

    qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3);



    object_property_set_bool(OBJECT(&s->gic), true, "realized", &err);

    if (err != NULL) {

        error_propagate(errp, err);