arm queue; dunno if this will be the last before softfreeze

or not, but anyway probably the last large one. New orangepi-pc

board model is the big item here.

The following changes since commit 67d9ef7d541c3d21a25796c51c26da096a433565:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20200312' into staging (2020-03-12 15:20:52 +0000)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200312

for you to fetch changes up to aca53be34ac3e7cac5f39396a51a338860a5a837:

target/arm: kvm: Inject events at the last stage of sync (2020-03-12 16:31:10 +0000)

* Fix various bugs that might result in an assert() due to

incorrect hflags for M-profile CPUs

* Fix Aspeed SMC Controller user-mode select handling

* Report correct (with-tag) address in fault address register

when TBI is enabled

* cubieboard: make sure SOC object isn't leaked

* fsl-imx25: Wire up eSDHC controllers

* fsl-imx25: Wire up USB controllers

* New board model: orangepi-pc (OrangePi PC)

* ARM/KVM: if user doesn't select GIC version and the

host kernel can only provide GICv3, use that, rather

than defaulting to "fail because GICv2 isn't possible"

* kvm: Only do KVM_SET_VCPU_EVENTS at the last stage of sync

Beata Michalska (1):

target/arm: kvm: Inject events at the last stage of sync

Cédric Le Goater (2):

aspeed/smc: Add some tracing

aspeed/smc: Fix User mode select/unselect scheme

Eric Auger (6):

hw/arm/virt: Document 'max' value in gic-version property description

hw/arm/virt: Introduce VirtGICType enum type

hw/arm/virt: Introduce finalize_gic_version()

target/arm/kvm: Let kvm_arm_vgic_probe() return a bitmap

hw/arm/virt: kvm: Restructure finalize_gic_version()

hw/arm/virt: kvm: allow gicv3 by default if v2 cannot work

Guenter Roeck (2):

hw/arm/fsl-imx25: Wire up eSDHC controllers

hw/arm/fsl-imx25: Wire up USB controllers

Igor Mammedov (1):

hw/arm/cubieboard: make sure SOC object isn't leaked

Niek Linnenbank (13):

hw/arm: add Allwinner H3 System-on-Chip

hw/arm: add Xunlong Orange Pi PC machine

hw/arm/allwinner-h3: add Clock Control Unit

hw/arm/allwinner-h3: add USB host controller

hw/arm/allwinner-h3: add System Control module

hw/arm/allwinner: add CPU Configuration module

hw/arm/allwinner: add Security Identifier device

hw/arm/allwinner: add SD/MMC host controller

hw/arm/allwinner-h3: add EMAC ethernet device

hw/arm/allwinner-h3: add Boot ROM support

hw/arm/allwinner-h3: add SDRAM controller device

hw/arm/allwinner: add RTC device support

docs: add Orange Pi PC document

Peter Maydell (4):

hw/intc/armv7m_nvic: Rebuild hflags on reset

target/arm: Update hflags in trans_CPS_v7m()

target/arm: Recalculate hflags correctly after writes to CONTROL

target/arm: Fix some comment typos

Philippe Mathieu-Daudé (5):

tests/boot_linux_console: Add a quick test for the OrangePi PC board

tests/boot_linux_console: Add initrd test for the Orange Pi PC board

tests/boot_linux_console: Add a SD card test for the OrangePi PC board

tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC

tests/boot_linux_console: Test booting NetBSD via U-Boot on OrangePi PC

Richard Henderson (2):

target/arm: Check addresses for disabled regimes

target/arm: Disable clean_data_tbi for system mode

Makefile.objs | 1 +

hw/arm/Makefile.objs | 1 +

hw/misc/Makefile.objs | 5 +

hw/net/Makefile.objs | 1 +

hw/rtc/Makefile.objs | 1 +

hw/sd/Makefile.objs | 1 +

hw/usb/hcd-ehci.h | 1 +

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

include/hw/arm/allwinner-h3.h | 161 ++++++

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

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

include/hw/misc/allwinner-cpucfg.h | 52 ++

include/hw/misc/allwinner-h3-ccu.h | 66 +++

include/hw/misc/allwinner-h3-dramc.h | 106 ++++

include/hw/misc/allwinner-h3-sysctrl.h | 67 +++

include/hw/misc/allwinner-sid.h | 60 +++

include/hw/net/allwinner-sun8i-emac.h | 99 ++++

include/hw/rtc/allwinner-rtc.h | 134 +++++

include/hw/sd/allwinner-sdhost.h | 135 +++++

target/arm/helper.h | 1 +

