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

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

We plan to introduce yet another value for the gic version (nosel).

As we already use exotic values such as 0 and -1, let's introduce

a dedicated enum type and let vms->gic_version take this

type.

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

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

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

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

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

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

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

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

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

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

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

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

VIRT_IOMMU_VIRTIO,

} VirtIOMMUType;

+typedef enum VirtGICType {

+ VIRT_GIC_VERSION_MAX,

+ VIRT_GIC_VERSION_HOST,

+ VIRT_GIC_VERSION_2,

+ VIRT_GIC_VERSION_3,

+} VirtGICType;

+

typedef struct MemMapEntry {

hwaddr base;

hwaddr size;

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

bool highmem_ecam;

bool its;

bool virt;

- int32_t gic_version;

+ VirtGICType gic_version;

VirtIOMMUType iommu;

uint16_t virtio_iommu_bdf;

struct arm_boot_info bootinfo;

@@ -XXX,XX +XXX,XX @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms)

uint32_t redist0_capacity =

vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE;

- assert(vms->gic_version == 3);

+ assert(vms->gic_version == VIRT_GIC_VERSION_3);

return vms->smp_cpus > redist0_capacity ? 2 : 1;

}

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 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms)

irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;

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

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: Guenter Roeck <linux@roeck-us.net>

Wire up eSDHC controllers in fsl-imx25. For imx25-pdk, connect drives

provided on the command line to available eSDHC controllers.

This patch enables booting the imx25-pdk emulation from SD card.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Message-id: 20200310215146.19688-2-linux@roeck-us.net

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

[PMM: made commit subject consistent with other patch]

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

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

hw/arm/imx25_pdk.c | 16 ++++++++++++++++

3 files changed, 57 insertions(+)

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

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

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

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

#include "hw/misc/imx_rngc.h"

#include "hw/i2c/imx_i2c.h"

#include "hw/gpio/imx_gpio.h"

+#include "hw/sd/sdhci.h"

#include "exec/memory.h"

#include "target/arm/cpu.h"

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

#define FSL_IMX25_NUM_EPITS 2

#define FSL_IMX25_NUM_I2CS 3

#define FSL_IMX25_NUM_GPIOS 4

+#define FSL_IMX25_NUM_ESDHCS 2

typedef struct FslIMX25State {

/*< private >*/

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

IMXRNGCState rngc;

IMXI2CState i2c[FSL_IMX25_NUM_I2CS];

IMXGPIOState gpio[FSL_IMX25_NUM_GPIOS];

+ SDHCIState esdhc[FSL_IMX25_NUM_ESDHCS];

MemoryRegion rom[2];

MemoryRegion iram;

MemoryRegion iram_alias;

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

#define FSL_IMX25_GPIO3_SIZE 0x4000

#define FSL_IMX25_RNGC_ADDR 0x53FB0000

#define FSL_IMX25_RNGC_SIZE 0x4000

+#define FSL_IMX25_ESDHC1_ADDR 0x53FB4000

+#define FSL_IMX25_ESDHC1_SIZE 0x4000

+#define FSL_IMX25_ESDHC2_ADDR 0x53FB8000

+#define FSL_IMX25_ESDHC2_SIZE 0x4000

#define FSL_IMX25_GPIO1_ADDR 0x53FCC000

#define FSL_IMX25_GPIO1_SIZE 0x4000

#define FSL_IMX25_GPIO2_ADDR 0x53FD0000

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

#define FSL_IMX25_GPIO2_IRQ 51

#define FSL_IMX25_GPIO3_IRQ 16

#define FSL_IMX25_GPIO4_IRQ 23

+#define FSL_IMX25_ESDHC1_IRQ 9

+#define FSL_IMX25_ESDHC2_IRQ 8

#endif /* FSL_IMX25_H */

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/fsl-imx25.c

+++ b/hw/arm/fsl-imx25.c

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

#include "hw/qdev-properties.h"

#include "chardev/char.h"

+#define IMX25_ESDHC_CAPABILITIES 0x07e20000

+

static void fsl_imx25_init(Object *obj)

FslIMX25State *s = FSL_IMX25(obj);

@@ -XXX,XX +XXX,XX @@ static void fsl_imx25_init(Object *obj)

sysbus_init_child_obj(obj, "gpio[*]", &s->gpio[i], sizeof(s->gpio[i]),

TYPE_IMX_GPIO);

}

+

+ for (i = 0; i < FSL_IMX25_NUM_ESDHCS; i++) {

+ sysbus_init_child_obj(obj, "sdhc[*]", &s->esdhc[i], sizeof(s->esdhc[i]),

+ TYPE_IMX_USDHC);

static void fsl_imx25_realize(DeviceState *dev, Error **errp)

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

gpio_table[i].irq));

}

+ /* Initialize all SDHC */

