Commit 3f060292 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * vITS: Support save/restore
 * timer/aspeed: Fix timer enablement when reload is not set
 * aspped: add temperature sensor device
 * timer.h: Provide better monotonic time on ARM hosts
 * exynos4210: various cleanups
 * exynos4210: support system poweroff

# gpg: Signature made Tue 13 Jun 2017 15:05:49 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-20170613:
  hw/intc/arm_gicv3_its: Allow save/restore
  hw/intc/arm_gicv3_kvm: Implement pending table save
  hw/intc/arm_gicv3_its: Implement state save/restore
  kvm-all: Pass an error object to kvm_device_access
  timer/aspeed: fix timer enablement when a reload is not set
  aspeed: add a temp sensor device on I2C bus 3
  hw/misc: add a TMP42{1, 2, 3} device model
  timer.h: Provide better monotonic time
  hw/misc/exynos4210_pmu: Add support for system poweroff
  hw/intc/exynos4210_gic: Constify array of combiner interrupts
  hw/arm/exynos: Use type define instead of hard-coded a9mpcore_priv string
  hw/arm/exynos: Declare local variables in some order
  hw/arm/exynos: Move DRAM initialization next boards
  hw/timer/exynos4210_mct: Remove unused defines
  hw/timer/exynos4210_mct: Cleanup indentation and empty new lines
  hw/timer/exynos4210_mct: Fix checkpatch style errors
  hw/intc/exynos4210_gic: Use more meaningful name for local variable

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6f153ceb 252a7a6a

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_TWL92230=y 
CONFIG_TSC2005=y

CONFIG_LM832X=y

CONFIG_TMP105=y

CONFIG_TMP421=y

CONFIG_STELLARIS=y

CONFIG_STELLARIS_INPUT=y

CONFIG_STELLARIS_ENET=y

hw/arm/aspeed.c

+9 −0
Original line number Diff line number Diff line
@@ -239,10 +239,19 @@ static void aspeed_board_init(MachineState *machine, 
static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;

    DeviceState *dev;



    /* The palmetto platform expects a ds3231 RTC but a ds1338 is

     * enough to provide basic RTC features. Alarms will be missing */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 0), "ds1338", 0x68);



    /* add a TMP423 temperature sensor */

    dev = i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2),

                           "tmp423", 0x4c);

    object_property_set_int(OBJECT(dev), 31000, "temperature0", &error_abort);

    object_property_set_int(OBJECT(dev), 28000, "temperature1", &error_abort);

    object_property_set_int(OBJECT(dev), 20000, "temperature2", &error_abort);

    object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);

}



static void palmetto_bmc_init(MachineState *machine)

hw/arm/exynos4210.c

+5 −22
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qemu-common.h"

#include "qemu/log.h"

#include "cpu.h"

#include "hw/cpu/a9mpcore.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "hw/sysbus.h"
@@ -160,16 +161,14 @@ static uint64_t exynos4210_calc_affinity(int cpu) 
    return mp_affinity;

}



Exynos4210State *exynos4210_init(MemoryRegion *system_mem,

        unsigned long ram_size)

Exynos4210State *exynos4210_init(MemoryRegion *system_mem)

{

    int i, n;

    Exynos4210State *s = g_new(Exynos4210State, 1);

    qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];

    unsigned long mem_size;

    DeviceState *dev;

    SysBusDevice *busdev;

    ObjectClass *cpu_oc;

    DeviceState *dev;

    int i, n;



    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9");

    assert(cpu_oc);
@@ -213,7 +212,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
    }



    /* Private memory region and Internal GIC */

    dev = qdev_create(NULL, "a9mpcore_priv");

    dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV);

    qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);

    qdev_init_nofail(dev);

    busdev = SYS_BUS_DEVICE(dev);
@@ -299,22 +298,6 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
    memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,

                                &s->iram_mem);



    /* DRAM */

    mem_size = ram_size;

    if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {

        memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",

                mem_size - EXYNOS4210_DRAM_MAX_SIZE, &error_fatal);

        vmstate_register_ram_global(&s->dram1_mem);

        memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,

                &s->dram1_mem);

        mem_size = EXYNOS4210_DRAM_MAX_SIZE;

    }

    memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,

                           &error_fatal);

    vmstate_register_ram_global(&s->dram0_mem);

    memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,

            &s->dram0_mem);



   /* PMU.

    * The only reason of existence at the moment is that secondary CPU boot

    * loader uses PMU INFORM5 register as a holding pen.

hw/arm/exynos4_boards.c

+43 −7
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */



