thanks

Philippe Mathieu-Daudé (3):

hw/arm/exynos4: Remove unuseful debug code

hw/arm/exynos4: Use the IEC binary prefix definitions

hw/arm/exynos4210: QOM'ify the Exynos4210 SoC

Richard Henderson (2):

target/arm: Use extract2 for EXTR

target/arm: Simplify BFXIL expansion

include/hw/arm/allwinner-a10.h | 2 +-

include/hw/arm/aspeed_soc.h | 1 -

include/hw/arm/bcm2836.h | 1 -

include/hw/arm/{arm.h => boot.h} | 12 +++------

include/hw/arm/exynos4210.h | 9 +++++--

include/hw/arm/fsl-imx25.h | 2 +-

include/hw/arm/fsl-imx31.h | 2 +-

include/hw/arm/fsl-imx6.h | 2 +-

include/hw/arm/fsl-imx6ul.h | 2 +-

include/hw/arm/fsl-imx7.h | 2 +-

include/hw/arm/virt.h | 2 +-

include/hw/arm/xlnx-versal.h | 2 +-

include/hw/arm/xlnx-zynqmp.h | 2 +-

include/hw/timer/armv7m_systick.h | 22 ++++++++++++++++

hw/arm/armsse.c | 2 +-

hw/arm/armv7m.c | 2 +-

hw/arm/aspeed.c | 2 +-

hw/arm/boot.c | 2 +-

hw/arm/collie.c | 2 +-

hw/arm/exynos4210.c | 54 ++++++++++++++++++++++++++++++++++++---

hw/arm/exynos4_boards.c | 40 ++++++++---------------------

hw/arm/highbank.c | 2 +-

hw/arm/integratorcp.c | 2 +-

hw/arm/mainstone.c | 2 +-

hw/arm/microbit.c | 2 +-

hw/arm/mps2-tz.c | 2 +-

hw/arm/mps2.c | 2 +-

hw/arm/msf2-soc.c | 1 -

hw/arm/msf2-som.c | 2 +-

hw/arm/musca.c | 2 +-

hw/arm/musicpal.c | 2 +-

hw/arm/netduino2.c | 2 +-

hw/arm/nrf51_soc.c | 2 +-

hw/arm/nseries.c | 2 +-

hw/arm/omap1.c | 2 +-

hw/arm/omap2.c | 2 +-

hw/arm/omap_sx1.c | 2 +-

hw/arm/palm.c | 2 +-

hw/arm/raspi.c | 2 +-

hw/arm/realview.c | 2 +-

hw/arm/spitz.c | 2 +-

hw/arm/stellaris.c | 2 +-

hw/arm/stm32f205_soc.c | 2 +-

hw/arm/strongarm.c | 2 +-

hw/arm/tosa.c | 2 +-

hw/arm/versatilepb.c | 2 +-

hw/arm/vexpress.c | 2 +-

hw/arm/virt.c | 2 +-

hw/arm/xilinx_zynq.c | 2 +-

hw/arm/xlnx-versal.c | 2 +-

hw/arm/z2.c | 2 +-

hw/intc/arm_gicv3_cpuif.c | 6 ++---

hw/intc/armv7m_nvic.c | 1 -

target/arm/arm-semi.c | 1 -

target/arm/cpu.c | 1 -

target/arm/cpu64.c | 1 -

target/arm/kvm.c | 1 -

target/arm/kvm32.c | 1 -

target/arm/kvm64.c | 1 -

target/arm/translate-a64.c | 44 ++++++++++++++++---------------

target/arm/translate.c | 4 +--

61 files changed, 164 insertions(+), 123 deletions(-)

rename include/hw/arm/{arm.h => boot.h} (96%)

From: Richard Henderson <richard.henderson@linaro.org>

This is, after all, how we implement extract2 in tcg/aarch64.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20190514011129.11330-2-richard.henderson@linaro.org

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

target/arm/translate-a64.c | 38 ++++++++++++++++++++------------------

1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/translate-a64.c

+++ b/target/arm/translate-a64.c

@@ -XXX,XX +XXX,XX @@ static void disas_extract(DisasContext *s, uint32_t insn)

} else {

tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rm));

}

