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

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



target-arm queue:
 * New machine mps2-an521 -- this is a model of the AN521 FPGA image for the MPS2 devboard
 * Fix various places where we failed to UNDEF invalid A64 instructions
 * Don't UNDEF a valid FCMLA on 32-bit inputs
 * Fix some bugs in the newly-added PAuth implementation
 * microbit: Implement NVMC non-volatile memory controller

# gpg: Signature made Fri 01 Feb 2019 16:06:03 GMT
# 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-20190201: (47 commits)
  tests/microbit-test: Add tests for nRF51 NVMC
  arm: Instantiate NRF51 special NVM's and NVMC
  hw/nvram/nrf51_nvm: Add nRF51 non-volatile memories
  target/arm: fix decoding of B{,L}RA{A,B}
  target/arm: fix AArch64 virtual address space size
  linux-user: Initialize aarch64 pac keys
  aarch64-linux-user: Enable HWCAP bits for PAuth
  aarch64-linux-user: Update HWCAP bits from linux 5.0-rc1
  target/arm: Always enable pac keys for user-only
  arm: Clarify the logic of set_pc()
  target/arm: Enable API, APK bits in SCR, HCR
  target/arm: Add a timer to predict PMU counter overflow
  target/arm: Send interrupts on PMU counter overflow
  target/arm/translate-a64: Fix mishandling of size in FCMLA decode
  target/arm/translate-a64: Fix FCMLA decoding error
  exec.c: Don't reallocate IOMMUNotifiers that are in use
  target/arm/translate-a64: Don't underdecode SDOT and UDOT
  target/arm/translate-a64: Don't underdecode FP insns
  target/arm/translate-a64: Don't underdecode add/sub extended register
  target/arm/translate-a64: Don't underdecode SIMD ld/st single
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a1bc3e7d 7743b70f

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -624,14 +624,16 @@ F: hw/arm/mps2.c 
F: hw/arm/mps2-tz.c

F: hw/misc/mps2-*.c

F: include/hw/misc/mps2-*.h

F: hw/arm/iotkit.c

F: include/hw/arm/iotkit.h

F: hw/arm/armsse.c

F: include/hw/arm/armsse.h

F: hw/misc/iotkit-secctl.c

F: include/hw/misc/iotkit-secctl.h

F: hw/misc/iotkit-sysctl.c

F: include/hw/misc/iotkit-sysctl.h

F: hw/misc/iotkit-sysinfo.c

F: include/hw/misc/iotkit-sysinfo.h

F: hw/misc/armsse-cpuid.c

F: include/hw/misc/armsse-cpuid.h



Musicpal

M: Jan Kiszka <jan.kiszka@web.de>

default-configs/arm-softmmu.mak

+2 −1
Original line number Diff line number Diff line
@@ -114,10 +114,11 @@ CONFIG_MPS2_SCC=y 
CONFIG_TZ_MPC=y

CONFIG_TZ_MSC=y

CONFIG_TZ_PPC=y

CONFIG_IOTKIT=y

CONFIG_ARMSSE=y

CONFIG_IOTKIT_SECCTL=y

CONFIG_IOTKIT_SYSCTL=y

CONFIG_IOTKIT_SYSINFO=y

CONFIG_ARMSSE_CPUID=y



CONFIG_VERSATILE=y

CONFIG_VERSATILE_PCI=y

exec.c

+6 −4
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 
    int i;



    for (i = 0; i < cpu->iommu_notifiers->len; i++) {

        notifier = &g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier, i);

        notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i);

        if (notifier->mr == mr && notifier->iommu_idx == iommu_idx) {

            break;

        }
@@ -673,7 +673,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 
    if (i == cpu->iommu_notifiers->len) {

        /* Not found, add a new entry at the end of the array */

        cpu->iommu_notifiers = g_array_set_size(cpu->iommu_notifiers, i + 1);

        notifier = &g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier, i);

        notifier = g_new0(TCGIOMMUNotifier, 1);

        g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i) = notifier;



        notifier->mr = mr;

        notifier->iommu_idx = iommu_idx;
@@ -705,8 +706,9 @@ static void tcg_iommu_free_notifier_list(CPUState *cpu) 
    TCGIOMMUNotifier *notifier;



    for (i = 0; i < cpu->iommu_notifiers->len; i++) {

        notifier = &g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier, i);

        notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i);

        memory_region_unregister_iommu_notifier(notifier->mr, &notifier->n);

        g_free(notifier);

    }

    g_array_free(cpu->iommu_notifiers, true);

}
@@ -976,7 +978,7 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) 
        vmstate_register(NULL, cpu->cpu_index, cc->vmsd, cpu);

    }



    cpu->iommu_notifiers = g_array_new(false, true, sizeof(TCGIOMMUNotifier));

    cpu->iommu_notifiers = g_array_new(false, true, sizeof(TCGIOMMUNotifier *));

#endif

}

hw/arm/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o 
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_ARMSSE) += armsse.o

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

obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o

obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o

hw/arm/iotkit.c→hw/arm/armsse.c

+1241 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.