| 1 | v2: fixed format string errors in trace messages. | 1 | Dropped the tmp421 patch and the following patch that |
|---|---|---|---|
| 2 | depended on it; no other changes. | ||
| 2 | 3 | ||
| 4 | thanks | ||
| 3 | -- PMM | 5 | -- PMM |
| 4 | 6 | ||
| 5 | The following changes since commit c8b7e627b4269a3bc3ae41d9f420547a47e6d9b9: | 7 | The following changes since commit 43771d5d92312504305c19abe29ec5bfabd55f01: |
| 6 | 8 | ||
| 7 | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into staging (2018-05-04 14:42:46 +0100) | 9 | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-05-31' into staging (2017-06-01 16:39:16 +0100) |
| 8 | 10 | ||
| 9 | are available in the Git repository at: | 11 | are available in the git repository at: |
| 10 | 12 | ||
| 11 | git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20180504-1 | 13 | git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170602 |
| 12 | 14 | ||
| 13 | for you to fetch changes up to e24e3454829579eb815ec95d7b3679b0f65845b4: | 15 | for you to fetch changes up to c7637c04be257968e6df30de961a6a23a0ac3dd8: |
| 14 | 16 | ||
| 15 | hw/arm/virt: Introduce the iommu option (2018-05-04 18:52:58 +0100) | 17 | hw/arm/virt: fdt: generate distance-map when needed (2017-06-02 11:51:49 +0100) |
| 16 | 18 | ||
| 17 | ---------------------------------------------------------------- | 19 | ---------------------------------------------------------------- |
| 18 | target-arm queue: | 20 | target-arm queue: |
| 19 | * Emulate the SMMUv3 (IOMMU); one will be created in the 'virt' board | 21 | * virt: numa: provide ACPI distance info when needed |
| 20 | if the commandline includes "-machine iommu=smmuv3" | 22 | * aspeed: fix i2c controller bugs |
| 21 | * target/arm: Implement v8M VLLDM and VLSTM | 23 | * M profile: support MPU |
| 22 | * hw/arm: Don't fail qtest due to missing SD card in -nodefaults mode | 24 | * gicv3: fix mishandling of BPR1, VBPR1 |
| 23 | * Some fixes to silence Coverity false-positives | 25 | * load_uboot_image: don't assume a full header read |
| 24 | * arm: boot: set boot_info starting from first_cpu | 26 | * libvixl: Correct build failures on NetBSD |
| 25 | (fixes a technical bug not visible in practice) | ||
| 26 | * hw/net/smc91c111: Convert away from old_mmio | ||
| 27 | * hw/usb/tusb6010: Convert away from old_mmio | ||
| 28 | * hw/char/cmsdk-apb-uart.c: Accept more input after character read | ||
| 29 | * target/arm: Make MPUIR write-ignored on OMAP, StrongARM | ||
| 30 | * hw/arm/virt: Add linux,pci-domain property | ||
| 31 | 27 | ||
| 32 | ---------------------------------------------------------------- | 28 | ---------------------------------------------------------------- |
| 33 | Eric Auger (11): | 29 | Andrew Jones (3): |
| 34 | hw/arm/smmu-common: smmu base device and datatypes | 30 | load_uboot_image: don't assume a full header read |
| 35 | hw/arm/smmu-common: IOMMU memory region and address space setup | 31 | hw/arm/virt-acpi-build: build SLIT when needed |
| 36 | hw/arm/smmu-common: VMSAv8-64 page table walk | 32 | hw/arm/virt: fdt: generate distance-map when needed |
| 37 | hw/arm/smmuv3: Wired IRQ and GERROR helpers | ||
| 38 | hw/arm/smmuv3: Queue helpers | ||
| 39 | hw/arm/smmuv3: Implement MMIO write operations | ||
| 40 | hw/arm/smmuv3: Event queue recording helper | ||
| 41 | hw/arm/smmuv3: Implement translate callback | ||
| 42 | hw/arm/smmuv3: Abort on vfio or vhost case | ||
| 43 | target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route | ||
| 44 | hw/arm/virt: Introduce the iommu option | ||
| 45 | 33 | ||
| 46 | Igor Mammedov (1): | 34 | Cédric Le Goater (4): |
| 47 | arm: boot: set boot_info starting from first_cpu | 35 | aspeed/i2c: improve command handling |
| 36 | aspeed/i2c: handle LAST command under the RX command | ||
| 37 | aspeed/i2c: introduce a state machine | ||
| 38 | aspeed: add some I2C devices to the Aspeed machines | ||
| 48 | 39 | ||
| 49 | Jan Kiszka (1): | 40 | Kamil Rytarowski (1): |
| 50 | hw/arm/virt: Add linux,pci-domain property | 41 | libvixl: Correct build failures on NetBSD |
| 51 | 42 | ||
| 52 | Mathew Maidment (1): | 43 | Michael Davidsaver (4): |
| 53 | target/arm: Correct MPUIR privilege level in register_cp_regs_for_features() conditional case | 44 | armv7m: Improve "-d mmu" tracing for PMSAv7 MPU |
| 45 | armv7m: Implement M profile default memory map | ||
| 46 | armv7m: Classify faults as MemManage or BusFault | ||
| 47 | arm: add MPU support to M profile CPUs | ||
| 54 | 48 | ||
| 55 | Patrick Oppenlander (1): | 49 | Peter Maydell (12): |
| 56 | hw/char/cmsdk-apb-uart.c: Accept more input after character read | 50 | hw/intc/arm_gicv3_cpuif: Fix reset value for VMCR_EL2.VBPR1 |
| 51 | hw/intc/arm_gicv3_cpuif: Don't let BPR be set below its minimum | ||
| 52 | hw/intc/arm_gicv3_cpuif: Fix priority masking for NS BPR1 | ||
| 53 | arm: Use the mmu_idx we're passed in arm_cpu_do_unaligned_access() | ||
| 54 | arm: Add support for M profile CPUs having different MMU index semantics | ||
| 55 | arm: Use different ARMMMUIdx values for M profile | ||
| 56 | arm: Clean up handling of no-MPU PMSA CPUs | ||
| 57 | arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs | ||
| 58 | arm: Don't let no-MPU PMSA cores write to SCTLR.M | ||
| 59 | arm: Remove unnecessary check on cpu->pmsav7_dregion | ||
| 60 | arm: All M profile cores are PMSA | ||
| 61 | arm: Implement HFNMIENA support for M profile MPU | ||
| 57 | 62 | ||
| 58 | Peter Maydell (3): | 63 | Wei Huang (1): |
| 59 | hw/usb/tusb6010: Convert away from old_mmio | 64 | target/arm: clear PMUVER field of AA64DFR0 when vPMU=off |
| 60 | hw/net/smc91c111: Convert away from old_mmio | ||
| 61 | target/arm: Implement v8M VLLDM and VLSTM | ||
| 62 | 65 | ||
| 63 | Prem Mallappa (3): | 66 | disas/libvixl/Makefile.objs | 3 + |
| 64 | hw/arm/smmuv3: Skeleton | 67 | target/arm/cpu.h | 118 ++++++++++++++-- |
| 65 | hw/arm/virt: Add SMMUv3 to the virt board | 68 | target/arm/translate.h | 2 +- |
| 66 | hw/arm/virt-acpi-build: Add smmuv3 node in IORT table | 69 | hw/arm/aspeed.c | 27 ++++ |
| 70 | hw/arm/virt-acpi-build.c | 4 + | ||
| 71 | hw/arm/virt.c | 21 +++ | ||
| 72 | hw/core/loader.c | 3 +- | ||
| 73 | hw/i2c/aspeed_i2c.c | 65 +++++++-- | ||
| 74 | hw/intc/arm_gicv3_cpuif.c | 50 ++++++- | ||
| 75 | hw/intc/armv7m_nvic.c | 104 ++++++++++++++ | ||
| 76 | target/arm/cpu.c | 28 +++- | ||
| 77 | target/arm/helper.c | 338 ++++++++++++++++++++++++++++++-------------- | ||
| 78 | target/arm/machine.c | 7 +- | ||
| 79 | target/arm/op_helper.c | 3 +- | ||
| 80 | target/arm/translate-a64.c | 18 ++- | ||
| 81 | target/arm/translate.c | 14 +- | ||
| 82 | 16 files changed, 648 insertions(+), 157 deletions(-) | ||
| 67 | 83 | ||
| 68 | Richard Henderson (2): | ||
| 69 | target/arm: Tidy conditions in handle_vec_simd_shri | ||
| 70 | target/arm: Tidy condition in disas_simd_two_reg_misc | ||
| 71 | |||
| 72 | Thomas Huth (1): | ||
| 73 | hw/arm: Don't fail qtest due to missing SD card in -nodefaults mode | ||
| 74 | |||
| 75 | hw/arm/Makefile.objs | 1 + | ||
| 76 | hw/arm/smmu-internal.h | 99 +++ | ||
| 77 | hw/arm/smmuv3-internal.h | 621 ++++++++++++++++++ | ||
| 78 | include/hw/acpi/acpi-defs.h | 15 + | ||
| 79 | include/hw/arm/smmu-common.h | 145 +++++ | ||
| 80 | include/hw/arm/smmuv3.h | 87 +++ | ||
| 81 | include/hw/arm/virt.h | 10 + | ||
| 82 | hw/arm/boot.c | 2 +- | ||
| 83 | hw/arm/omap1.c | 8 +- | ||
| 84 | hw/arm/omap2.c | 8 +- | ||
| 85 | hw/arm/pxa2xx.c | 15 +- | ||
| 86 | hw/arm/smmu-common.c | 372 +++++++++++ | ||
| 87 | hw/arm/smmuv3.c | 1191 +++++++++++++++++++++++++++++++++++ | ||
| 88 | hw/arm/virt-acpi-build.c | 55 +- | ||
| 89 | hw/arm/virt.c | 101 ++- | ||
| 90 | hw/char/cmsdk-apb-uart.c | 1 + | ||
| 91 | hw/net/smc91c111.c | 54 +- | ||
| 92 | hw/usb/tusb6010.c | 40 +- | ||
| 93 | target/arm/helper.c | 2 +- | ||
| 94 | target/arm/kvm.c | 38 +- | ||
| 95 | target/arm/translate-a64.c | 12 +- | ||
| 96 | target/arm/translate.c | 17 +- | ||
| 97 | default-configs/aarch64-softmmu.mak | 1 + | ||
| 98 | hw/arm/trace-events | 37 ++ | ||
| 99 | target/arm/trace-events | 3 + | ||
| 100 | 25 files changed, 2868 insertions(+), 67 deletions(-) | ||
| 101 | create mode 100644 hw/arm/smmu-internal.h | ||
| 102 | create mode 100644 hw/arm/smmuv3-internal.h | ||
| 103 | create mode 100644 include/hw/arm/smmu-common.h | ||
| 104 | create mode 100644 include/hw/arm/smmuv3.h | ||
| 105 | create mode 100644 hw/arm/smmu-common.c | ||
| 106 | create mode 100644 hw/arm/smmuv3.c | ||
| 107 | diff view generated by jsdifflib |