+ for (i = 0; i < FSL_IMX25_NUM_ESDHCS; i++) {

+ static const struct {

+ hwaddr addr;

+ unsigned int irq;

+ } esdhc_table[FSL_IMX25_NUM_ESDHCS] = {

+ { FSL_IMX25_ESDHC1_ADDR, FSL_IMX25_ESDHC1_IRQ },

+ { FSL_IMX25_ESDHC2_ADDR, FSL_IMX25_ESDHC2_IRQ },

+ };

+

+ object_property_set_uint(OBJECT(&s->esdhc[i]), 2, "sd-spec-version",

+ &err);

+ object_property_set_uint(OBJECT(&s->esdhc[i]), IMX25_ESDHC_CAPABILITIES,

+ "capareg", &err);

+ object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err);

+ if (err) {

+ error_propagate(errp, err);

+ return;

+ }

+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->esdhc[i]), 0, esdhc_table[i].addr);

+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->esdhc[i]), 0,

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

+ esdhc_table[i].irq));

+ }

+

/* initialize 2 x 16 KB ROM */

memory_region_init_rom(&s->rom[0], NULL,

"imx25.rom0", FSL_IMX25_ROM0_SIZE, &err);

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/imx25_pdk.c

+++ b/hw/arm/imx25_pdk.c

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

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "cpu.h"

+#include "hw/qdev-properties.h"

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

#include "hw/boards.h"

#include "qemu/error-report.h"

@@ -XXX,XX +XXX,XX @@ static void imx25_pdk_init(MachineState *machine)

imx25_pdk_binfo.board_id = 1771,

imx25_pdk_binfo.nb_cpus = 1;

+ for (i = 0; i < FSL_IMX25_NUM_ESDHCS; i++) {

+ BusState *bus;

+ DeviceState *carddev;

+ DriveInfo *di;

+ BlockBackend *blk;

+

+ di = drive_get_next(IF_SD);

+ blk = di ? blk_by_legacy_dinfo(di) : NULL;

+ bus = qdev_get_child_bus(DEVICE(&s->soc.esdhc[i]), "sd-bus");

+ carddev = qdev_create(bus, TYPE_SD_CARD);

+ qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

+ object_property_set_bool(OBJECT(carddev), true,

+ "realized", &error_fatal);

+ }

+

/*

* We test explicitly for qtest here as it is not done (yet?) in

* arm_load_kernel(). Without this the "make check" command would

From: Niek Linnenbank <nieklinnenbank@gmail.com>

Allwinner System-on-Chips usually contain a Real Time Clock (RTC)

for non-volatile system date and time keeping. This commit adds a generic

Allwinner RTC device that supports the RTC devices found in Allwinner SoC

family sun4i (A10), sun7i (A20) and sun6i and newer (A31, H2+, H3, etc).

The following RTC functionality and features are implemented:

* Year-Month-Day read/write

* Hour-Minute-Second read/write

* General Purpose storage

The following boards are extended with the RTC device:

* Cubieboard (hw/arm/cubieboard.c)

* Orange Pi PC (hw/arm/orangepi.c)

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

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

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

hw/rtc/Makefile.objs | 1 +

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

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

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

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

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

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

hw/rtc/trace-events | 4 +

8 files changed, 571 insertions(+), 1 deletion(-)

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

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

diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs

--- a/hw/rtc/Makefile.objs

+++ b/hw/rtc/Makefile.objs

@@ -XXX,XX +XXX,XX @@ obj-$(CONFIG_MC146818RTC) += mc146818rtc.o

common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o

common-obj-$(CONFIG_ASPEED_SOC) += aspeed_rtc.o

common-obj-$(CONFIG_GOLDFISH_RTC) += goldfish_rtc.o

+common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-rtc.o

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

#include "hw/ide/ahci.h"

#include "hw/usb/hcd-ohci.h"

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

+#include "hw/rtc/allwinner-rtc.h"

#include "target/arm/cpu.h"

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

AwEmacState emac;

AllwinnerAHCIState sata;

AwSdHostState mmc0;

+ AwRtcState rtc;

MemoryRegion sram_a;

EHCISysBusState ehci[AW_A10_NUM_USB];

OHCISysBusState ohci[AW_A10_NUM_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 @@

#include "hw/misc/allwinner-sid.h"

#include "hw/sd/allwinner-sdhost.h"

#include "hw/net/allwinner-sun8i-emac.h"

+#include "hw/rtc/allwinner-rtc.h"

#include "target/arm/cpu.h"

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

AW_H3_GIC_CPU,

AW_H3_GIC_HYP,

AW_H3_GIC_VCPU,

+ AW_H3_RTC,

AW_H3_CPUCFG,

AW_H3_SDRAM

};

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

AwSidState sid;

AwSdHostState mmc0;

AwSun8iEmacState emac;

+ AwRtcState rtc;

GICState gic;

MemoryRegion sram_a1;

MemoryRegion sram_a2;

diff --git a/include/hw/rtc/allwinner-rtc.h b/include/hw/rtc/allwinner-rtc.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/include/hw/rtc/allwinner-rtc.h

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

+/*

+ * Allwinner Real Time Clock emulation

+ *

+ * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef HW_MISC_ALLWINNER_RTC_H

+#define HW_MISC_ALLWINNER_RTC_H

+

+#include "qom/object.h"

+#include "hw/sysbus.h"

+

+/**

+ * Constants

+ * @{

+ */

