Arm pullreq for the 2.12 codefreeze...

The following changes since commit b39b61e410022f96ceb53d4381d25cba5126ac44:

memory: fix flatview_access_valid RCU read lock/unlock imbalance (2018-03-09 15:55:20 +0000)

git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20180309

for you to fetch changes up to 076a0fc32a73a9b960e0f73f04a531bc1bd94308:

MAINTAINERS: Add entries for SD (SDHCI, SDBus, SDCard) (2018-03-09 17:09:45 +0000)

* i.MX: Add i.MX7 SOC implementation and i.MX7 Sabre board

* Report the correct core count in A53 L2CTLR on the ZynqMP board

* linux-user: preliminary SVE support work (signal handling)

* hw/arm/boot: fix memory leak in case of error loading ELF file

* hw/arm/boot: avoid reading off end of buffer if passed very

small image file

* hw/arm: Use more CONFIG switches for the object files

* target/arm: Add "-cpu max" support

* hw/arm/virt: Support -machine gic-version=max

* hw/sd: improve debug tracing

* hw/sd: sdcard: Add the Tuning Command (CMD 19)

* MAINTAINERS: add Philippe as odd-fixes maintainer for SD

Alistair Francis (2):

target/arm: Add a core count property

hw/arm: Set the core count for Xilinx's ZynqMP

Andrey Smirnov (3):

pci: Add support for Designware IP block

i.MX: Add i.MX7 SOC implementation.

Implement support for i.MX7 Sabre board

Marc-André Lureau (2):

arm: fix load ELF error leak

arm: avoid heap-buffer-overflow in load_aarch64_image

Peter Maydell (6):

target/arm: Query host CPU features on-demand at instance init

target/arm: Move definition of 'host' cpu type into cpu.c

target/arm: Add "-cpu max" support

target/arm: Make 'any' CPU just an alias for 'max'

hw/arm/virt: Add "max" to the list of CPU types "virt" supports

hw/arm/virt: Support -machine gic-version=max

Philippe Mathieu-Daudé (6):

sdcard: Do not trace CMD55, except when we already expect an ACMD

sdcard: Display command name when tracing CMD/ACMD

sdcard: Display which protocol is used when tracing (SD or SPI)

sdcard: Add the Tuning Command (CMD19)

sdhci: Fix a typo in comment

MAINTAINERS: Add entries for SD (SDHCI, SDBus, SDCard)

Richard Henderson (5):

linux-user: Implement aarch64 PR_SVE_SET/GET_VL

aarch64-linux-user: Split out helpers for guest signal handling

aarch64-linux-user: Remove struct target_aux_context

aarch64-linux-user: Add support for EXTRA signal frame records

aarch64-linux-user: Add support for SVE signal frame records

Thomas Huth (1):

hw/arm: Use more CONFIG switches for the object files

From: Andrey Smirnov <andrew.smirnov@gmail.com>

Implement code needed to set up emulation of MCIMX7SABRE board from

NXP. For more info about the HW see:

https://www.nxp.com/support/developer-resources/hardware-development-tools/sabre-development-system/sabre-board-for-smart-devices-based-on-the-i.mx-7dual-applications-processors:MCIMX7SABRE

Cc: Peter Maydell <peter.maydell@linaro.org>

Cc: Jason Wang <jasowang@redhat.com>

Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>

Cc: Marcel Apfelbaum <marcel.apfelbaum@zoho.com>

Cc: Michael S. Tsirkin <mst@redhat.com>

Cc: qemu-devel@nongnu.org

Cc: qemu-arm@nongnu.org

Cc: yurovsky@gmail.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>

hw/arm/Makefile.objs | 2 +-

hw/arm/mcimx7d-sabre.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++

2 files changed, 91 insertions(+), 1 deletion(-)

create mode 100644 hw/arm/mcimx7d-sabre.c

diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs

--- a/hw/arm/Makefile.objs

+++ b/hw/arm/Makefile.objs

@@ -XXX,XX +XXX,XX @@ obj-$(CONFIG_MPS2) += mps2.o

obj-$(CONFIG_MPS2) += mps2-tz.o

obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o

obj-$(CONFIG_IOTKIT) += iotkit.o

-obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o

+obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o

diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/hw/arm/mcimx7d-sabre.c

@@ -XXX,XX +XXX,XX @@

+/*

+ * Copyright (c) 2018, Impinj, Inc.

+ *

+ * MCIMX7D_SABRE Board System emulation.

+ *

+ * Author: Andrey Smirnov <andrew.smirnov@gmail.com>

+ *

+ * This code is licensed under the GPL, version 2 or later.

+ * See the file `COPYING' in the top level directory.

+ *

+ * It (partially) emulates a mcimx7d_sabre board, with a Freescale

+ * i.MX7 SoC

+ */