#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu-common.h"

#include "cpu.h"
@@ -56,6 +57,12 @@ typedef enum Exynos4BoardType { 
    EXYNOS4_NUM_OF_BOARDS

} Exynos4BoardType;



typedef struct Exynos4BoardState {

    Exynos4210State *soc;

    MemoryRegion dram0_mem;

    MemoryRegion dram1_mem;

} Exynos4BoardState;



static int exynos4_board_id[EXYNOS4_NUM_OF_BOARDS] = {

    [EXYNOS4_BOARD_NURI]     = 0xD33,

    [EXYNOS4_BOARD_SMDKC210] = 0xB16,
@@ -96,9 +103,34 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    }

}



static Exynos4210State *exynos4_boards_init_common(MachineState *machine,

static void exynos4_boards_init_ram(Exynos4BoardState *s,

                                    MemoryRegion *system_mem,

                                    unsigned long ram_size)

{

    unsigned long mem_size = ram_size;



    if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {

        memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",

                               mem_size - EXYNOS4210_DRAM_MAX_SIZE,

                               &error_fatal);

        vmstate_register_ram_global(&s->dram1_mem);

        memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,

                                    &s->dram1_mem);

        mem_size = EXYNOS4210_DRAM_MAX_SIZE;

    }



    memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,

                           &error_fatal);

    vmstate_register_ram_global(&s->dram0_mem);

    memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,

                                &s->dram0_mem);

}



static Exynos4BoardState *

exynos4_boards_init_common(MachineState *machine,

                           Exynos4BoardType board_type)

{

    Exynos4BoardState *s = g_new(Exynos4BoardState, 1);

    MachineClass *mc = MACHINE_GET_CLASS(machine);



    if (smp_cpus != EXYNOS4210_NCPUS && !qtest_enabled()) {
@@ -127,8 +159,12 @@ static Exynos4210State *exynos4_boards_init_common(MachineState *machine, 
            machine->kernel_cmdline,

            machine->initrd_filename);



    return exynos4210_init(get_system_memory(),

    exynos4_boards_init_ram(s, get_system_memory(),

                            exynos4_board_ram_size[board_type]);



    s->soc = exynos4210_init(get_system_memory());



    return s;

}



static void nuri_init(MachineState *machine)
@@ -140,11 +176,11 @@ static void nuri_init(MachineState *machine) 


static void smdkc210_init(MachineState *machine)

{

    Exynos4210State *s = exynos4_boards_init_common(machine,

    Exynos4BoardState *s = exynos4_boards_init_common(machine,

                                                      EXYNOS4_BOARD_SMDKC210);



    lan9215_init(SMDK_LAN9118_BASE_ADDR,

            qemu_irq_invert(s->irq_table[exynos4210_get_irq(37, 1)]));

            qemu_irq_invert(s->soc->irq_table[exynos4210_get_irq(37, 1)]));

    arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo);

}

hw/intc/arm_gic_kvm.c

+5 −4
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ static void kvm_gicd_access(GICState *s, int offset, int cpu, 
                            uint32_t *val, bool write)

{

    kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,

                      KVM_VGIC_ATTR(offset, cpu), val, write);

                      KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

}



static void kvm_gicc_access(GICState *s, int offset, int cpu,

                            uint32_t *val, bool write)

{

    kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_REGS,

                      KVM_VGIC_ATTR(offset, cpu), val, write);

                      KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

}



#define for_each_irq_reg(_ctr, _max_irq, _field_width) \
@@ -538,13 +538,14 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) 
        if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0)) {

            uint32_t numirqs = s->num_irq;

            kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0,

                              &numirqs, true);

                              &numirqs, true, &error_abort);

        }

        /* Tell the kernel to complete VGIC initialization now */

        if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

                                  KVM_DEV_ARM_VGIC_CTRL_INIT)) {

            kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

                              KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);

                              KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true,

                              &error_abort);

        }

    } else if (ret != -ENODEV && ret != -ENOTSUP) {

        error_setg_errno(errp, -ret, "error creating in-kernel VGIC");