Commit 853f8ca1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * Emulate the SMMUv3 (IOMMU); one will be created in the 'virt' board
   if the commandline includes "-machine iommu=smmuv3"
 * target/arm: Implement v8M VLLDM and VLSTM
 * hw/arm: Don't fail qtest due to missing SD card in -nodefaults mode
 * Some fixes to silence Coverity false-positives
 * arm: boot: set boot_info starting from first_cpu
   (fixes a technical bug not visible in practice)
 * hw/net/smc91c111: Convert away from old_mmio
 * hw/usb/tusb6010: Convert away from old_mmio
 * hw/char/cmsdk-apb-uart.c: Accept more input after character read
 * target/arm: Make MPUIR write-ignored on OMAP, StrongARM
 * hw/arm/virt: Add linux,pci-domain property

# gpg: Signature made Fri 04 May 2018 18:54:49 BST
# gpg:                using RSA key 3C2525ED14360CDE
# 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-20180504-1: (24 commits)
  hw/arm/virt: Introduce the iommu option
  hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
  hw/arm/virt: Add SMMUv3 to the virt board
  target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
  hw/arm/smmuv3: Abort on vfio or vhost case
  hw/arm/smmuv3: Implement translate callback
  hw/arm/smmuv3: Event queue recording helper
  hw/arm/smmuv3: Implement MMIO write operations
  hw/arm/smmuv3: Queue helpers
  hw/arm/smmuv3: Wired IRQ and GERROR helpers
  hw/arm/smmuv3: Skeleton
  hw/arm/smmu-common: VMSAv8-64 page table walk
  hw/arm/smmu-common: IOMMU memory region and address space setup
  hw/arm/smmu-common: smmu base device and datatypes
  target/arm: Implement v8M VLLDM and VLSTM
  hw/arm: Don't fail qtest due to missing SD card in -nodefaults mode
  target/arm: Tidy condition in disas_simd_two_reg_misc
  target/arm: Tidy conditions in handle_vec_simd_shri
  arm: boot: set boot_info starting from first_cpu
  hw/net/smc91c111: Convert away from old_mmio
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c8b7e627 e24e3454

default-configs/aarch64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ CONFIG_DDC=y 
CONFIG_DPCD=y

CONFIG_XLNX_ZYNQMP=y

CONFIG_XLNX_ZYNQMP_ARM=y

CONFIG_ARM_SMMUV3=y

hw/arm/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -35,3 +35,4 @@ 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 mcimx7d-sabre.o

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

hw/arm/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) 
    }

    info->is_linux = is_linux;



    for (cs = CPU(cpu); cs; cs = CPU_NEXT(cs)) {

    for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) {

        ARM_CPU(cs)->env.boot_info = info;

    }

}

hw/arm/omap1.c

+4 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/arm/soc_dma.h"

#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "sysemu/qtest.h"

#include "qemu/range.h"

#include "hw/sysbus.h"

#include "qemu/cutils.h"
@@ -3987,12 +3988,11 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, 
                                omap_findclk(s, "dpll3"));



    dinfo = drive_get(IF_SD, 0, 0);

    if (!dinfo) {

        error_report("missing SecureDigital device");

        exit(1);

    if (!dinfo && !qtest_enabled()) {

        warn_report("missing SecureDigital device");

    }

    s->mmc = omap_mmc_init(0xfffb7800, system_memory,

                           blk_by_legacy_dinfo(dinfo),

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                           qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN),

                           &s->drq[OMAP_DMA_MMC_TX],

                    omap_findclk(s, "mmc_ck"));

hw/arm/omap2.c

+4 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "cpu.h"

#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "sysemu/qtest.h"

#include "hw/boards.h"

#include "hw/hw.h"

#include "hw/arm/arm.h"
@@ -2486,12 +2487,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, 
                             s->drq[OMAP24XX_DMA_GPMC]);



    dinfo = drive_get(IF_SD, 0, 0);

    if (!dinfo) {

        error_report("missing SecureDigital device");

        exit(1);

    if (!dinfo && !qtest_enabled()) {

        warn_report("missing SecureDigital device");

    }

    s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9),

                    blk_by_legacy_dinfo(dinfo),

                    dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                    qdev_get_gpio_in(s->ih[0], OMAP_INT_24XX_MMC_IRQ),

                    &s->drq[OMAP24XX_DMA_MMC1_TX],

                    omap_findclk(s, "mmc_fclk"), omap_findclk(s, "mmc_iclk"));