docs/conf.py | 2 +- docs/system/arm/sbsa.rst | 2 +- configs/devices/aarch64-softmmu/default.mak | 6 + configs/devices/arm-softmmu/default.mak | 40 ++++ hw/arm/smmu-internal.h | 37 +++ hw/arm/smmuv3-internal.h | 12 +- include/hw/arm/fsl-imx6.h | 2 + include/hw/arm/smmu-common.h | 45 +++- include/hw/arm/smmuv3.h | 4 + include/qemu/help-texts.h | 2 +- hw/arm/fsl-imx6.c | 8 + hw/arm/sbsa-ref.c | 19 +- hw/arm/smmu-common.c | 209 ++++++++++++++-- hw/arm/smmuv3.c | 358 ++++++++++++++++++++++++---- hw/arm/xlnx-zynqmp.c | 2 +- hw/dma/xilinx_axidma.c | 11 +- target/arm/tcg/tlb_helper.c | 13 +- hw/arm/Kconfig | 123 ++++++---- hw/arm/trace-events | 14 +- target/arm/Kconfig | 3 + tests/qtest/meson.build | 7 +- 21 files changed, 774 insertions(+), 145 deletions(-)