+

+/** Highest register address used by RTC device */

+#define AW_RTC_REGS_MAXADDR (0x200)

+

+/** Total number of known registers */

+#define AW_RTC_REGS_NUM (AW_RTC_REGS_MAXADDR / sizeof(uint32_t))

+

+/** @} */

+

+/**

+ * Object model types

+ * @{

+ */

+

+/** Generic Allwinner RTC device (abstract) */

+#define TYPE_AW_RTC "allwinner-rtc"

+

+/** Allwinner RTC sun4i family (A10, A12) */

+#define TYPE_AW_RTC_SUN4I TYPE_AW_RTC "-sun4i"

+

+/** Allwinner RTC sun6i family and newer (A31, H2+, H3, etc) */

+#define TYPE_AW_RTC_SUN6I TYPE_AW_RTC "-sun6i"

+

+/** Allwinner RTC sun7i family (A20) */

+#define TYPE_AW_RTC_SUN7I TYPE_AW_RTC "-sun7i"

+

+/** @} */

+

+/**

+ * Object model macros

+ * @{

+ */

+

+#define AW_RTC(obj) \

+ OBJECT_CHECK(AwRtcState, (obj), TYPE_AW_RTC)

+#define AW_RTC_CLASS(klass) \

+ OBJECT_CLASS_CHECK(AwRtcClass, (klass), TYPE_AW_RTC)

+#define AW_RTC_GET_CLASS(obj) \

+ OBJECT_GET_CLASS(AwRtcClass, (obj), TYPE_AW_RTC)

+

+/** @} */

+

+/**

+ * Allwinner RTC per-object instance state.

+ */

+typedef struct AwRtcState {

+ /*< private >*/

+ SysBusDevice parent_obj;

+ /*< public >*/

+

+ /**

+ * Actual year represented by the device when year counter is zero

+ *

+ * Can be overridden by the user using the corresponding 'base-year'

+ * property. The base year used by the target OS driver can vary, for

+ * example the Linux driver for sun6i uses 1970 while NetBSD uses 2000.

+ */

+ int base_year;

+

+ /** Maps I/O registers in physical memory */

+ MemoryRegion iomem;

+

+ /** Array of hardware registers */

+ uint32_t regs[AW_RTC_REGS_NUM];

+

+} AwRtcState;

+

+/**

+ * Allwinner RTC class-level struct.

+ *

+ * This struct is filled by each sunxi device specific code

+ * such that the generic code can use this struct to support

+ * all devices.

+ */

+typedef struct AwRtcClass {

+ /*< private >*/

+ SysBusDeviceClass parent_class;

+ /*< public >*/

+

+ /** Defines device specific register map */

+ const uint8_t *regmap;

+

+ /** Size of the regmap in bytes */

+ size_t regmap_size;

+

+ /**

+ * Read device specific register

+ *

+ * @offset: register offset to read

+ * @return true if register read successful, false otherwise

+ */

+ bool (*read)(AwRtcState *s, uint32_t offset);

+

+ /**

+ * Write device specific register

+ *

+ * @offset: register offset to write

+ * @data: value to set in register

+ * @return true if register write successful, false otherwise

+ */

+ bool (*write)(AwRtcState *s, uint32_t offset, uint32_t data);

+

+} AwRtcClass;

+

+#endif /* HW_MISC_ALLWINNER_RTC_H */

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

index XXXXXXX..XXXXXXX 100644

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

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

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

#define AW_A10_EHCI_BASE 0x01c14000

#define AW_A10_OHCI_BASE 0x01c14400

#define AW_A10_SATA_BASE 0x01c18000

+#define AW_A10_RTC_BASE 0x01c20d00

static void aw_a10_init(Object *obj)

@@ -XXX,XX +XXX,XX @@ static void aw_a10_init(Object *obj)

sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0),

TYPE_AW_SDHOST_SUN4I);

+

+ sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),

+ TYPE_AW_RTC_SUN4I);

static void aw_a10_realize(DeviceState *dev, Error **errp)

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

sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, qdev_get_gpio_in(dev, 32));

object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0),

"sd-bus", &error_abort);

+

+ /* RTC */