+#include "qemu/osdep.h"

+#include "qapi/error.h"

+#include "qemu-common.h"

+#include "hw/arm/fsl-imx7.h"

+#include "hw/boards.h"

+#include "sysemu/sysemu.h"

+#include "sysemu/device_tree.h"

+#include "qemu/error-report.h"

+#include "sysemu/qtest.h"

+#include "net/net.h"

+

+typedef struct {

+ FslIMX7State soc;

+ MemoryRegion ram;

+} MCIMX7Sabre;

+

+static void mcimx7d_sabre_init(MachineState *machine)

+{

+ static struct arm_boot_info boot_info;

+ MCIMX7Sabre *s = g_new0(MCIMX7Sabre, 1);

+ Object *soc;

+ int i;

+

+ if (machine->ram_size > FSL_IMX7_MMDC_SIZE) {

+ error_report("RAM size " RAM_ADDR_FMT " above max supported (%08x)",

+ machine->ram_size, FSL_IMX7_MMDC_SIZE);

+ exit(1);

+ boot_info = (struct arm_boot_info) {

+ .loader_start = FSL_IMX7_MMDC_ADDR,

+ .board_id = -1,

+ .ram_size = machine->ram_size,

+ .kernel_filename = machine->kernel_filename,

+ .kernel_cmdline = machine->kernel_cmdline,

+ .initrd_filename = machine->initrd_filename,

+ .nb_cpus = smp_cpus,

+ };

+

+ object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX7);

+ soc = OBJECT(&s->soc);

+ object_property_add_child(OBJECT(machine), "soc", soc, &error_fatal);

+ object_property_set_bool(soc, true, "realized", &error_fatal);

+

+ memory_region_allocate_system_memory(&s->ram, NULL, "mcimx7d-sabre.ram",

+ machine->ram_size);

+ memory_region_add_subregion(get_system_memory(),

+ FSL_IMX7_MMDC_ADDR, &s->ram);

+

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

+ BusState *bus;

+ DeviceState *carddev;

+ DriveInfo *di;

+ BlockBackend *blk;

+

+ di = drive_get_next(IF_SD);

+ blk = di ? blk_by_legacy_dinfo(di) : NULL;

+ bus = qdev_get_child_bus(DEVICE(&s->soc.usdhc[i]), "sd-bus");

+ carddev = qdev_create(bus, TYPE_SD_CARD);

+ qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

+ object_property_set_bool(OBJECT(carddev), true,

+ "realized", &error_fatal);

+ if (!qtest_enabled()) {

+ arm_load_kernel(&s->soc.cpu[0], &boot_info);

+static void mcimx7d_sabre_machine_init(MachineClass *mc)

+{

+ mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex A7)";

+ mc->init = mcimx7d_sabre_init;

+ mc->max_cpus = FSL_IMX7_NUM_CPUS;

+}

+DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)

2.16.2

After spending months studying all the different SD Specifications

from the SD Association, voluntarily add myself as maintainer

for the SD code.

MAINTAINERS | 8 ++++++++

1 file changed, 8 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

S: Maintained

F: hw/ssi/xilinx_*

+SD (Secure Card)

+M: Philippe Mathieu-Daudé <f4bug@amsat.org>

+S: Odd Fixes

+F: include/hw/sd/sd*

+F: hw/sd/core.c

+F: hw/sd/sd*

+F: tests/sd*

+

USB

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

2.16.2

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Spotted by ASAN:

QTEST_QEMU_BINARY=aarch64-softmmu/qemu-system-aarch64 tests/boot-serial-test

Direct leak of 48 byte(s) in 1 object(s) allocated from:

#0 0x7ff8a9b0ca38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)

#1 0x7ff8a8ea7f75 in g_malloc0 ../glib/gmem.c:124

#2 0x55fef3d99129 in error_setv /home/elmarco/src/qemu/util/error.c:59

#3 0x55fef3d99738 in error_setg_internal /home/elmarco/src/qemu/util/error.c:95

#4 0x55fef323acb2 in load_elf_hdr /home/elmarco/src/qemu/hw/core/loader.c:393

#5 0x55fef2d15776 in arm_load_elf /home/elmarco/src/qemu/hw/arm/boot.c:830

#6 0x55fef2d16d39 in arm_load_kernel_notify /home/elmarco/src/qemu/hw/arm/boot.c:1022

#7 0x55fef3dc634d in notifier_list_notify /home/elmarco/src/qemu/util/notify.c:40