- } else if (rm == rn) { /* ROR */

- tcg_rm = cpu_reg(s, rm);

- if (sf) {

- tcg_gen_rotri_i64(tcg_rd, tcg_rm, imm);

- } else {

- TCGv_i32 tmp = tcg_temp_new_i32();

- tcg_gen_extrl_i64_i32(tmp, tcg_rm);

- tcg_gen_rotri_i32(tmp, tmp, imm);

- tcg_gen_extu_i32_i64(tcg_rd, tmp);

- tcg_temp_free_i32(tmp);

- }

} else {

- tcg_rm = read_cpu_reg(s, rm, sf);

- tcg_rn = read_cpu_reg(s, rn, sf);

- tcg_gen_shri_i64(tcg_rm, tcg_rm, imm);

- tcg_gen_shli_i64(tcg_rn, tcg_rn, bitsize - imm);

- tcg_gen_or_i64(tcg_rd, tcg_rm, tcg_rn);

- if (!sf) {

- tcg_gen_ext32u_i64(tcg_rd, tcg_rd);

+ tcg_rm = cpu_reg(s, rm);

+ tcg_rn = cpu_reg(s, rn);

+

+ if (sf) {

+ /* Specialization to ROR happens in EXTRACT2. */

+ tcg_gen_extract2_i64(tcg_rd, tcg_rm, tcg_rn, imm);

+ } else {

+ TCGv_i32 t0 = tcg_temp_new_i32();

+

+ tcg_gen_extrl_i64_i32(t0, tcg_rm);

+ if (rm == rn) {

+ tcg_gen_rotri_i32(t0, t0, imm);

+ } else {

+ TCGv_i32 t1 = tcg_temp_new_i32();

+ tcg_gen_extrl_i64_i32(t1, tcg_rn);

+ tcg_gen_extract2_i32(t0, t0, t1, imm);

+ tcg_temp_free_i32(t1);

+ }

+ tcg_gen_extu_i32_i64(tcg_rd, t0);

+ tcg_temp_free_i32(t0);

}

}

}

--

2.20.1

From: Richard Henderson <richard.henderson@linaro.org>

The mask implied by the extract is redundant with the one

implied by the deposit. Also, fix spelling of BFXIL.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20190514011129.11330-3-richard.henderson@linaro.org

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

target/arm/translate-a64.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/translate-a64.c

+++ b/target/arm/translate-a64.c

@@ -XXX,XX +XXX,XX @@ static void disas_bitfield(DisasContext *s, uint32_t insn)

tcg_gen_extract_i64(tcg_rd, tcg_tmp, ri, len);

return;

}

- /* opc == 1, BXFIL fall through to deposit */

- tcg_gen_extract_i64(tcg_tmp, tcg_tmp, ri, len);

+ /* opc == 1, BFXIL fall through to deposit */

+ tcg_gen_shri_i64(tcg_tmp, tcg_tmp, ri);