+ qdev_init_nofail(DEVICE(&s->rtc));

+ sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->rtc), 0, AW_A10_RTC_BASE, 10);

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

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 @@ const hwaddr allwinner_h3_memmap[] = {

[AW_H3_GIC_CPU] = 0x01c82000,

[AW_H3_GIC_HYP] = 0x01c84000,

[AW_H3_GIC_VCPU] = 0x01c86000,

+ [AW_H3_RTC] = 0x01f00000,

[AW_H3_CPUCFG] = 0x01f01c00,

[AW_H3_SDRAM] = 0x40000000

};

@@ -XXX,XX +XXX,XX @@ struct AwH3Unimplemented {

{ "csi", 0x01cb0000, 320 * KiB },

{ "tve", 0x01e00000, 64 * KiB },

{ "hdmi", 0x01ee0000, 128 * KiB },

- { "rtc", 0x01f00000, 1 * KiB },

{ "r_timer", 0x01f00800, 1 * KiB },

{ "r_intc", 0x01f00c00, 1 * KiB },

{ "r_wdog", 0x01f01000, 1 * KiB },

@@ -XXX,XX +XXX,XX @@ static void allwinner_h3_init(Object *obj)

"ram-addr", &error_abort);

object_property_add_alias(obj, "ram-size", OBJECT(&s->dramc),

"ram-size", &error_abort);

+

+ sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),

+ TYPE_AW_RTC_SUN6I);

static void allwinner_h3_realize(DeviceState *dev, Error **errp)

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

sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 1, s->memmap[AW_H3_DRAMCTL]);

sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, s->memmap[AW_H3_DRAMPHY]);

+ /* RTC */

+ qdev_init_nofail(DEVICE(&s->rtc));

+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, s->memmap[AW_H3_RTC]);

+

/* Unimplemented devices */

for (i = 0; i < ARRAY_SIZE(unimplemented); i++) {

create_unimplemented_device(unimplemented[i].device_name,

diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/hw/rtc/allwinner-rtc.c

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

+/*

+ * Allwinner Real Time Clock emulation

+ *

+ * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include "qemu/osdep.h"

+#include "qemu/units.h"

+#include "hw/sysbus.h"

+#include "migration/vmstate.h"

+#include "qemu/log.h"

+#include "qemu/module.h"

+#include "qemu-common.h"

+#include "hw/qdev-properties.h"

+#include "hw/rtc/allwinner-rtc.h"

+#include "trace.h"

+

+/* RTC registers */

+enum {

+ REG_LOSC = 1, /* Low Oscillator Control */

+ REG_YYMMDD, /* RTC Year-Month-Day */

+ REG_HHMMSS, /* RTC Hour-Minute-Second */

+ REG_ALARM1_WKHHMMSS, /* Alarm1 Week Hour-Minute-Second */

+ REG_ALARM1_EN, /* Alarm1 Enable */

+ REG_ALARM1_IRQ_EN, /* Alarm1 IRQ Enable */

+ REG_ALARM1_IRQ_STA, /* Alarm1 IRQ Status */

+ REG_GP0, /* General Purpose Register 0 */

+ REG_GP1, /* General Purpose Register 1 */

+ REG_GP2, /* General Purpose Register 2 */

+ REG_GP3, /* General Purpose Register 3 */

+

+ /* sun4i registers */

+ REG_ALARM1_DDHHMMSS, /* Alarm1 Day Hour-Minute-Second */

+ REG_CPUCFG, /* CPU Configuration Register */

+

+ /* sun6i registers */

+ REG_LOSC_AUTOSTA, /* LOSC Auto Switch Status */

+ REG_INT_OSC_PRE, /* Internal OSC Clock Prescaler */

+ REG_ALARM0_COUNTER, /* Alarm0 Counter */

+ REG_ALARM0_CUR_VLU, /* Alarm0 Counter Current Value */

+ REG_ALARM0_ENABLE, /* Alarm0 Enable */

+ REG_ALARM0_IRQ_EN, /* Alarm0 IRQ Enable */

+ REG_ALARM0_IRQ_STA, /* Alarm0 IRQ Status */

+ REG_ALARM_CONFIG, /* Alarm Config */

+ REG_LOSC_OUT_GATING, /* LOSC Output Gating Register */

+ REG_GP4, /* General Purpose Register 4 */

+ REG_GP5, /* General Purpose Register 5 */

+ REG_GP6, /* General Purpose Register 6 */

+ REG_GP7, /* General Purpose Register 7 */

+ REG_RTC_DBG, /* RTC Debug Register */

+ REG_GPL_HOLD_OUT, /* GPL Hold Output Register */

+ REG_VDD_RTC, /* VDD RTC Regulate Register */

+ REG_IC_CHARA, /* IC Characteristics Register */

+};