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.

thanks

-- PMM

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

Fix a couple of comment typos.

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

target/arm/helper.c | 2 +-

target/arm/translate.c | 2 +-

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

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

if (!isread && !(ri->type & ARM_CP_SUPPRESS_TB_END)) {

/*

- * A write to any coprocessor regiser that ends a TB

+ * A write to any coprocessor register that ends a TB

* must rebuild the hflags for the next TB.

*/

TCGv_i32 tcg_el = tcg_const_i32(s->current_el);

A write to the CONTROL register can change our current EL (by

writing to the nPRIV bit). That means that we can't assume

that s->current_el is still valid in trans_MSR_v7m() when

we try to rebuild the hflags.

Add a new helper rebuild_hflags_m32_newel() which, like the

existing rebuild_hflags_a32_newel(), recalculates the current

EL from scratch, and use it in trans_MSR_v7m().

This fixes an assertion about an hflags mismatch when the

guest changes privilege by writing to CONTROL.

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

target/arm/helper.h | 1 +

target/arm/helper.c | 12 ++++++++++++

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

3 files changed, 16 insertions(+), 4 deletions(-)

@@ -XXX,XX +XXX,XX @@ DEF_HELPER_4(msr_banked, void, env, i32, i32, i32)

DEF_HELPER_2(get_user_reg, i32, env, i32)

DEF_HELPER_3(set_user_reg, void, env, i32, i32)

+DEF_HELPER_FLAGS_1(rebuild_hflags_m32_newel, TCG_CALL_NO_RWG, void, env)

DEF_HELPER_FLAGS_2(rebuild_hflags_m32, TCG_CALL_NO_RWG, void, env, int)

DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env)

DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int)

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

--- a/target/arm/helper.c

+++ b/target/arm/helper.c

@@ -XXX,XX +XXX,XX @@ void arm_rebuild_hflags(CPUARMState *env)

env->hflags = rebuild_hflags_internal(env);

+ * If we have triggered a EL state change we can't rely on the

+ * translator having passed it to us, we need to recompute.

+void HELPER(rebuild_hflags_m32_newel)(CPUARMState *env)

+{

+ int el = arm_current_el(env);

+ int fp_el = fp_exception_el(env, el);

+ ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, el);

+ env->hflags = rebuild_hflags_m32(env, fp_el, mmu_idx);

+}

void HELPER(rebuild_hflags_m32)(CPUARMState *env, int el)

{

int fp_el = fp_exception_el(env, el);

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

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

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

@@ -XXX,XX +XXX,XX @@ static bool trans_MRS_v7m(DisasContext *s, arg_MRS_v7m *a)

static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a)

{

- TCGv_i32 addr, reg, el;

+ TCGv_i32 addr, reg;

if (!arm_dc_feature(s, ARM_FEATURE_M)) {

return false;

@@ -XXX,XX +XXX,XX @@ static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a)

gen_helper_v7m_msr(cpu_env, addr, reg);

tcg_temp_free_i32(addr);

tcg_temp_free_i32(reg);

- el = tcg_const_i32(s->current_el);

- gen_helper_rebuild_hflags_m32(cpu_env, el);

- tcg_temp_free_i32(el);

+ /* If we wrote to CONTROL, the EL might have changed */

+ gen_helper_rebuild_hflags_m32_newel(cpu_env);

gen_lookup_tb(s);

return true;

}

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: 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]

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

From: Niek Linnenbank <nieklinnenbank@gmail.com>

The Allwinner H3 System on Chip contains multiple USB 2.0 bus

connections which provide software access using the Enhanced

Host Controller Interface (EHCI) and Open Host Controller

Interface (OHCI) interfaces. This commit adds support for

both interfaces in the Allwinner H3 System on Chip.

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

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

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

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

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

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

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

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

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

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

hw/arm/Kconfig | 2 ++

5 files changed, 72 insertions(+)

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h

--- a/hw/usb/hcd-ehci.h

+++ b/hw/usb/hcd-ehci.h

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

#define TYPE_SYS_BUS_EHCI "sysbus-ehci-usb"

#define TYPE_PLATFORM_EHCI "platform-ehci-usb"

#define TYPE_EXYNOS4210_EHCI "exynos4210-ehci-usb"

+#define TYPE_AW_H3_EHCI "aw-h3-ehci-usb"

#define TYPE_TEGRA2_EHCI "tegra2-ehci-usb"

#define TYPE_PPC4xx_EHCI "ppc4xx-ehci-usb"