pos = 0;

} else {

/* Handle the ri > si case with a deposit

@@ -XXX,XX +XXX,XX @@ static void disas_bitfield(DisasContext *s, uint32_t insn)

len = ri;

}

- if (opc == 1) { /* BFM, BXFIL */

+ if (opc == 1) { /* BFM, BFXIL */

tcg_gen_deposit_i64(tcg_rd, tcg_rd, tcg_tmp, pos, len);

} else {

/* SBFM or UBFM: We start with zero, and we haven't modified

--

2.20.1

From: Alistair Francis <alistair.francis@wdc.com>

Commit 89e68b575 "target/arm: Use vector operations for saturation"

causes this abort() when booting QEMU ARM with a Cortex-A15:

0 0x00007ffff4c2382f in raise () at /usr/lib/libc.so.6

1 0x00007ffff4c0e672 in abort () at /usr/lib/libc.so.6

2 0x00005555559c1839 in disas_neon_data_insn (insn=<optimized out>, s=<optimized out>) at ./target/arm/translate.c:6673

3 0x00005555559c1839 in disas_neon_data_insn (s=<optimized out>, insn=<optimized out>) at ./target/arm/translate.c:6386

4 0x00005555559cd8a4 in disas_arm_insn (insn=4081107068, s=0x7fffe59a9510) at ./target/arm/translate.c:9289

5 0x00005555559cd8a4 in arm_tr_translate_insn (dcbase=0x7fffe59a9510, cpu=<optimized out>) at ./target/arm/translate.c:13612

6 0x00005555558d1d39 in translator_loop (ops=0x5555561cc580 <arm_translator_ops>, db=0x7fffe59a9510, cpu=0x55555686a2f0, tb=<optimized out>, max_insns=<optimized out>) at ./accel/tcg/translator.c:96

7 0x00005555559d10d4 in gen_intermediate_code (cpu=cpu@entry=0x55555686a2f0, tb=tb@entry=0x7fffd7840080 <code_gen_buffer+126091347>, max_insns=max_insns@entry=512) at ./target/arm/translate.c:13901

8 0x00005555558d06b9 in tb_gen_code (cpu=cpu@entry=0x55555686a2f0, pc=3067096216, cs_base=0, flags=192, cflags=-16252928, cflags@entry=524288) at ./accel/tcg/translate-all.c:1736

9 0x00005555558ce467 in tb_find (cf_mask=524288, tb_exit=1, last_tb=0x7fffd783e640 <code_gen_buffer+126084627>, cpu=0x1) at ./accel/tcg/cpu-exec.c:407

10 0x00005555558ce467 in cpu_exec (cpu=cpu@entry=0x55555686a2f0) at ./accel/tcg/cpu-exec.c:728

11 0x000055555588b0cf in tcg_cpu_exec (cpu=0x55555686a2f0) at ./cpus.c:1431

12 0x000055555588d223 in qemu_tcg_cpu_thread_fn (arg=0x55555686a2f0) at ./cpus.c:1735

13 0x000055555588d223 in qemu_tcg_cpu_thread_fn (arg=arg@entry=0x55555686a2f0) at ./cpus.c:1709

14 0x0000555555d2629a in qemu_thread_start (args=<optimized out>) at ./util/qemu-thread-posix.c:502

15 0x00007ffff4db8a92 in start_thread () at /usr/lib/libpthread.

This patch ensures that we don't hit the abort() in the second switch

case in disas_neon_data_insn() as we will return from the first case.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Tested-by: Alex Bennée <alex.bennee@linaro.org>

Message-id: ad91b397f360b2fc7f4087e476f7df5b04d42ddb.1558021877.git.alistair.francis@wdc.com

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

target/arm/translate.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/arm/translate.c b/target/arm/translate.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/translate.c

+++ b/target/arm/translate.c

@@ -XXX,XX +XXX,XX @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn)

tcg_gen_gvec_4(rd_ofs, offsetof(CPUARMState, vfp.qc),

rn_ofs, rm_ofs, vec_size, vec_size,

(u ? uqadd_op : sqadd_op) + size);

- break;

+ return 0;

case NEON_3R_VQSUB:

tcg_gen_gvec_4(rd_ofs, offsetof(CPUARMState, vfp.qc),

rn_ofs, rm_ofs, vec_size, vec_size,

(u ? uqsub_op : sqsub_op) + size);

- break;

+ return 0;

case NEON_3R_VMUL: /* VMUL */

if (u) {

--

2.20.1

The system_clock_scale global is used only by the armv7m systick

device; move the extern declaration to the armv7m_systick.h header,

and expand the comment to explain what it is and that it should

ideally be replaced with a different approach.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: 20190516163857.6430-2-peter.maydell@linaro.org

---

include/hw/arm/arm.h | 4 ----

include/hw/timer/armv7m_systick.h | 22 ++++++++++++++++++++++

2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/arm.h

+++ b/include/hw/arm/arm.h

@@ -XXX,XX +XXX,XX @@ void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu,

const struct arm_boot_info *info,

hwaddr mvbar_addr);

-/* Multiplication factor to convert from system clock ticks to qemu timer

- ticks. */

-extern int system_clock_scale;

-

#endif /* HW_ARM_H */

diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_systick.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/timer/armv7m_systick.h

+++ b/include/hw/timer/armv7m_systick.h

@@ -XXX,XX +XXX,XX @@ typedef struct SysTickState {

qemu_irq irq;

} SysTickState;

+/*

+ * Multiplication factor to convert from system clock ticks to qemu timer

+ * ticks. This should be set (by board code, usually) to a value

+ * equal to NANOSECONDS_PER_SECOND / frq, where frq is the clock frequency

+ * in Hz of the CPU.

+ *

+ * This value is used by the systick device when it is running in

+ * its "use the CPU clock" mode (ie when SYST_CSR.CLKSOURCE == 1) to

+ * set how fast the timer should tick.

+ *

+ * TODO: we should refactor this so that rather than using a global

+ * we use a device property or something similar. This is complicated

+ * because (a) the property would need to be plumbed through from the

+ * board code down through various layers to the systick device

+ * and (b) the property needs to be modifiable after realize, because

+ * the stellaris board uses this to implement the behaviour where the

+ * guest can reprogram the PLL registers to downclock the CPU, and the

+ * systick device needs to react accordingly. Possibly this should

+ * be deferred until we have a good API for modelling clock trees.

+ */

+extern int system_clock_scale;

+

#endif

--

2.20.1

The hw/arm/arm.h header now only includes declarations relating

to boot.c code, so it is only needed by Arm board or SoC code.

Remove some unnecessary inclusions of it from target/arm files

and from hw/intc/armv7m_nvic.c.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: 20190516163857.6430-3-peter.maydell@linaro.org

---

hw/intc/armv7m_nvic.c | 1 -

target/arm/arm-semi.c | 1 -

target/arm/cpu.c | 1 -

target/arm/cpu64.c | 1 -

target/arm/kvm.c | 1 -

target/arm/kvm32.c | 1 -

target/arm/kvm64.c | 1 -

7 files changed, 7 deletions(-)

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/armv7m_nvic.c

+++ b/hw/intc/armv7m_nvic.c

@@ -XXX,XX +XXX,XX @@

#include "cpu.h"

#include "hw/sysbus.h"

#include "qemu/timer.h"

-#include "hw/arm/arm.h"

#include "hw/intc/armv7m_nvic.h"

#include "target/arm/cpu.h"

#include "exec/exec-all.h"

diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/arm-semi.c

+++ b/target/arm/arm-semi.c

@@ -XXX,XX +XXX,XX @@

#else

#include "qemu-common.h"

#include "exec/gdbstub.h"

-#include "hw/arm/arm.h"

#include "qemu/cutils.h"

#endif

diff --git a/target/arm/cpu.c b/target/arm/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/cpu.c

+++ b/target/arm/cpu.c

@@ -XXX,XX +XXX,XX @@

#if !defined(CONFIG_USER_ONLY)

#include "hw/loader.h"

#endif

-#include "hw/arm/arm.h"

#include "sysemu/sysemu.h"

#include "sysemu/hw_accel.h"

#include "kvm_arm.h"

diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/cpu64.c

+++ b/target/arm/cpu64.c

@@ -XXX,XX +XXX,XX @@

#if !defined(CONFIG_USER_ONLY)

#include "hw/loader.h"

#endif

-#include "hw/arm/arm.h"

#include "sysemu/sysemu.h"

#include "sysemu/kvm.h"

#include "kvm_arm.h"

diff --git a/target/arm/kvm.c b/target/arm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/kvm.c

+++ b/target/arm/kvm.c

@@ -XXX,XX +XXX,XX @@

#include "cpu.h"

#include "trace.h"

#include "internals.h"

-#include "hw/arm/arm.h"

#include "hw/pci/pci.h"

#include "exec/memattrs.h"

#include "exec/address-spaces.h"

diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/kvm32.c

+++ b/target/arm/kvm32.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/kvm.h"

#include "kvm_arm.h"

#include "internals.h"

-#include "hw/arm/arm.h"

#include "qemu/log.h"

static inline void set_feature(uint64_t *features, int feature)

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/kvm.h"

#include "kvm_arm.h"

#include "internals.h"

-#include "hw/arm/arm.h"

static bool have_guest_debug;

--

2.20.1

The header file hw/arm/arm.h now includes only declarations

relating to hw/arm/boot.c functionality. Rename it accordingly,

and adjust its header comment.

The bulk of this commit was created via

perl -pi -e 's|hw/arm/arm.h|hw/arm/boot.h|' hw/arm/*.c include/hw/arm/*.h

In a few cases we can just delete the #include:

hw/arm/msf2-soc.c, include/hw/arm/aspeed_soc.h and

include/hw/arm/bcm2836.h did not require it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: 20190516163857.6430-4-peter.maydell@linaro.org

---

include/hw/arm/allwinner-a10.h | 2 +-

include/hw/arm/aspeed_soc.h | 1 -

include/hw/arm/bcm2836.h | 1 -

include/hw/arm/{arm.h => boot.h} | 8 ++++----

include/hw/arm/fsl-imx25.h | 2 +-

include/hw/arm/fsl-imx31.h | 2 +-

include/hw/arm/fsl-imx6.h | 2 +-

include/hw/arm/fsl-imx6ul.h | 2 +-

include/hw/arm/fsl-imx7.h | 2 +-

include/hw/arm/virt.h | 2 +-

include/hw/arm/xlnx-versal.h | 2 +-

include/hw/arm/xlnx-zynqmp.h | 2 +-

hw/arm/armsse.c | 2 +-

hw/arm/armv7m.c | 2 +-

hw/arm/aspeed.c | 2 +-

hw/arm/boot.c | 2 +-

hw/arm/collie.c | 2 +-

hw/arm/exynos4210.c | 2 +-

hw/arm/exynos4_boards.c | 2 +-

hw/arm/highbank.c | 2 +-

hw/arm/integratorcp.c | 2 +-

hw/arm/mainstone.c | 2 +-

hw/arm/microbit.c | 2 +-

hw/arm/mps2-tz.c | 2 +-

hw/arm/mps2.c | 2 +-

hw/arm/msf2-soc.c | 1 -

hw/arm/msf2-som.c | 2 +-

hw/arm/musca.c | 2 +-

hw/arm/musicpal.c | 2 +-

hw/arm/netduino2.c | 2 +-

hw/arm/nrf51_soc.c | 2 +-

hw/arm/nseries.c | 2 +-

hw/arm/omap1.c | 2 +-

hw/arm/omap2.c | 2 +-

hw/arm/omap_sx1.c | 2 +-

hw/arm/palm.c | 2 +-

hw/arm/raspi.c | 2 +-

hw/arm/realview.c | 2 +-

hw/arm/spitz.c | 2 +-

hw/arm/stellaris.c | 2 +-

hw/arm/stm32f205_soc.c | 2 +-

hw/arm/strongarm.c | 2 +-

hw/arm/tosa.c | 2 +-

hw/arm/versatilepb.c | 2 +-

hw/arm/vexpress.c | 2 +-

hw/arm/virt.c | 2 +-

hw/arm/xilinx_zynq.c | 2 +-

hw/arm/xlnx-versal.c | 2 +-

hw/arm/z2.c | 2 +-

49 files changed, 49 insertions(+), 52 deletions(-)

rename include/hw/arm/{arm.h => boot.h} (98%)

diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/allwinner-a10.h

+++ b/include/hw/arm/allwinner-a10.h

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "qemu/error-report.h"

#include "hw/char/serial.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/timer/allwinner-a10-pit.h"

#include "hw/intc/allwinner-a10-pic.h"

#include "hw/net/allwinner_emac.h"

diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/aspeed_soc.h

+++ b/include/hw/arm/aspeed_soc.h

@@ -XXX,XX +XXX,XX @@

#ifndef ASPEED_SOC_H

#define ASPEED_SOC_H

-#include "hw/arm/arm.h"

#include "hw/intc/aspeed_vic.h"

#include "hw/misc/aspeed_scu.h"

#include "hw/misc/aspeed_sdmc.h"

diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/bcm2836.h

+++ b/include/hw/arm/bcm2836.h

@@ -XXX,XX +XXX,XX @@

#ifndef BCM2836_H

#define BCM2836_H

-#include "hw/arm/arm.h"

#include "hw/arm/bcm2835_peripherals.h"

#include "hw/intc/bcm2836_control.h"

diff --git a/include/hw/arm/arm.h b/include/hw/arm/boot.h

similarity index 98%

rename from include/hw/arm/arm.h

rename to include/hw/arm/boot.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/arm.h

+++ b/include/hw/arm/boot.h

@@ -XXX,XX +XXX,XX @@

/*

- * Misc ARM declarations

+ * ARM kernel loader.

*

* Copyright (c) 2006 CodeSourcery.

* Written by Paul Brook

@@ -XXX,XX +XXX,XX @@

*

*/

-#ifndef HW_ARM_H

-#define HW_ARM_H

+#ifndef HW_ARM_BOOT_H

+#define HW_ARM_BOOT_H

#include "exec/memory.h"

#include "target/arm/cpu-qom.h"

@@ -XXX,XX +XXX,XX @@ void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu,

const struct arm_boot_info *info,

hwaddr mvbar_addr);

-#endif /* HW_ARM_H */

+#endif /* HW_ARM_BOOT_H */

diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/fsl-imx25.h

+++ b/include/hw/arm/fsl-imx25.h

@@ -XXX,XX +XXX,XX @@

#ifndef FSL_IMX25_H

#define FSL_IMX25_H

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/intc/imx_avic.h"

#include "hw/misc/imx25_ccm.h"

#include "hw/char/imx_serial.h"

diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/fsl-imx31.h

+++ b/include/hw/arm/fsl-imx31.h

@@ -XXX,XX +XXX,XX @@

#ifndef FSL_IMX31_H

#define FSL_IMX31_H

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/intc/imx_avic.h"

#include "hw/misc/imx31_ccm.h"

#include "hw/char/imx_serial.h"

diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/fsl-imx6.h

+++ b/include/hw/arm/fsl-imx6.h

@@ -XXX,XX +XXX,XX @@

#ifndef FSL_IMX6_H

#define FSL_IMX6_H

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/cpu/a9mpcore.h"

#include "hw/misc/imx6_ccm.h"

#include "hw/misc/imx6_src.h"

diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/fsl-imx6ul.h

+++ b/include/hw/arm/fsl-imx6ul.h

@@ -XXX,XX +XXX,XX @@

#ifndef FSL_IMX6UL_H

#define FSL_IMX6UL_H

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/cpu/a15mpcore.h"

#include "hw/misc/imx6ul_ccm.h"

#include "hw/misc/imx6_src.h"

diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/fsl-imx7.h

+++ b/include/hw/arm/fsl-imx7.h

@@ -XXX,XX +XXX,XX @@

#ifndef FSL_IMX7_H

#define FSL_IMX7_H

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/cpu/a15mpcore.h"

#include "hw/intc/imx_gpcv2.h"

#include "hw/misc/imx7_ccm.h"

diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/virt.h

+++ b/include/hw/arm/virt.h

@@ -XXX,XX +XXX,XX @@

#include "exec/hwaddr.h"

#include "qemu/notify.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/block/flash.h"

#include "sysemu/kvm.h"

#include "hw/intc/arm_gicv3_common.h"

diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/xlnx-versal.h

+++ b/include/hw/arm/xlnx-versal.h

@@ -XXX,XX +XXX,XX @@

#define XLNX_VERSAL_H

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/intc/arm_gicv3.h"

#define TYPE_XLNX_VERSAL "xlnx-versal"

diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/xlnx-zynqmp.h

+++ b/include/hw/arm/xlnx-zynqmp.h

@@ -XXX,XX +XXX,XX @@

#ifndef XLNX_ZYNQMP_H

#include "qemu-common.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/intc/arm_gic.h"

#include "hw/net/cadence_gem.h"

#include "hw/char/cadence_uart.h"

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/armsse.c

+++ b/hw/arm/armsse.c

@@ -XXX,XX +XXX,XX @@

#include "hw/sysbus.h"

#include "hw/registerfields.h"

#include "hw/arm/armsse.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

/* Format of the System Information block SYS_CONFIG register */

typedef enum SysConfigFormat {

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/armv7m.c

+++ b/hw/arm/armv7m.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/loader.h"

#include "elf.h"

#include "sysemu/qtest.h"

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/aspeed.c

+++ b/hw/arm/aspeed.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "exec/address-spaces.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/aspeed.h"

#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/boot.c

+++ b/hw/arm/boot.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include <libfdt.h>

#include "hw/hw.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/linux-boot-if.h"

#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

diff --git a/hw/arm/collie.c b/hw/arm/collie.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/collie.c

+++ b/hw/arm/collie.c

@@ -XXX,XX +XXX,XX @@

#include "hw/sysbus.h"

#include "hw/boards.h"

#include "strongarm.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/block/flash.h"

#include "exec/address-spaces.h"

#include "cpu.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/exynos4210.c

+++ b/hw/arm/exynos4210.c

@@ -XXX,XX +XXX,XX @@

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/loader.h"

#include "hw/arm/exynos4210.h"

#include "hw/sd/sdhci.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/exynos4_boards.c

+++ b/hw/arm/exynos4_boards.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/sysemu.h"

#include "hw/sysbus.h"

#include "net/net.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "exec/address-spaces.h"

#include "hw/arm/exynos4210.h"

#include "hw/net/lan9118.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/highbank.c

+++ b/hw/arm/highbank.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/loader.h"

#include "net/net.h"

#include "sysemu/kvm.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/integratorcp.c

+++ b/hw/arm/integratorcp.c

@@ -XXX,XX +XXX,XX @@

#include "cpu.h"

#include "hw/sysbus.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/misc/arm_integrator_debug.h"

#include "hw/net/smc91c111.h"

#include "net/net.h"

diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/mainstone.c

+++ b/hw/arm/mainstone.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/arm/pxa.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "net/net.h"

#include "hw/net/smc91c111.h"

#include "hw/boards.h"

diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/microbit.c

+++ b/hw/arm/microbit.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "sysemu/sysemu.h"

#include "exec/address-spaces.h"

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/mps2-tz.c

+++ b/hw/arm/mps2-tz.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/armv7m.h"

#include "hw/or-irq.h"

#include "hw/boards.h"

diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/mps2.c

+++ b/hw/arm/mps2.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/armv7m.h"

#include "hw/or-irq.h"

#include "hw/boards.h"

diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/msf2-soc.c

+++ b/hw/arm/msf2-soc.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/units.h"

#include "qapi/error.h"

#include "qemu-common.h"

-#include "hw/arm/arm.h"

#include "exec/address-spaces.h"

#include "hw/char/serial.h"

#include "hw/boards.h"

diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/msf2-som.c

+++ b/hw/arm/msf2-som.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "exec/address-spaces.h"

#include "hw/arm/msf2-soc.h"

#include "cpu.h"

diff --git a/hw/arm/musca.c b/hw/arm/musca.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/musca.c

+++ b/hw/arm/musca.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/armsse.h"

#include "hw/boards.h"

#include "hw/char/pl011.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/musicpal.c

+++ b/hw/arm/musicpal.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "net/net.h"

#include "sysemu/sysemu.h"

#include "hw/boards.h"

diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/netduino2.c

+++ b/hw/arm/netduino2.c

@@ -XXX,XX +XXX,XX @@

#include "hw/boards.h"

#include "qemu/error-report.h"

#include "hw/arm/stm32f205_soc.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

static void netduino2_init(MachineState *machine)

{

diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/nrf51_soc.c

+++ b/hw/arm/nrf51_soc.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu-common.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/sysbus.h"

#include "hw/boards.h"

#include "hw/misc/unimp.h"

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/nseries.c

+++ b/hw/arm/nseries.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/bswap.h"

#include "sysemu/sysemu.h"

#include "hw/arm/omap.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/irq.h"

#include "ui/console.h"

#include "hw/boards.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/omap1.c

+++ b/hw/arm/omap1.c

@@ -XXX,XX +XXX,XX @@

#include "cpu.h"

#include "hw/boards.h"

#include "hw/hw.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/omap.h"

#include "sysemu/sysemu.h"

#include "hw/arm/soc_dma.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/omap2.c

+++ b/hw/arm/omap2.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/qtest.h"

#include "hw/boards.h"

#include "hw/hw.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/omap.h"

#include "sysemu/sysemu.h"

#include "qemu/timer.h"

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/omap_sx1.c

+++ b/hw/arm/omap_sx1.c

@@ -XXX,XX +XXX,XX @@

#include "ui/console.h"

#include "hw/arm/omap.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/block/flash.h"

#include "sysemu/qtest.h"

#include "exec/address-spaces.h"

diff --git a/hw/arm/palm.c b/hw/arm/palm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/palm.c

+++ b/hw/arm/palm.c

@@ -XXX,XX +XXX,XX @@

#include "ui/console.h"

#include "hw/arm/omap.h"

#include "hw/boards.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/input/tsc2xxx.h"

#include "hw/loader.h"

#include "exec/address-spaces.h"

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/raspi.c

+++ b/hw/arm/raspi.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/error-report.h"

#include "hw/boards.h"

#include "hw/loader.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "sysemu/sysemu.h"

#define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */

diff --git a/hw/arm/realview.c b/hw/arm/realview.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/realview.c

+++ b/hw/arm/realview.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/primecell.h"

#include "hw/net/lan9118.h"

#include "hw/net/smc91c111.h"

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/spitz.c

+++ b/hw/arm/spitz.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/arm/pxa.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "sysemu/sysemu.h"

#include "hw/pcmcia.h"

#include "hw/i2c/i2c.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/stellaris.c

+++ b/hw/arm/stellaris.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "hw/sysbus.h"

#include "hw/ssi/ssi.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "qemu/timer.h"

#include "hw/i2c/i2c.h"

#include "net/net.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/stm32f205_soc.c

+++ b/hw/arm/stm32f205_soc.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu-common.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "exec/address-spaces.h"

#include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/strongarm.c

+++ b/hw/arm/strongarm.c

@@ -XXX,XX +XXX,XX @@

#include "hw/sysbus.h"

#include "strongarm.h"

#include "qemu/error-report.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "chardev/char-fe.h"

#include "chardev/char-serial.h"

#include "sysemu/sysemu.h"

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/tosa.c

+++ b/hw/arm/tosa.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/arm/pxa.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/sharpsl.h"

#include "hw/pcmcia.h"

#include "hw/boards.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/versatilepb.c

+++ b/hw/arm/versatilepb.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/net/smc91c111.h"

#include "net/net.h"

#include "sysemu/sysemu.h"

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/vexpress.c

+++ b/hw/arm/vexpress.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/primecell.h"

#include "hw/net/lan9118.h"

#include "hw/i2c/i2c.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/virt.c

+++ b/hw/arm/virt.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/option.h"

#include "qapi/error.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/arm/primecell.h"

#include "hw/arm/virt.h"

#include "hw/block/flash.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/xilinx_zynq.c

+++ b/hw/arm/xilinx_zynq.c

@@ -XXX,XX +XXX,XX @@

#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "net/net.h"

#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"

diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/xlnx-versal.c

+++ b/hw/arm/xlnx-versal.c

@@ -XXX,XX +XXX,XX @@

#include "net/net.h"

#include "sysemu/sysemu.h"

#include "sysemu/kvm.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "kvm_arm.h"

#include "hw/misc/unimp.h"

#include "hw/intc/arm_gicv3_common.h"

diff --git a/hw/arm/z2.c b/hw/arm/z2.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/z2.c

+++ b/hw/arm/z2.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/arm/pxa.h"

-#include "hw/arm/arm.h"

+#include "hw/arm/boot.h"

#include "hw/i2c/i2c.h"

#include "hw/ssi/ssi.h"

#include "hw/boards.h"

--

2.20.1

In ich_vmcr_write() we enforce "writes of BPR fields to less than

their minimum sets them to the minimum" by doing a "read vbpr and

write it back" operation. A typo here meant that we weren't handling

writes to these fields correctly, because we were reading from VBPR0

but writing to VBPR1.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: 20190520162809.2677-4-peter.maydell@linaro.org

---

hw/intc/arm_gicv3_cpuif.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_cpuif.c

+++ b/hw/intc/arm_gicv3_cpuif.c

@@ -XXX,XX +XXX,XX @@ static void ich_vmcr_write(CPUARMState *env, const ARMCPRegInfo *ri,

/* Enforce "writing BPRs to less than minimum sets them to the minimum"

* by reading and writing back the fields.

*/

- write_vbpr(cs, GICV3_G1, read_vbpr(cs, GICV3_G0));

+ write_vbpr(cs, GICV3_G0, read_vbpr(cs, GICV3_G0));

write_vbpr(cs, GICV3_G1, read_vbpr(cs, GICV3_G1));

gicv3_cpuif_virt_update(cs);

--

2.20.1

The ICC_CTLR_EL3 register includes some bits which are aliases

of bits in the ICC_CTLR_EL1(S) and (NS) registers. QEMU chooses

to keep those bits in the cs->icc_ctlr_el1[] struct fields.

Unfortunately a missing '~' in the code to update the bits

in those fields meant that writing to ICC_CTLR_EL3 would corrupt

the ICC_CLTR_EL1 register values.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: 20190520162809.2677-5-peter.maydell@linaro.org

---

hw/intc/arm_gicv3_cpuif.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_cpuif.c

+++ b/hw/intc/arm_gicv3_cpuif.c

@@ -XXX,XX +XXX,XX @@ static void icc_ctlr_el3_write(CPUARMState *env, const ARMCPRegInfo *ri,

trace_gicv3_icc_ctlr_el3_write(gicv3_redist_affid(cs), value);

/* *_EL1NS and *_EL1S bits are aliases into the ICC_CTLR_EL1 bits. */

- cs->icc_ctlr_el1[GICV3_NS] &= (ICC_CTLR_EL1_CBPR | ICC_CTLR_EL1_EOIMODE);

+ cs->icc_ctlr_el1[GICV3_NS] &= ~(ICC_CTLR_EL1_CBPR | ICC_CTLR_EL1_EOIMODE);

if (value & ICC_CTLR_EL3_EOIMODE_EL1NS) {

cs->icc_ctlr_el1[GICV3_NS] |= ICC_CTLR_EL1_EOIMODE;

}

@@ -XXX,XX +XXX,XX @@ static void icc_ctlr_el3_write(CPUARMState *env, const ARMCPRegInfo *ri,

cs->icc_ctlr_el1[GICV3_NS] |= ICC_CTLR_EL1_CBPR;

}

- cs->icc_ctlr_el1[GICV3_S] &= (ICC_CTLR_EL1_CBPR | ICC_CTLR_EL1_EOIMODE);

+ cs->icc_ctlr_el1[GICV3_S] &= ~(ICC_CTLR_EL1_CBPR | ICC_CTLR_EL1_EOIMODE);

if (value & ICC_CTLR_EL3_EOIMODE_EL1S) {

cs->icc_ctlr_el1[GICV3_S] |= ICC_CTLR_EL1_EOIMODE;

}

--

2.20.1

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Message-id: 20190520214342.13709-2-philmd@redhat.com

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

hw/arm/exynos4_boards.c | 24 ------------------------

1 file changed, 24 deletions(-)

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/exynos4_boards.c

+++ b/hw/arm/exynos4_boards.c

@@ -XXX,XX +XXX,XX @@

#include "hw/net/lan9118.h"

#include "hw/boards.h"

-#undef DEBUG

-

-//#define DEBUG

-

-#ifdef DEBUG

- #undef PRINT_DEBUG

- #define PRINT_DEBUG(fmt, args...) \

- do { \

- fprintf(stderr, " [%s:%d] "fmt, __func__, __LINE__, ##args); \

- } while (0)

-#else

- #define PRINT_DEBUG(fmt, args...) do {} while (0)

-#endif

-

#define SMDK_LAN9118_BASE_ADDR 0x05000000

typedef enum Exynos4BoardType {

@@ -XXX,XX +XXX,XX @@ exynos4_boards_init_common(MachineState *machine,

exynos4_board_binfo.gic_cpu_if_addr =

EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;

- PRINT_DEBUG("\n ram_size: %luMiB [0x%08lx]\n"

- " kernel_filename: %s\n"

- " kernel_cmdline: %s\n"

- " initrd_filename: %s\n",

- exynos4_board_ram_size[board_type] / 1048576,

- exynos4_board_ram_size[board_type],

- machine->kernel_filename,

- machine->kernel_cmdline,

- machine->initrd_filename);

-

exynos4_boards_init_ram(s, get_system_memory(),

exynos4_board_ram_size[board_type]);

--

2.20.1