#8 0x55fef2fc3182 in qemu_run_machine_init_done_notifiers /home/elmarco/src/qemu/vl.c:2716

#9 0x55fef2fcbbd1 in main /home/elmarco/src/qemu/vl.c:4679

#10 0x7ff89dfed009 in __libc_start_main (/lib64/libc.so.6+0x21009)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

hw/arm/boot.c | 1 +

diff --git a/hw/arm/boot.c b/hw/arm/boot.c

--- a/hw/arm/boot.c

+++ b/hw/arm/boot.c

@@ -XXX,XX +XXX,XX @@ static uint64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry,

load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, &err);

if (err) {

+ error_free(err);

return ret;

}

2.16.2

Split out helpers from target_setup_frame and target_restore_sigframe

for dealing with general registers, fpsimd registers, and the end record.

When we add support for sve registers, the relative positions of

these will change.

Message-id: 20180303143823.27055-3-richard.henderson@linaro.org

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

linux-user/signal.c | 120 ++++++++++++++++++++++++++++++----------------------

1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/linux-user/signal.c b/linux-user/signal.c

--- a/linux-user/signal.c

+++ b/linux-user/signal.c

@@ -XXX,XX +XXX,XX @@ struct target_rt_sigframe {

uint32_t tramp[2];

};

-static int target_setup_sigframe(struct target_rt_sigframe *sf,

- CPUARMState *env, target_sigset_t *set)

+static void target_setup_general_frame(struct target_rt_sigframe *sf,

+ CPUARMState *env, target_sigset_t *set)

{

int i;

- struct target_aux_context *aux =

- (struct target_aux_context *)sf->uc.tuc_mcontext.__reserved;

- /* set up the stack frame for unwinding */

- __put_user(env->xregs[29], &sf->fp);

- __put_user(env->xregs[30], &sf->lr);

+ __put_user(0, &sf->uc.tuc_flags);

+ __put_user(0, &sf->uc.tuc_link);

+

+ __put_user(target_sigaltstack_used.ss_sp, &sf->uc.tuc_stack.ss_sp);

+ __put_user(sas_ss_flags(env->xregs[31]), &sf->uc.tuc_stack.ss_flags);

+ __put_user(target_sigaltstack_used.ss_size, &sf->uc.tuc_stack.ss_size);

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

__put_user(env->xregs[i], &sf->uc.tuc_mcontext.regs[i]);

@@ -XXX,XX +XXX,XX @@ static int target_setup_sigframe(struct target_rt_sigframe *sf,

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

__put_user(set->sig[i], &sf->uc.tuc_sigmask.sig[i]);

}

+static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd,

+ CPUARMState *env)

+ int i;

+

+ __put_user(TARGET_FPSIMD_MAGIC, &fpsimd->head.magic);

+ __put_user(sizeof(struct target_fpsimd_context), &fpsimd->head.size);

+ __put_user(vfp_get_fpsr(env), &fpsimd->fpsr);

+ __put_user(vfp_get_fpcr(env), &fpsimd->fpcr);

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

uint64_t *q = aa64_vfp_qreg(env, i);

#ifdef TARGET_WORDS_BIGENDIAN

- __put_user(q[0], &aux->fpsimd.vregs[i * 2 + 1]);

- __put_user(q[1], &aux->fpsimd.vregs[i * 2]);

+ __put_user(q[0], &fpsimd->vregs[i * 2 + 1]);

+ __put_user(q[1], &fpsimd->vregs[i * 2]);

#else

- __put_user(q[0], &aux->fpsimd.vregs[i * 2]);

- __put_user(q[1], &aux->fpsimd.vregs[i * 2 + 1]);

+ __put_user(q[0], &fpsimd->vregs[i * 2]);

+ __put_user(q[1], &fpsimd->vregs[i * 2 + 1]);

#endif

}

- __put_user(vfp_get_fpsr(env), &aux->fpsimd.fpsr);

- __put_user(vfp_get_fpcr(env), &aux->fpsimd.fpcr);

- __put_user(TARGET_FPSIMD_MAGIC, &aux->fpsimd.head.magic);

- __put_user(sizeof(struct target_fpsimd_context),

- &aux->fpsimd.head.size);

-

- /* set the "end" magic */

- __put_user(0, &aux->end.magic);

- __put_user(0, &aux->end.size);

-

- return 0;

}

-static int target_restore_sigframe(CPUARMState *env,

- struct target_rt_sigframe *sf)

+static void target_setup_end_record(struct target_aarch64_ctx *end)