#define TYPE_FUSBH200_EHCI "fusbh200-ehci-usb"

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ enum {

AW_H3_SRAM_A1,

AW_H3_SRAM_A2,

AW_H3_SRAM_C,

+ AW_H3_EHCI0,

+ AW_H3_OHCI0,

+ AW_H3_EHCI1,

+ AW_H3_OHCI1,

+ AW_H3_EHCI2,

+ AW_H3_OHCI2,

+ AW_H3_EHCI3,

+ AW_H3_OHCI3,

AW_H3_CCU,

AW_H3_PIT,

AW_H3_UART0,

diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/allwinner-h3.c

+++ b/hw/arm/allwinner-h3.c

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

#include "hw/sysbus.h"

#include "hw/char/serial.h"

#include "hw/misc/unimp.h"

+#include "hw/usb/hcd-ehci.h"

#include "sysemu/sysemu.h"

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

@@ -XXX,XX +XXX,XX @@ const hwaddr allwinner_h3_memmap[] = {

[AW_H3_SRAM_A1] = 0x00000000,

[AW_H3_SRAM_A2] = 0x00044000,

[AW_H3_SRAM_C] = 0x00010000,

+ [AW_H3_EHCI0] = 0x01c1a000,

+ [AW_H3_OHCI0] = 0x01c1a400,

+ [AW_H3_EHCI1] = 0x01c1b000,

+ [AW_H3_OHCI1] = 0x01c1b400,

+ [AW_H3_EHCI2] = 0x01c1c000,

+ [AW_H3_OHCI2] = 0x01c1c400,

+ [AW_H3_EHCI3] = 0x01c1d000,

+ [AW_H3_OHCI3] = 0x01c1d400,

[AW_H3_CCU] = 0x01c20000,

[AW_H3_PIT] = 0x01c20c00,

[AW_H3_UART0] = 0x01c28000,

@@ -XXX,XX +XXX,XX @@ enum {

AW_H3_GIC_SPI_UART3 = 3,

AW_H3_GIC_SPI_TIMER0 = 18,

AW_H3_GIC_SPI_TIMER1 = 19,

+ AW_H3_GIC_SPI_EHCI0 = 72,

+ AW_H3_GIC_SPI_OHCI0 = 73,

+ AW_H3_GIC_SPI_EHCI1 = 74,

+ AW_H3_GIC_SPI_OHCI1 = 75,

+ AW_H3_GIC_SPI_EHCI2 = 76,

+ AW_H3_GIC_SPI_OHCI2 = 77,

+ AW_H3_GIC_SPI_EHCI3 = 78,

+ AW_H3_GIC_SPI_OHCI3 = 79,

};

/* Allwinner H3 general constants */

@@ -XXX,XX +XXX,XX @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)

qdev_init_nofail(DEVICE(&s->ccu));

sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]);

+ /* Universal Serial Bus */

+ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_EHCI0));

+ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI1],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_EHCI1));

+ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI2],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_EHCI2));

+ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI3],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_EHCI3));

+

+ sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI0],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_OHCI0));

+ sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI1],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_OHCI1));

+ sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI2],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_OHCI2));

+ sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI3],

+ qdev_get_gpio_in(DEVICE(&s->gic),

+ AW_H3_GIC_SPI_OHCI3));

+

/* UART0. For future clocktree API: All UARTS are connected to APB2_CLK. */

serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART0], 2,

qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0),

diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/usb/hcd-ehci-sysbus.c

+++ b/hw/usb/hcd-ehci-sysbus.c

@@ -XXX,XX +XXX,XX @@ static const TypeInfo ehci_exynos4210_type_info = {

.class_init = ehci_exynos4210_class_init,

};

+static void ehci_aw_h3_class_init(ObjectClass *oc, void *data)

+{

+ SysBusEHCIClass *sec = SYS_BUS_EHCI_CLASS(oc);

+ DeviceClass *dc = DEVICE_CLASS(oc);

+

+ sec->capsbase = 0x0;

+ sec->opregbase = 0x10;

+ set_bit(DEVICE_CATEGORY_USB, dc->categories);

+}

+

+static const TypeInfo ehci_aw_h3_type_info = {

+ .name = TYPE_AW_H3_EHCI,

+ .parent = TYPE_SYS_BUS_EHCI,

+ .class_init = ehci_aw_h3_class_init,

+};

+

static void ehci_tegra2_class_init(ObjectClass *oc, void *data)

