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

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



target-arm queue:
 * Revert and correctly fix refactoring of unallocated_encoding()
 * Take exceptions on ATS instructions when needed
 * aspeed/timer: Provide back-pressure information for short periods
 * memory: Remove unused memory_region_iommu_replay_all()
 * hw/arm/smmuv3: Log a guest error when decoding an invalid STE
 * hw/arm/smmuv3: Remove spurious error messages on IOVA invalidations
 * target/arm: Fix SMMLS argument order
 * hw/arm: Use ARM_CPU_TYPE_NAME() macro when appropriate
 * hw/arm: Correct reference counting for creation of various objects
 * includes: remove stale [smp|max]_cpus externs
 * tcg/README: fix typo
 * atomic_template: fix indentation in GEN_ATOMIC_HELPER
 * include/exec/cpu-defs.h: fix typo
 * target/arm: Free TCG temps in trans_VMOV_64_sp()
 * target/arm: Don't abort on M-profile exception return in linux-user mode

# gpg: Signature made Tue 03 Sep 2019 16:35:19 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20190903: (21 commits)
  target/arm: Don't abort on M-profile exception return in linux-user mode
  target/arm: Free TCG temps in trans_VMOV_64_sp()
  include/exec/cpu-defs.h: fix typo
  atomic_template: fix indentation in GEN_ATOMIC_HELPER
  tcg/README: fix typo s/afterwise/afterwards/
  includes: remove stale [smp|max]_cpus externs
  hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting
  hw/dma/xilinx_axi: Use object_initialize_child for correct ref. counting
  hw/arm/fsl-imx: Add the cpu as child of the SoC object
  hw/arm: Use sysbus_init_child_obj for correct reference counting
  hw/arm: Use object_initialize_child for correct reference counting
  hw/arm: Use ARM_CPU_TYPE_NAME() macro when appropriate
  target/arm: Fix SMMLS argument order
  hw/arm/smmuv3: Remove spurious error messages on IOVA invalidations
  hw/arm/smmuv3: Log a guest error when decoding an invalid STE
  memory: Remove unused memory_region_iommu_replay_all()
  aspeed/timer: Provide back-pressure information for short periods
  target/arm: Take exceptions on ATS instructions when needed
  target/arm: Allow ARMCPRegInfo read/write functions to throw exceptions
  target/arm: Factor out unallocated_encoding for aarch32
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6b422e5f 5e5584c8

hw/arm/allwinner-a10.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static void aw_a10_init(Object *obj) 
    AwA10State *s = AW_A10(obj);



    object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),

                            "cortex-a8-" TYPE_ARM_CPU, &error_abort, NULL);

                            ARM_CPU_TYPE_NAME("cortex-a8"),

                            &error_abort, NULL);



    sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc),

                          TYPE_AW_A10_PIC);

hw/arm/cubieboard.c

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ static void cubieboard_init(MachineState *machine) 


static void cubieboard_machine_init(MachineClass *mc)

{

    mc->desc = "cubietech cubieboard";

    mc->desc = "cubietech cubieboard (Cortex-A9)";

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");

    mc->init = cubieboard_init;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

hw/arm/digic.c

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ static void digic_init(Object *obj) 
    int i;



    object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),

                            "arm946-" TYPE_ARM_CPU, &error_abort, NULL);

                            ARM_CPU_TYPE_NAME("arm946"),

                            &error_abort, NULL);



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

#define DIGIC_TIMER_NAME_MLEN    11

hw/arm/exynos4_boards.c

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ exynos4_boards_init_common(MachineState *machine, 
    exynos4_boards_init_ram(s, get_system_memory(),

                            exynos4_board_ram_size[board_type]);



    object_initialize(&s->soc, sizeof(s->soc), TYPE_EXYNOS4210_SOC);

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

    sysbus_init_child_obj(OBJECT(machine), "soc",

                          &s->soc, sizeof(s->soc), TYPE_EXYNOS4210_SOC);

    object_property_set_bool(OBJECT(&s->soc), true, "realized",

                             &error_fatal);

hw/arm/fsl-imx25.c

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ static void fsl_imx25_init(Object *obj) 
    FslIMX25State *s = FSL_IMX25(obj);

    int i;



    object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);

    object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),

                            ARM_CPU_TYPE_NAME("arm926"),

                            &error_abort, NULL);



    sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),

                          TYPE_IMX_AVIC);