target/arm/kvm_arm.h | 3 +

hw/arm/allwinner-a10.c | 19 +

hw/arm/allwinner-h3.c | 465 ++++++++++++++++++

hw/arm/cubieboard.c | 18 +

hw/arm/fsl-imx25.c | 56 +++

hw/arm/imx25_pdk.c | 16 +

hw/arm/orangepi.c | 130 +++++

hw/arm/virt.c | 145 ++++--

hw/intc/armv7m_nvic.c | 6 +

hw/misc/allwinner-cpucfg.c | 282 +++++++++++

hw/misc/allwinner-h3-ccu.c | 242 +++++++++

hw/misc/allwinner-h3-dramc.c | 358 ++++++++++++++

hw/misc/allwinner-h3-sysctrl.c | 140 ++++++

hw/misc/allwinner-sid.c | 168 +++++++

hw/net/allwinner-sun8i-emac.c | 871 +++++++++++++++++++++++++++++++++

hw/rtc/allwinner-rtc.c | 411 ++++++++++++++++

hw/sd/allwinner-sdhost.c | 854 ++++++++++++++++++++++++++++++++

hw/ssi/aspeed_smc.c | 56 ++-

hw/usb/hcd-ehci-sysbus.c | 17 +

target/arm/helper.c | 49 +-

target/arm/kvm.c | 14 +-

target/arm/kvm32.c | 15 +-

target/arm/kvm64.c | 15 +-

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

target/arm/translate.c | 14 +-

MAINTAINERS | 9 +

default-configs/arm-softmmu.mak | 1 +

docs/system/arm/orangepi.rst | 253 ++++++++++

docs/system/target-arm.rst | 2 +

hw/arm/Kconfig | 12 +

hw/misc/trace-events | 19 +

hw/net/Kconfig | 3 +

hw/net/trace-events | 10 +

hw/rtc/trace-events | 4 +

hw/sd/trace-events | 7 +

hw/ssi/trace-events | 10 +

tests/acceptance/boot_linux_console.py | 230 +++++++++

57 files changed, 5787 insertions(+), 74 deletions(-)

create mode 100644 include/hw/arm/allwinner-h3.h

create mode 100644 include/hw/misc/allwinner-cpucfg.h

create mode 100644 include/hw/misc/allwinner-h3-ccu.h

create mode 100644 include/hw/misc/allwinner-h3-dramc.h

create mode 100644 include/hw/misc/allwinner-h3-sysctrl.h

create mode 100644 include/hw/misc/allwinner-sid.h

create mode 100644 include/hw/net/allwinner-sun8i-emac.h

create mode 100644 include/hw/rtc/allwinner-rtc.h

create mode 100644 include/hw/sd/allwinner-sdhost.h

create mode 100644 hw/arm/allwinner-h3.c

create mode 100644 hw/arm/orangepi.c

create mode 100644 hw/misc/allwinner-cpucfg.c

create mode 100644 hw/misc/allwinner-h3-ccu.c

create mode 100644 hw/misc/allwinner-h3-dramc.c

create mode 100644 hw/misc/allwinner-h3-sysctrl.c

create mode 100644 hw/misc/allwinner-sid.c

create mode 100644 hw/net/allwinner-sun8i-emac.c

create mode 100644 hw/rtc/allwinner-rtc.c

create mode 100644 hw/sd/allwinner-sdhost.c

create mode 100644 docs/system/arm/orangepi.rst

create mode 100644 hw/ssi/trace-events

From: Eric Auger <eric.auger@redhat.com>

Restructure the finalize_gic_version with switch cases and

clearly separate the following cases:

- KVM mode / in-kernel irqchip

- KVM mode / userspace irqchip

- TCG mode

In KVM mode / in-kernel irqchip , we explictly check whether

the chosen version is supported by the host. If the end-user

explicitly sets v2/v3 and this is not supported by the host,

then the user gets an explicit error message. Note that for

old kernels where the CREATE_DEVICE ioctl doesn't exist then

we will now fail if the user specifically asked for gicv2,

where previously we (probably) would have succeeded.

In KVM mode / userspace irqchip we immediatly output an error

in case the end-user explicitly selected v3. Also we warn the

end-user about the unexpected usage of gic-version=host in

that case as only userspace GICv2 is supported.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Andrew Jones <drjones@redhat.com>

Message-id: 20200311131618.7187-6-eric.auger@redhat.com

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

---

hw/arm/virt.c | 88 +++++++++++++++++++++++++++++++++++++++------------