{

SysBusEHCIClass *sec = SYS_BUS_EHCI_CLASS(oc);

@@ -XXX,XX +XXX,XX @@ static void ehci_sysbus_register_types(void)

type_register_static(&ehci_type_info);

type_register_static(&ehci_platform_type_info);

type_register_static(&ehci_exynos4210_type_info);

+ type_register_static(&ehci_aw_h3_type_info);

type_register_static(&ehci_tegra2_type_info);

type_register_static(&ehci_ppc4xx_type_info);

type_register_static(&ehci_fusbh200_type_info);

@@ -XXX,XX +XXX,XX @@ config ALLWINNER_H3

select ARM_TIMER

select ARM_GIC

select UNIMP

+ select USB_OHCI

+ select USB_EHCI_SYSBUS

config RASPI

This test boots Ubuntu Bionic on a OrangePi PC board.

As it requires 1GB of storage, and is slow, this test is disabled

on automatic CI testing.

It is useful for workstation testing. Currently Avocado timeouts too

quickly, so we can't run userland commands.

The kernel image and DeviceTree blob are built by the Armbian

project (based on Debian):

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

The Ubuntu image is downloaded from:

https://dl.armbian.com/orangepipc/Bionic_current

This test can be run using:

$ AVOCADO_ALLOW_LARGE_STORAGE=yes \

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

tests/acceptance/boot_linux_console.py

console: U-Boot SPL 2019.04-armbian (Nov 18 2019 - 23:08:35 +0100)

console: DRAM: 1024 MiB

console: Failed to set core voltage! Can't set CPU frequency

console: Trying to boot from MMC1

console: U-Boot 2019.04-armbian (Nov 18 2019 - 23:08:35 +0100) Allwinner Technology

console: CPU: Allwinner H3 (SUN8I 0000)

console: Model: Xunlong Orange Pi PC

console: DRAM: 1 GiB

console: MMC: mmc@1c0f000: 0

[...]

console: Uncompressing Linux... done, booting the kernel.

console: Booting Linux on physical CPU 0x0

console: Linux version 5.3.9-sunxi (root@builder) (gcc version 8.3.0 (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36))) #19.11.3 SMP Mon Nov 18 18:49:43 CET 2019

console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=50c5387d

console: CPU: div instructions available: patching division code

console: CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache

console: OF: fdt: Machine model: Xunlong Orange Pi PC

[...]

console: EXT4-fs (mmcblk0p1): mounted filesystem with writeback data mode. Opts: (null)

console: done.

console: Begin: Running /scripts/local-bottom ... done.

console: Begin: Running /scripts/init-bottom ... done.

console: systemd[1]: systemd 237 running in system mode. (...)

console: systemd[1]: Detected architecture arm.

console: Welcome to Ubuntu 18.04.3 LTS!

console: systemd[1]: Set hostname to <orangepipc>.

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-17-nieklinnenbank@gmail.com

[NL: rename in commit message Raspbian to Armbian, remove vm.set_machine()]

[NL: changed test to boot from SD card via BootROM, added check for 7z]

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

1 file changed, 48 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 @@ from avocado_qemu import exec_command_and_wait_for_pattern

from avocado_qemu import wait_for_console_pattern

from avocado.utils import process

from avocado.utils import archive

+from avocado.utils.path import find_command, CmdNotFoundError

+P7ZIP_AVAILABLE = True

+try:

+ find_command('7z')

+except CmdNotFoundError:

+ P7ZIP_AVAILABLE = False

class BootLinuxConsole(Test):

"""

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

exec_command_and_wait_for_pattern(self, 'reboot',

'reboot: Restarting system')

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

+ @skipUnless(P7ZIP_AVAILABLE, '7z not installed')

+ def test_arm_orangepi_bionic(self):

+ """

+ :avocado: tags=arch:arm

+ :avocado: tags=machine:orangepi-pc

+ """

+ # This test download a 196MB compressed image and expand it to 932MB...

+ image_url = ('https://dl.armbian.com/orangepipc/archive/'

+ 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z')

+ image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e'

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

+ image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img'

+ image_path = os.path.join(self.workdir, image_name)

+ process.run("7z e -o%s %s" % (self.workdir, image_path_7z))

+

+ self.vm.set_console()

+ self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw',

+ '-nic', 'user',

+ '-no-reboot')

+ self.vm.launch()

+

+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

+ 'console=ttyS0,115200 '

+ 'loglevel=7 '

+ 'nosmp '

+ 'systemd.default_timeout_start_sec=9000 '

+ 'systemd.mask=armbian-zram-config.service '

+ 'systemd.mask=armbian-ramlog.service')

+

+ self.wait_for_console_pattern('U-Boot SPL')

+ self.wait_for_console_pattern('Autoboot in ')

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

+ exec_command_and_wait_for_pattern(self, "setenv extraargs '" +

+ kernel_command_line + "'", '=>')

+ exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...');

+

+ self.wait_for_console_pattern('systemd[1]: Set hostname ' +

+ 'to <orangepipc>')

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

+

def test_s390x_s390_ccw_virtio(self):

"""

:avocado: tags=arch:s390x

The kernel image and DeviceTree blob are built by the Armbian

project (based on Debian):

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

The SD image is from the kernelci.org project:

