Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Glenn Miles <milesg@linux.vnet.ibm.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, "Frédéric Barrat" <fbarrat@linux.ibm.com>, David Gibson <david@gibson.dropbear.id.au>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Cleber Rosa <crosa@redhat.com>, Laurent Vivier <lvivier@redhat.com>
MAINTAINERS | 11 +-
docs/about/deprecated.rst | 8 +
docs/devel/testing.rst | 11 +
hw/misc/Kconfig | 4 +
hw/misc/meson.build | 1 +
hw/misc/pca9552.c | 58 ++-
hw/misc/pca9554.c | 328 +++++++++++++++
hw/ppc/Kconfig | 2 +
hw/ppc/meson.build | 5 +-
hw/ppc/pnv.c | 131 +++++-
hw/ppc/pnv_chiptod.c | 586 +++++++++++++++++++++++++++
hw/ppc/pnv_i2c.c | 146 +------
hw/ppc/pnv_n1_chiplet.c | 173 ++++++++
hw/ppc/pnv_nest_pervasive.c | 208 ++++++++++
hw/ppc/spapr.c | 12 +-
hw/ppc/spapr_hcall.c | 12 +-
hw/ppc/spapr_irq.c | 6 +-
hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} | 13 +-
hw/ppc/trace-events | 4 +
include/hw/i2c/pnv_i2c_regs.h | 143 +++++++
include/hw/misc/pca9552.h | 3 +-
include/hw/misc/pca9554.h | 36 ++
include/hw/misc/pca9554_regs.h | 19 +
include/hw/ppc/pnv.h | 3 +
include/hw/ppc/pnv_chip.h | 5 +
include/hw/ppc/pnv_chiptod.h | 53 +++
include/hw/ppc/pnv_n1_chiplet.h | 32 ++
include/hw/ppc/pnv_nest_pervasive.h | 32 ++
include/hw/ppc/pnv_xscom.h | 18 +
include/hw/ppc/spapr.h | 9 +-
include/hw/ppc/spapr_irq.h | 14 +-
pc-bios/skiboot.lid | Bin 2527240 -> 2527328 bytes
target/ppc/cpu.h | 57 ++-
target/ppc/cpu_init.c | 20 +-
target/ppc/excp_helper.c | 36 +-
target/ppc/gdbstub.c | 40 +-
target/ppc/helper_regs.c | 41 +-
target/ppc/mmu_helper.c | 105 +++--
target/ppc/ppc-qmp-cmds.c | 4 +
target/ppc/tcg-stub.c | 15 -
target/ppc/timebase_helper.c | 309 +++++++++++++-
target/ppc/translate.c | 42 +-
target/ppc/translate/vsx-impl.c.inc | 2 +-
tests/avocado/boot_linux.py | 17 +-
tests/avocado/boot_linux_console.py | 11 +-
tests/avocado/migration.py | 1 -
tests/avocado/ppc_hv_tests.py | 202 +++++++++
tests/avocado/ppc_powernv.py | 23 +-
tests/avocado/ppc_pseries.py | 20 +-
tests/qtest/meson.build | 1 +
tests/qtest/pca9552-test.c | 6 +-
tests/qtest/pnv-host-i2c-test.c | 491 ++++++++++++++++++++++
tests/qtest/pnv-xscom-test.c | 61 +--
tests/qtest/pnv-xscom.h | 80 ++++
54 files changed, 3318 insertions(+), 352 deletions(-)
create mode 100644 hw/misc/pca9554.c
create mode 100644 hw/ppc/pnv_chiptod.c
create mode 100644 hw/ppc/pnv_n1_chiplet.c
create mode 100644 hw/ppc/pnv_nest_pervasive.c
rename hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} (97%)
create mode 100644 include/hw/i2c/pnv_i2c_regs.h
create mode 100644 include/hw/misc/pca9554.h
create mode 100644 include/hw/misc/pca9554_regs.h
create mode 100644 include/hw/ppc/pnv_chiptod.h
create mode 100644 include/hw/ppc/pnv_n1_chiplet.h
create mode 100644 include/hw/ppc/pnv_nest_pervasive.h
create mode 100644 tests/avocado/ppc_hv_tests.py
create mode 100644 tests/qtest/pnv-host-i2c-test.c
create mode 100644 tests/qtest/pnv-xscom.h