1 file changed, 67 insertions(+), 21 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ static void virt_set_memmap(VirtMachineState *vms)

*/

static void finalize_gic_version(VirtMachineState *vms)

{

- if (vms->gic_version == VIRT_GIC_VERSION_HOST ||

- vms->gic_version == VIRT_GIC_VERSION_MAX) {

- if (!kvm_enabled()) {

- if (vms->gic_version == VIRT_GIC_VERSION_HOST) {

- error_report("gic-version=host requires KVM");

- exit(1);

- } else {

- /* "max": currently means 3 for TCG */

- vms->gic_version = VIRT_GIC_VERSION_3;

- }

- } else {

- int probe_bitmap = kvm_arm_vgic_probe();

+ if (kvm_enabled()) {

+ int probe_bitmap;

- if (!probe_bitmap) {

+ if (!kvm_irqchip_in_kernel()) {

+ switch (vms->gic_version) {

+ case VIRT_GIC_VERSION_HOST:

+ warn_report(

+ "gic-version=host not relevant with kernel-irqchip=off "

+ "as only userspace GICv2 is supported. Using v2 ...");

+ return;

+ case VIRT_GIC_VERSION_MAX:

+ case VIRT_GIC_VERSION_NOSEL:

+ vms->gic_version = VIRT_GIC_VERSION_2;

+ return;

+ case VIRT_GIC_VERSION_2:

+ return;

+ case VIRT_GIC_VERSION_3:

error_report(

- "Unable to determine GIC version supported by host");

+ "gic-version=3 is not supported with kernel-irqchip=off");

exit(1);

- } else {

- if (probe_bitmap & KVM_ARM_VGIC_V3) {

- vms->gic_version = VIRT_GIC_VERSION_3;

- } else {

- vms->gic_version = VIRT_GIC_VERSION_2;

- }

}

}

- } else if (vms->gic_version == VIRT_GIC_VERSION_NOSEL) {

+

+ probe_bitmap = kvm_arm_vgic_probe();

+ if (!probe_bitmap) {

+ error_report("Unable to determine GIC version supported by host");

+ exit(1);

2.20.1

From: Eric Auger <eric.auger@redhat.com>

At the moment if the end-user does not specify the gic-version along

with KVM acceleration, v2 is set by default. However most of the

systems now have GICv3 and sometimes they do not support GICv2

compatibility.

This patch keeps the default v2 selection in all cases except

in the KVM accelerated mode when either

- the host does not support GICv2 in-kernel emulation or

- number of VCPUS exceeds 8.

Those cases did not work anyway so we do not break any compatibility.

Now we get v3 selected in such a case.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Reviewed-by: Andrew Jones <drjones@redhat.com>

Message-id: 20200311131618.7187-7-eric.auger@redhat.com

hw/arm/virt.c | 17 ++++++++++++++++-

1 file changed, 16 insertions(+), 1 deletion(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ static void virt_set_memmap(VirtMachineState *vms)

*/

static void finalize_gic_version(VirtMachineState *vms)

{

+ unsigned int max_cpus = MACHINE(vms)->smp.max_cpus;

+

if (kvm_enabled()) {

int probe_bitmap;

@@ -XXX,XX +XXX,XX @@ static void finalize_gic_version(VirtMachineState *vms)

}

return;

case VIRT_GIC_VERSION_NOSEL:

- vms->gic_version = VIRT_GIC_VERSION_2;

+ if ((probe_bitmap & KVM_ARM_VGIC_V2) && max_cpus <= GIC_NCPU) {

+ vms->gic_version = VIRT_GIC_VERSION_2;

+ } else if (probe_bitmap & KVM_ARM_VGIC_V3) {

+ /*

+ * in case the host does not support v2 in-kernel emulation or

+ * the end-user requested more than 8 VCPUs we now default

+ * to v3. In any case defaulting to v2 would be broken.

+ */

+ vms->gic_version = VIRT_GIC_VERSION_3;

+ } else if (max_cpus > GIC_NCPU) {

+ error_report("host only supports in-kernel GICv2 emulation "

+ "but more than 8 vcpus are requested");

+ exit(1);

+ }

break;

case VIRT_GIC_VERSION_2:

case VIRT_GIC_VERSION_3:

2.20.1

From: Niek Linnenbank <nieklinnenbank@gmail.com>

The Xunlong Orange Pi PC machine is a functional ARM machine

based on the Allwinner H3 System-on-Chip. It supports mainline

Linux, U-Boot, NetBSD and is covered by acceptance tests.

This commit adds a documentation text file with a description

of the machine and instructions for the user.

Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>

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

Message-id: 20200311221854.30370-19-nieklinnenbank@gmail.com

[PMM: moved file into docs/system/arm to match the reorg

of the arm target part of the docs; tweaked heading to

match other boards]

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

---

MAINTAINERS | 1 +

docs/system/arm/orangepi.rst | 253 +++++++++++++++++++++++++++++++++++

docs/system/target-arm.rst | 2 +

3 files changed, 256 insertions(+)

create mode 100644 docs/system/arm/orangepi.rst

diff --git a/MAINTAINERS b/MAINTAINERS

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ S: Maintained

F: hw/*/allwinner-h3*

F: include/hw/*/allwinner-h3*

F: hw/arm/orangepi.c

+F: docs/system/orangepi.rst

ARM PrimeCell and CMSDK devices

M: Peter Maydell <peter.maydell@linaro.org>

diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/docs/system/arm/orangepi.rst

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

+Orange Pi PC (``orangepi-pc``)

+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+

+The Xunlong Orange Pi PC is an Allwinner H3 System on Chip

+based embedded computer with mainline support in both U-Boot

+and Linux. The board comes with a Quad Core Cortex-A7 @ 1.3GHz,

+1GiB RAM, 100Mbit ethernet, USB, SD/MMC, USB, HDMI and

+various other I/O.

+

+Supported devices

+"""""""""""""""""

+

+The Orange Pi PC machine supports the following devices:

+

+ * SMP (Quad Core Cortex-A7)

+ * Generic Interrupt Controller configuration

+ * SRAM mappings

+ * SDRAM controller

+ * Real Time Clock

+ * Timer device (re-used from Allwinner A10)

+ * UART

+ * SD/MMC storage controller

+ * EMAC ethernet

+ * USB 2.0 interfaces

+ * Clock Control Unit

+ * System Control module

+ * Security Identifier device

+

+Limitations

+"""""""""""

+

+Currently, Orange Pi PC does *not* support the following features:

+

+- Graphical output via HDMI, GPU and/or the Display Engine

+- Audio output

+- Hardware Watchdog

+

+Also see the 'unimplemented' array in the Allwinner H3 SoC module

+for a complete list of unimplemented I/O devices: ``./hw/arm/allwinner-h3.c``

+

+Boot options

+""""""""""""

+

+The Orange Pi PC machine can start using the standard -kernel functionality

+for loading a Linux kernel or ELF executable. Additionally, the Orange Pi PC

+machine can also emulate the BootROM which is present on an actual Allwinner H3

+based SoC, which loads the bootloader from a SD card, specified via the -sd argument

+to qemu-system-arm.

+

+Machine-specific options

+""""""""""""""""""""""""

+

+The following machine-specific options are supported:

+

+- allwinner-rtc.base-year=YYYY

+

+ The Allwinner RTC device is automatically created by the Orange Pi PC machine

+ and uses a default base year value which can be overridden using the 'base-year' property.

+ The base year is the actual represented year when the RTC year value is zero.

+ This option can be used in case the target operating system driver uses a different

+ base year value. The minimum value for the base year is 1900.

+

+- allwinner-sid.identifier=abcd1122-a000-b000-c000-12345678ffff

+

+ The Security Identifier value can be read by the guest.

+ For example, U-Boot uses it to determine a unique MAC address.

+

+The above machine-specific options can be specified in qemu-system-arm

+via the '-global' argument, for example:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -sd mycard.img \

+ -global allwinner-rtc.base-year=2000

+

+Running mainline Linux

+""""""""""""""""""""""

+

+Mainline Linux kernels from 4.19 up to latest master are known to work.

+To build a Linux mainline kernel that can be booted by the Orange Pi PC machine,

+simply configure the kernel using the sunxi_defconfig configuration:

+

+.. code-block:: bash

+

+ $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- make mrproper

+ $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- make sunxi_defconfig

+

+To be able to use USB storage, you need to manually enable the corresponding

+configuration item. Start the kconfig configuration tool:

+

+.. code-block:: bash

+

+ $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- make menuconfig

+

+Navigate to the following item, enable it and save your configuration:

+

+ Device Drivers > USB support > USB Mass Storage support

+

+Build the Linux kernel with:

+

+.. code-block:: bash

+

+ $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- make

+

+To boot the newly build linux kernel in QEMU with the Orange Pi PC machine, use:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -nic user -nographic \

+ -kernel /path/to/linux/arch/arm/boot/zImage \

+ -append 'console=ttyS0,115200' \

+ -dtb /path/to/linux/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dtb

+

+Orange Pi PC images

+"""""""""""""""""""

+

+Note that the mainline kernel does not have a root filesystem. You may provide it

+with an official Orange Pi PC image from the official website:

+

+ http://www.orangepi.org/downloadresources/

+

+Another possibility is to run an Armbian image for Orange Pi PC which

+can be downloaded from:

+

+ https://www.armbian.com/orange-pi-pc/

+

+Alternatively, you can also choose to build you own image with buildroot

+using the orangepi_pc_defconfig. Also see https://buildroot.org for more information.

+

+You can choose to attach the selected image either as an SD card or as USB mass storage.

+For example, to boot using the Orange Pi PC Debian image on SD card, simply add the -sd

+argument and provide the proper root= kernel parameter:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -nic user -nographic \

+ -kernel /path/to/linux/arch/arm/boot/zImage \

+ -append 'console=ttyS0,115200 root=/dev/mmcblk0p2' \

+ -dtb /path/to/linux/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dtb \

+ -sd OrangePi_pc_debian_stretch_server_linux5.3.5_v1.0.img

+

+To attach the image as an USB mass storage device to the machine,

+simply append to the command:

+

+.. code-block:: bash

+

+ -drive if=none,id=stick,file=myimage.img \

+ -device usb-storage,bus=usb-bus.0,drive=stick

+

+Instead of providing a custom Linux kernel via the -kernel command you may also

+choose to let the Orange Pi PC machine load the bootloader from SD card, just like

+a real board would do using the BootROM. Simply pass the selected image via the -sd

+argument and remove the -kernel, -append, -dbt and -initrd arguments:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -nic user -nographic \

+ -sd Armbian_19.11.3_Orangepipc_buster_current_5.3.9.img

+

+Note that both the official Orange Pi PC images and Armbian images start

+a lot of userland programs via systemd. Depending on the host hardware and OS,

+they may be slow to emulate, especially due to emulating the 4 cores.

+To help reduce the performance slow down due to emulating the 4 cores, you can

+give the following kernel parameters via U-Boot (or via -append):

+

+.. code-block:: bash

+

+ => setenv extraargs 'systemd.default_timeout_start_sec=9000 loglevel=7 nosmp console=ttyS0,115200'

+

+Running U-Boot

+""""""""""""""

+

+U-Boot mainline can be build and configured using the orangepi_pc_defconfig

+using similar commands as describe above for Linux. Note that it is recommended

+for development/testing to select the following configuration setting in U-Boot:

+

+ Device Tree Control > Provider for DTB for DT Control > Embedded DTB

+

+To start U-Boot using the Orange Pi PC machine, provide the

+u-boot binary to the -kernel argument:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -nic user -nographic \

+ -kernel /path/to/uboot/u-boot -sd disk.img

+

+Use the following U-boot commands to load and boot a Linux kernel from SD card:

+

+.. code-block:: bash

+

+ => setenv bootargs console=ttyS0,115200

+ => ext2load mmc 0 0x42000000 zImage

+ => ext2load mmc 0 0x43000000 sun8i-h3-orangepi-pc.dtb

+ => bootz 0x42000000 - 0x43000000

+

+Running NetBSD

+""""""""""""""

+

+The NetBSD operating system also includes support for Allwinner H3 based boards,

+including the Orange Pi PC. NetBSD 9.0 is known to work best for the Orange Pi PC

+board and provides a fully working system with serial console, networking and storage.

+For the Orange Pi PC machine, get the 'evbarm-earmv7hf' based image from:

+

+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/evbarm-earmv7hf/binary/gzimg/armv7.img.gz

+

+The image requires manually installing U-Boot in the image. Build U-Boot with

+the orangepi_pc_defconfig configuration as described in the previous section.

+Next, unzip the NetBSD image and write the U-Boot binary including SPL using:

+

+.. code-block:: bash

+

+ $ gunzip armv7.img.gz

+ $ dd if=/path/to/u-boot-sunxi-with-spl.bin of=armv7.img bs=1024 seek=8 conv=notrunc

+

+Finally, before starting the machine the SD image must be extended such

+that the NetBSD kernel will not conclude the NetBSD partition is larger than

+the emulated SD card:

+

+.. code-block:: bash

+

+ $ dd if=/dev/zero bs=1M count=64 >> armv7.img

+

+Start the machine using the following command:

+

+.. code-block:: bash

+

+ $ qemu-system-arm -M orangepi-pc -nic user -nographic \

+ -sd armv7.img -global allwinner-rtc.base-year=2000

+

+At the U-Boot stage, interrupt the automatic boot process by pressing a key

+and set the following environment variables before booting:

+

+.. code-block:: bash

+

+ => setenv bootargs root=ld0a

+ => setenv kernel netbsd-GENERIC.ub

+ => setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb

+ => setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r} ${kernel}; fatload mmc 0:1 ${fdt_addr_r} ${fdtfile}; fdt addr ${fdt_addr_r}; bootm ${kernel_addr_r} - ${fdt_addr_r}'

+

+Optionally you may save the environment variables to SD card with 'saveenv'.

+To continue booting simply give the 'boot' command and NetBSD boots.

+

+Orange Pi PC acceptance tests

+"""""""""""""""""""""""""""""

+

+The Orange Pi PC machine has several acceptance tests included.

+To run the whole set of tests, build QEMU from source and simply

+provide the following command:

+

+.. code-block:: bash

+

+ $ AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run \

+ -t machine:orangepi-pc tests/acceptance/boot_linux_console.py

diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst

index XXXXXXX..XXXXXXX 100644

--- a/docs/system/target-arm.rst

+++ b/docs/system/target-arm.rst

@@ -XXX,XX +XXX,XX @@ undocumented; you can get a complete list by running

``qemu-system-aarch64 --machine help``.

.. toctree::

+ :maxdepth: 1

arm/integratorcp

arm/versatile

@@ -XXX,XX +XXX,XX @@ undocumented; you can get a complete list by running

arm/stellaris

arm/musicpal

arm/sx1

+ arm/orangepi

Arm CPU features

================

2.20.1

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

This test boots U-Boot then NetBSD (stored on a SD card) on

a OrangePi PC board.

As it requires ~1.3GB of storage, it is disabled by default.

U-Boot is built by the Debian project [1], and the SD card image

is provided by the NetBSD organization [2].

Once the compressed SD card image is downloaded (304MB) and

extracted, this test is fast:

$ AVOCADO_ALLOW_LARGE_STORAGE=yes \

avocado --show=app,console run -t machine:orangepi-pc \

tests/acceptance/boot_linux_console.py

console: U-Boot SPL 2020.01+dfsg-1 (Jan 08 2020 - 08:19:44 +0000)

console: DRAM: 1024 MiB

console: U-Boot 2020.01+dfsg-1 (Jan 08 2020 - 08:19:44 +0000) Allwinner Technology

console: CPU: Allwinner H3 (SUN8I 0000)

console: scanning bus usb@1c1b000 for devices... 1 USB Device(s) found

console: scanning bus usb@1c1d000 for devices... 1 USB Device(s) found

console: scanning usb for storage devices... 0 Storage Device(s) found

console: Hit any key to stop autoboot: 0

console: => setenv bootargs root=ld0a

console: => setenv kernel netbsd-GENERIC.ub

console: => setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb

console: => boot

console: ## Booting kernel from Legacy Image at 42000000 ...

console: Image Name: NetBSD/earmv7hf 9.0_RC1

console: Image Type: ARM Linux Kernel Image (no loading done) (uncompressed)

console: XIP Kernel Image (no loading done)

console: Loading Device Tree to 49ff6000, end 49fffe01 ... OK

console: Starting kernel ...

console: [ 1.0000000] NetBSD/evbarm (fdt) booting ...

console: [ 1.0000000] NetBSD 9.0 (GENERIC) #0: Fri Feb 14 00:06:28 UTC 2020

console: [ 1.0000000] mkrepro@mkrepro.NetBSD.org:/usr/src/sys/arch/evbarm/compile/GENERIC

console: [ 1.0000000] total memory = 1024 MB

console: [ 1.0000000] avail memory = 1003 MB

console: [ 1.0000000] armfdt0 (root)

console: [ 1.0000000] simplebus0 at armfdt0: Xunlong Orange Pi PC

console: [ 1.0000000] cpu0 at cpus0: Cortex-A7 r0p5 (Cortex V7A core)

console: [ 1.0000000] cpu0: DC enabled IC enabled WB enabled LABT branch prediction enabled

console: [ 1.0000000] cpu0: 32KB/64B 2-way L1 VIPT Instruction cache

console: [ 1.0000000] cpu0: 32KB/64B 2-way write-back-locking-C L1 PIPT Data cache

console: [ 1.0000000] cpu0: 2304KB/64B 16-way write-through L2 PIPT Unified cache

console: [ 1.0000000] vfp0 at cpu0: NEON MPE (VFP 3.0+), rounding, NaN propagation, denormals

...

console: [ 2.3812082] sdmmc0: SD card status: 4-bit, C0

console: [ 2.3812082] ld0 at sdmmc0: <0xaa:0x5859:QEMU!:0x01:0xdeadbeef:0x062>

console: [ 2.4012856] ld0: 1226 MB, 622 cyl, 64 head, 63 sec, 512 bytes/sect x 2511872 sectors

console: [ 2.5321222] ld0: 4-bit width, High-Speed/SDR25, 50.000 MHz

console: [ 3.1068718] WARNING: 4 errors while detecting hardware; check system log.

console: [ 3.1179868] boot device: ld0

console: [ 3.1470623] root on ld0a dumps on ld0b

console: [ 3.2464436] root file system type: ffs

console: [ 3.2897123] kern.module.path=/stand/evbarm/9.0/modules

console: Mon Feb 17 20:33:35 UTC 2020

console: Starting root file system check:

PASS (35.96 s)

RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

JOB TIME : 36.09 s

Note, this test only took ~65 seconds to run on Travis-CI, see: [3].

This test is based on a description from Niek Linnenbank from [4].

[1] https://wiki.debian.org/InstallingDebianOn/Allwinner#Creating_a_bootable_SD_Card_with_u-boot

[2] https://wiki.netbsd.org/ports/evbarm/allwinner/

[3] https://travis-ci.org/philmd/qemu/jobs/638823612#L3778

[4] https://www.mail-archive.com/qemu-devel@nongnu.org/msg669347.html

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

Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>

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

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

Message-id: 20200311221854.30370-18-nieklinnenbank@gmail.com

[NL: changed test to use NetBSD 9.0 final release and -global allwinner-rtc.base-year]

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

---

tests/acceptance/boot_linux_console.py | 70 ++++++++++++++++++++++++++

1 file changed, 70 insertions(+)

diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py

--- a/tests/acceptance/boot_linux_console.py

+++ b/tests/acceptance/boot_linux_console.py

@@ -XXX,XX +XXX,XX @@ import shutil

from avocado import skipUnless

from avocado_qemu import Test

from avocado_qemu import exec_command_and_wait_for_pattern

+from avocado_qemu import interrupt_interactive_console_until_pattern

from avocado_qemu import wait_for_console_pattern

from avocado.utils import process

from avocado.utils import archive

@@ -XXX,XX +XXX,XX @@ class BootLinuxConsole(Test):

'to <orangepipc>')

self.wait_for_console_pattern('Starting Load Kernel Modules...')

+ @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')

+ def test_arm_orangepi_uboot_netbsd9(self):

+ """

+ :avocado: tags=arch:arm

+ :avocado: tags=machine:orangepi-pc

+ """

+ # This test download a 304MB compressed image and expand it to 1.3GB...

+ deb_url = ('http://snapshot.debian.org/archive/debian/'

+ '20200108T145233Z/pool/main/u/u-boot/'

+ 'u-boot-sunxi_2020.01%2Bdfsg-1_armhf.deb')

+ deb_hash = 'f67f404a80753ca3d1258f13e38f2b060e13db99'

+ deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)

+ # We use the common OrangePi PC 'plus' build of U-Boot for our secondary

+ # program loader (SPL). We will then set the path to the more specific

+ # OrangePi "PC" device tree blob with 'setenv fdtfile' in U-Boot prompt,

+ # before to boot NetBSD.

+ uboot_path = '/usr/lib/u-boot/orangepi_plus/u-boot-sunxi-with-spl.bin'

+ uboot_path = self.extract_from_deb(deb_path, uboot_path)

+ image_url = ('https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/'

+ 'evbarm-earmv7hf/binary/gzimg/armv7.img.gz')

+ image_hash = '2babb29d36d8360adcb39c09e31060945259917a'

+ image_path_gz = self.fetch_asset(image_url, asset_hash=image_hash)

+ image_path = os.path.join(self.workdir, 'armv7.img')

+ image_drive_args = 'if=sd,format=raw,snapshot=on,file=' + image_path

+ archive.gzip_uncompress(image_path_gz, image_path)

+

+ # dd if=u-boot-sunxi-with-spl.bin of=armv7.img bs=1K seek=8 conv=notrunc

+ with open(uboot_path, 'rb') as f_in:

+ with open(image_path, 'r+b') as f_out:

+ f_out.seek(8 * 1024)

+ shutil.copyfileobj(f_in, f_out)

+

+ # Extend image, to avoid that NetBSD thinks the partition

+ # inside the image is larger than device size itself

+ f_out.seek(0, 2)

+ f_out.seek(64 * 1024 * 1024, 1)

+ f_out.write(bytearray([0x00]))

+

+ self.vm.set_console()

+ self.vm.add_args('-nic', 'user',

+ '-drive', image_drive_args,

+ '-global', 'allwinner-rtc.base-year=2000',

+ '-no-reboot')

+ self.vm.launch()

+ wait_for_console_pattern(self, 'U-Boot 2020.01+dfsg-1')

+ interrupt_interactive_console_until_pattern(self,

+ 'Hit any key to stop autoboot:',

+ 'switch to partitions #0, OK')

+

+ exec_command_and_wait_for_pattern(self, '', '=>')

+ cmd = 'setenv bootargs root=ld0a'

+ exec_command_and_wait_for_pattern(self, cmd, '=>')

+ cmd = 'setenv kernel netbsd-GENERIC.ub'

+ exec_command_and_wait_for_pattern(self, cmd, '=>')

+ cmd = 'setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb'

+ exec_command_and_wait_for_pattern(self, cmd, '=>')

+ cmd = ("setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r} ${kernel}; "

+ "fatload mmc 0:1 ${fdt_addr_r} ${fdtfile}; "

+ "fdt addr ${fdt_addr_r}; "

+ "bootm ${kernel_addr_r} - ${fdt_addr_r}'")

+ exec_command_and_wait_for_pattern(self, cmd, '=>')

+

+ exec_command_and_wait_for_pattern(self, 'boot',

+ 'Booting kernel from Legacy Image')

+ wait_for_console_pattern(self, 'Starting kernel ...')

+ wait_for_console_pattern(self, 'NetBSD 9.0 (GENERIC)')

+ # Wait for user-space

+ wait_for_console_pattern(self, 'Starting root file system check')

+

def test_s390x_s390_ccw_virtio(self):

"""

:avocado: tags=arch:s390x

2.20.1

From: Eric Auger <eric.auger@redhat.com>

Convert kvm_arm_vgic_probe() so that it returns a

bitmap of supported in-kernel emulation VGIC versions instead

of the max version: at the moment values can be v2 and v3.

This allows to expose the case where the host GICv3 also

supports GICv2 emulation. This will be useful to choose the

default version in KVM accelerated mode.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Andrew Jones <drjones@redhat.com>

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

Message-id: 20200311131618.7187-5-eric.auger@redhat.com

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

---

target/arm/kvm_arm.h | 3 +++

hw/arm/virt.c | 11 +++++++++--

target/arm/kvm.c | 14 ++++++++------

3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h

--- a/target/arm/kvm_arm.h

+++ b/target/arm/kvm_arm.h

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

#include "exec/memory.h"

#include "qemu/error-report.h"

+#define KVM_ARM_VGIC_V2 (1 << 0)

+#define KVM_ARM_VGIC_V3 (1 << 1)

+

/**

* kvm_arm_vcpu_init:

* @cs: CPUState

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

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

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

@@ -XXX,XX +XXX,XX @@ static void finalize_gic_version(VirtMachineState *vms)

vms->gic_version = VIRT_GIC_VERSION_3;

}

} else {

- vms->gic_version = kvm_arm_vgic_probe();

- if (!vms->gic_version) {

+ int probe_bitmap = kvm_arm_vgic_probe();

+

+ if (!probe_bitmap) {

error_report(

"Unable to determine GIC version supported by host");

exit(1);

+ } else {

+ if (probe_bitmap & KVM_ARM_VGIC_V3) {

+ vms->gic_version = VIRT_GIC_VERSION_3;

+ } else {

+ vms->gic_version = VIRT_GIC_VERSION_2;

+ }

}

} else if (vms->gic_version == VIRT_GIC_VERSION_NOSEL) {

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 @@ int kvm_arch_irqchip_create(KVMState *s)

int kvm_arm_vgic_probe(void)

{

+ int val = 0;

+

if (kvm_create_device(kvm_state,

KVM_DEV_TYPE_ARM_VGIC_V3, true) == 0) {

- return 3;

- } else if (kvm_create_device(kvm_state,

- KVM_DEV_TYPE_ARM_VGIC_V2, true) == 0) {

- return 2;

- } else {

- return 0;

+ val |= KVM_ARM_VGIC_V3;

+ if (kvm_create_device(kvm_state,

+ KVM_DEV_TYPE_ARM_VGIC_V2, true) == 0) {

+ val |= KVM_ARM_VGIC_V2;

+ }

+ return val;