https://kernelci.org/faq/#the-code

If ARM is a target being built, "make check-acceptance" will

automatically include this test by the use of the "arch:arm" tags.

Alternatively, this test can be run using:

$ avocado --show=console run -t machine:orangepi-pc tests/acceptance/boot_linux_console.py

console: Uncompressing Linux... done, booting the kernel.

console: Booting Linux on physical CPU 0x0

console: Linux version 4.20.7-sunxi (root@armbian.com) (gcc version 7.2.1 20171011 (Linaro GCC 7.2-2017.11)) #5.75 SMP Fri Feb 8 09:02:10 CET 2019

console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=50c5387d

[...]

console: sunxi-wdt 1c20ca0.watchdog: Watchdog enabled (timeout=16 sec, nowayout=0)

console: sunxi-mmc 1c0f000.mmc: Linked as a consumer to regulator.2

console: sunxi-mmc 1c0f000.mmc: Got CD GPIO

console: ledtrig-cpu: registered to indicate activity on CPUs

console: hidraw: raw HID events driver (C) Jiri Kosina

console: usbcore: registered new interface driver usbhid

console: usbhid: USB HID core driver

console: Initializing XFRM netlink socket

console: sunxi-mmc 1c0f000.mmc: initialized, max. request size: 16384 KB

console: NET: Registered protocol family 10

console: mmc0: host does not support reading read-only switch, assuming write-enable

console: mmc0: Problem switching card into high-speed mode!

console: mmc0: new SD card at address 4567

console: mmcblk0: mmc0:4567 QEMU! 60.0 MiB

[...]

console: EXT4-fs (mmcblk0): mounting ext2 file system using the ext4 subsystem

console: EXT4-fs (mmcblk0): mounted filesystem without journal. Opts: (null)

console: VFS: Mounted root (ext2 filesystem) on device 179:0.

console: Run /sbin/init as init process

console: EXT4-fs (mmcblk0): re-mounted. Opts: block_validity,barrier,user_xattr,acl

console: Starting syslogd: OK

console: Starting klogd: OK

console: Populating /dev using udev: udevd[203]: starting version 3.2.7

console: /bin/sh: can't access tty; job control turned off

console: cat /proc/partitions

console: / # cat /proc/partitions

console: major minor #blocks name

console: 1 0 4096 ram0

console: 1 1 4096 ram1

console: 1 2 4096 ram2

console: 1 3 4096 ram3

console: 179 0 61440 mmcblk0

console: reboot

console: / # reboot

console: umount: devtmpfs busy - remounted read-only

console: EXT4-fs (mmcblk0): re-mounted. Opts: (null)

console: The system is going down NOW!

console: Sent SIGTERM to all processes

console: Sent SIGKILL to all processes

console: Requesting system reboot

console: reboot: Restarting system

JOB TIME : 68.64 s

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-16-nieklinnenbank@gmail.com

[NL: rename in commit message Raspbian to Armbian, remove vm.set_machine()]

[NL: extend test with ethernet device checks]

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

1 file changed, 47 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 @@ class BootLinuxConsole(Test):

exec_command_and_wait_for_pattern(self, 'reboot',

'reboot: Restarting system')

+ def test_arm_orangepi_sd(self):

+ """

+ :avocado: tags=arch:arm

+ :avocado: tags=machine:orangepi-pc

+ """

+ deb_url = ('https://apt.armbian.com/pool/main/l/'

+ 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')

+ deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'

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

+ kernel_path = self.extract_from_deb(deb_path,

+ '/boot/vmlinuz-4.20.7-sunxi')

+ dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb'

+ dtb_path = self.extract_from_deb(deb_path, dtb_path)

+ rootfs_url = ('http://storage.kernelci.org/images/rootfs/buildroot/'

+ 'kci-2019.02/armel/base/rootfs.ext2.xz')

+ rootfs_hash = '692510cb625efda31640d1de0a8d60e26040f061'

+ rootfs_path_xz = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash)

+ rootfs_path = os.path.join(self.workdir, 'rootfs.cpio')

+ archive.lzma_uncompress(rootfs_path_xz, rootfs_path)

+ self.vm.set_console()

+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

+ 'console=ttyS0,115200 '

+ 'root=/dev/mmcblk0 rootwait rw '

+ 'panic=-1 noreboot')

+ self.vm.add_args('-kernel', kernel_path,

+ '-dtb', dtb_path,

+ '-drive', 'file=' + rootfs_path + ',if=sd,format=raw',

+ '-append', kernel_command_line,

+ '-no-reboot')

+ self.vm.launch()

+ shell_ready = "/bin/sh: can't access tty; job control turned off"

+ self.wait_for_console_pattern(shell_ready)