Failed in applying to current master (
apply log)
Maintainers: Alistair Francis <alistair@alistair23.me>, Peter Maydell <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <leif.lindholm@oss.qualcomm.com>, Eric Auger <eric.auger@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>
docs/system/arm/emulation.rst | 1 +
docs/system/generic-loader.rst | 56 ++++----
hw/arm/max78000fthr.c | 3 +-
hw/arm/omap1.c | 203 +++++++++++++-------------
hw/arm/raspi.c | 1 -
hw/arm/sbsa-ref.c | 16 ++-
hw/arm/smmu-common.c | 11 ++
hw/arm/virt.c | 13 +-
hw/char/cmsdk-apb-uart.c | 8 ++
hw/core/generic-loader.c | 18 +++
hw/dma/omap_dma.c | 7 +-
hw/gpio/omap_gpio.c | 7 +-
hw/i2c/omap_i2c.c | 7 +-
hw/sd/omap_mmc.c | 7 +-
include/hw/arm/arm-security.h | 37 +++++
include/hw/arm/omap.h | 10 --
include/hw/arm/smmu-common.h | 4 +
include/hw/arm/virt.h | 2 +
target/arm/cpu-features.h | 7 +
target/arm/cpu-sysregs.h.inc | 1 +
target/arm/cpu.h | 59 ++++----
target/arm/helper.c | 211 +++++++++++++++-------------
target/arm/internals.h | 5 +
target/arm/ptw.c | 57 +++++---
target/arm/tcg/cpu64.c | 4 +
tests/functional/arm/test_aspeed_rainier.py | 6 +-
tests/tcg/aarch64/system/asid2.c | 76 ++++++++++
27 files changed, 537 insertions(+), 300 deletions(-)
create mode 100644 include/hw/arm/arm-security.h
create mode 100644 tests/tcg/aarch64/system/asid2.c