+{

+ __put_user(0, &end->magic);

+ __put_user(0, &end->size);

+static void target_restore_general_frame(CPUARMState *env,

+ struct target_rt_sigframe *sf)

sigset_t set;

- int i;

- struct target_aux_context *aux =

- (struct target_aux_context *)sf->uc.tuc_mcontext.__reserved;

- uint32_t magic, size, fpsr, fpcr;

uint64_t pstate;

+ int i;

target_to_host_sigset(&set, &sf->uc.tuc_sigmask);

set_sigmask(&set);

@@ -XXX,XX +XXX,XX @@ static int target_restore_sigframe(CPUARMState *env,

__get_user(env->pc, &sf->uc.tuc_mcontext.pc);

__get_user(pstate, &sf->uc.tuc_mcontext.pstate);

pstate_write(env, pstate);

+}

- __get_user(magic, &aux->fpsimd.head.magic);

- __get_user(size, &aux->fpsimd.head.size);

+static void target_restore_fpsimd_record(CPUARMState *env,

+ struct target_fpsimd_context *fpsimd)

+{

+ uint32_t fpsr, fpcr;

+ int i;

- if (magic != TARGET_FPSIMD_MAGIC

- || size != sizeof(struct target_fpsimd_context)) {

- return 1;

+ __get_user(fpsr, &fpsimd->fpsr);

+ vfp_set_fpsr(env, fpsr);

+ __get_user(fpcr, &fpsimd->fpcr);

+ vfp_set_fpcr(env, fpcr);

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

uint64_t *q = aa64_vfp_qreg(env, i);

#ifdef TARGET_WORDS_BIGENDIAN

- __get_user(q[0], &aux->fpsimd.vregs[i * 2 + 1]);

- __get_user(q[1], &aux->fpsimd.vregs[i * 2]);

+ __get_user(q[0], &fpsimd->vregs[i * 2 + 1]);

+ __get_user(q[1], &fpsimd->vregs[i * 2]);

#else

- __get_user(q[0], &aux->fpsimd.vregs[i * 2]);

- __get_user(q[1], &aux->fpsimd.vregs[i * 2 + 1]);

+ __get_user(q[0], &fpsimd->vregs[i * 2]);

+ __get_user(q[1], &fpsimd->vregs[i * 2 + 1]);

#endif

}

- __get_user(fpsr, &aux->fpsimd.fpsr);

- vfp_set_fpsr(env, fpsr);

- __get_user(fpcr, &aux->fpsimd.fpcr);

- vfp_set_fpcr(env, fpcr);

+}

+static int target_restore_sigframe(CPUARMState *env,

+ struct target_rt_sigframe *sf)

+{

+ struct target_aux_context *aux

+ = (struct target_aux_context *)sf->uc.tuc_mcontext.__reserved;

+ uint32_t magic, size;

+

+ target_restore_general_frame(env, sf);

+

+ __get_user(magic, &aux->fpsimd.head.magic);

+ __get_user(size, &aux->fpsimd.head.size);

+ if (magic == TARGET_FPSIMD_MAGIC

+ && size == sizeof(struct target_fpsimd_context)) {

+ target_restore_fpsimd_record(env, &aux->fpsimd);

+ } else {

+ return 1;

+ }

return 0;

}

@@ -XXX,XX +XXX,XX @@ static void target_setup_frame(int usig, struct target_sigaction *ka,

CPUARMState *env)

{

struct target_rt_sigframe *frame;

+ struct target_aux_context *aux;

abi_ulong frame_addr, return_addr;

frame_addr = get_sigframe(ka, env);

@@ -XXX,XX +XXX,XX @@ static void target_setup_frame(int usig, struct target_sigaction *ka,

if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {

goto give_sigsegv;

}

+ aux = (struct target_aux_context *)frame->uc.tuc_mcontext.__reserved;

- __put_user(0, &frame->uc.tuc_flags);

- __put_user(0, &frame->uc.tuc_link);

+ target_setup_general_frame(frame, env, set);

+ target_setup_fpsimd_record(&aux->fpsimd, env);

+ target_setup_end_record(&aux->end);

- __put_user(target_sigaltstack_used.ss_sp,

- &frame->uc.tuc_stack.ss_sp);

- __put_user(sas_ss_flags(env->xregs[31]),

- &frame->uc.tuc_stack.ss_flags);

- __put_user(target_sigaltstack_used.ss_size,

- &frame->uc.tuc_stack.ss_size);

- target_setup_sigframe(frame, env, set);

if (ka->sa_flags & TARGET_SA_RESTORER) {

return_addr = ka->sa_restorer;

} else {

2.16.2