Last pullreq before 6.0 softfreeze: a few minor feature patches,

some bugfixes, some cleanups.

The following changes since commit 6f34661b6c97a37a5efc27d31c037ddeda4547e2:

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-pull-request' into staging (2021-03-11 18:55:27 +0000)

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

for you to fetch changes up to 41f09f2e9f09e4dd386d84174a6dcb5136af17ca:

hw/display/pxa2xx: Inline template header (2021-03-12 13:26:08 +0000)

* versal: Support XRAMs and XRAM controller

* smmu: Various minor bug fixes

* SVE emulation: fix bugs handling odd vector lengths

* allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value

* tests/acceptance: fix orangepi-pc acceptance tests

* hw/timer/sse-timer: Propagate eventual error in sse_timer_realize()

* hw/arm/virt: KVM: The IPA lower bound is 32

* npcm7xx: support MFT module

* pl110, pxa2xx_lcd: tidy up template headers

Andrew Jones (2):

accel: kvm: Fix kvm_type invocation

hw/arm/virt: KVM: The IPA lower bound is 32

Edgar E. Iglesias (2):

hw/misc: versal: Add a model of the XRAM controller

hw/arm: versal: Add support for the XRAMs

Eric Auger (7):

intel_iommu: Fix mask may be uninitialized in vtd_context_device_invalidate

dma: Introduce dma_aligned_pow2_mask()

virtio-iommu: Handle non power of 2 range invalidations

hw/arm/smmu-common: Fix smmu_iotlb_inv_iova when asid is not set

hw/arm/smmuv3: Enforce invalidation on a power of two range

hw/arm/smmuv3: Fix SMMU_CMD_CFGI_STE_RANGE handling

hw/arm/smmuv3: Uniformize sid traces

Hao Wu (5):

hw/misc: Add GPIOs for duty in NPCM7xx PWM

hw/misc: Add NPCM7XX MFT Module

hw/arm: Add MFT device to NPCM7xx Soc

hw/arm: Connect PWM fans in NPCM7XX boards

tests/qtest: Test PWM fan RPM using MFT in PWM test

Niek Linnenbank (5):

hw/net/allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value

tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine

tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08

tests/acceptance: update sunxi kernel from armbian to 5.10.16

tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests

Peter Maydell (9):

hw/display/pl110: Remove dead code for non-32-bpp surfaces

hw/display/pl110: Pull included-once parts of template header into pl110.c

hw/display/pl110: Remove use of BITS from pl110_template.h

hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces

hw/display/pxa2xx_lcd: Remove dest_width state field

hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h

hw/display/pxa2xx: Apply brace-related coding style fixes to template header

hw/display/pxa2xx: Apply whitespace-only coding style fixes to template header

hw/display/pxa2xx: Inline template header

From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>

Connect the support for the Versal Accelerator RAMs (XRAMs).

Reviewed-by: Luc Michel <luc@lmichel.fr>

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

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>

Message-id: 20210308224637.2949533-3-edgar.iglesias@gmail.com

docs/system/arm/xlnx-versal-virt.rst | 1 +

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

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

3 files changed, 50 insertions(+)

diff --git a/docs/system/arm/xlnx-versal-virt.rst b/docs/system/arm/xlnx-versal-virt.rst

--- a/docs/system/arm/xlnx-versal-virt.rst

+++ b/docs/system/arm/xlnx-versal-virt.rst

@@ -XXX,XX +XXX,XX @@ Implemented devices:

- 8 ADMA (Xilinx zDMA) channels

- 2 SD Controllers

- OCM (256KB of On Chip Memory)

+- XRAM (4MB of on chip Accelerator RAM)

- DDR memory

QEMU does not yet model any other devices, including the PL and the AI Engine.

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

index XXXXXXX..XXXXXXX 100644

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

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

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

#include "hw/sysbus.h"

#include "hw/arm/boot.h"

+#include "hw/or-irq.h"

#include "hw/sd/sdhci.h"

#include "hw/intc/arm_gicv3.h"

#include "hw/char/pl011.h"

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

#include "hw/rtc/xlnx-zynqmp-rtc.h"

#include "qom/object.h"

#include "hw/usb/xlnx-usb-subsystem.h"

+#include "hw/misc/xlnx-versal-xramc.h"

#define TYPE_XLNX_VERSAL "xlnx-versal"

OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL)

@@ -XXX,XX +XXX,XX @@ OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL)

#define XLNX_VERSAL_NR_GEMS 2

#define XLNX_VERSAL_NR_ADMAS 8

#define XLNX_VERSAL_NR_SDS 2

+#define XLNX_VERSAL_NR_XRAM 4

#define XLNX_VERSAL_NR_IRQS 192

struct Versal {

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

XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS];

VersalUsb2 usb;

} iou;

+

+ struct {

+ qemu_or_irq irq_orgate;

+ XlnxXramCtrl ctrl[XLNX_VERSAL_NR_XRAM];

+ } xram;

} lpd;

/* The Platform Management Controller subsystem. */

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

#define VERSAL_GEM1_IRQ_0 58

#define VERSAL_GEM1_WAKE_IRQ_0 59

#define VERSAL_ADMA_IRQ_0 60

+#define VERSAL_XRAM_IRQ_0 79

#define VERSAL_RTC_APB_ERR_IRQ 121

#define VERSAL_SD0_IRQ_0 126

#define VERSAL_RTC_ALARM_IRQ 142

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

#define MM_OCM 0xfffc0000U

#define MM_OCM_SIZE 0x40000

+#define MM_XRAM 0xfe800000

+#define MM_XRAMC 0xff8e0000

+#define MM_XRAMC_SIZE 0x10000

+

#define MM_USB2_CTRL_REGS 0xFF9D0000

#define MM_USB2_CTRL_REGS_SIZE 0x10000

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

index XXXXXXX..XXXXXXX 100644

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

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

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

*/

#include "qemu/osdep.h"

+#include "qemu/units.h"

#include "qapi/error.h"

#include "qemu/log.h"

#include "qemu/module.h"

@@ -XXX,XX +XXX,XX @@ static void versal_create_rtc(Versal *s, qemu_irq *pic)

sysbus_connect_irq(sbd, 1, pic[VERSAL_RTC_APB_ERR_IRQ]);

+static void versal_create_xrams(Versal *s, qemu_irq *pic)

+ int nr_xrams = ARRAY_SIZE(s->lpd.xram.ctrl);

+ DeviceState *orgate;

+ int i;

+

+ /* XRAM IRQs get ORed into a single line. */

+ object_initialize_child(OBJECT(s), "xram-irq-orgate",

+ &s->lpd.xram.irq_orgate, TYPE_OR_IRQ);

+ orgate = DEVICE(&s->lpd.xram.irq_orgate);

+ object_property_set_int(OBJECT(orgate),

+ "num-lines", nr_xrams, &error_fatal);

+ qdev_realize(orgate, NULL, &error_fatal);

+ qdev_connect_gpio_out(orgate, 0, pic[VERSAL_XRAM_IRQ_0]);

+

+ for (i = 0; i < ARRAY_SIZE(s->lpd.xram.ctrl); i++) {

+ SysBusDevice *sbd;

+ MemoryRegion *mr;

+

+ object_initialize_child(OBJECT(s), "xram[*]", &s->lpd.xram.ctrl[i],

+ TYPE_XLNX_XRAM_CTRL);

+ sbd = SYS_BUS_DEVICE(&s->lpd.xram.ctrl[i]);

+ sysbus_realize(sbd, &error_fatal);

+

+ mr = sysbus_mmio_get_region(sbd, 0);

+ memory_region_add_subregion(&s->mr_ps,

+ MM_XRAMC + i * MM_XRAMC_SIZE, mr);

+ mr = sysbus_mmio_get_region(sbd, 1);

+ memory_region_add_subregion(&s->mr_ps, MM_XRAM + i * MiB, mr);

+

+ sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(orgate, i));

+ }

/* This takes the board allocated linear DDR memory and creates aliases

* for each split DDR range/aperture on the Versal address map.

*/

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

versal_create_admas(s, pic);

versal_create_sds(s, pic);

versal_create_rtc(s, pic);

+ versal_create_xrams(s, pic);

versal_map_ddr(s);

versal_unimp(s);

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

If the SSECounter link is absent, we set an error message

in sse_timer_realize() but forgot to propagate this error.

Add the missing 'return'.

Fixes: CID 1450755 (Null pointer dereferences)

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

Message-id: 20210312001845.1562670-1-f4bug@amsat.org

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

hw/timer/sse-timer.c | 1 +

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c

--- a/hw/timer/sse-timer.c

+++ b/hw/timer/sse-timer.c

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

if (!s->counter) {

error_setg(errp, "counter property was not set");

+ return;

}

s->counter_notifier.notify = sse_timer_counter_callback;

From: Andrew Jones <drjones@redhat.com>

The virt machine already checks KVM_CAP_ARM_VM_IPA_SIZE to get the

upper bound of the IPA size. If that bound is lower than the highest

possible GPA for the machine, then QEMU will error out. However, the

IPA is set to 40 when the highest GPA is less than or equal to 40,

even when KVM may support an IPA limit as low as 32. This means KVM

may fail the VM creation unnecessarily. Additionally, 40 is selected

with the value 0, which means use the default, and that gets around

a check in some versions of KVM, causing a difficult to debug fail.

Always use the IPA size that corresponds to the highest possible GPA,

unless it's lower than 32, in which case use 32. Also, we must still

use 0 when KVM only supports the legacy fixed 40 bit IPA.

Suggested-by: Marc Zyngier <maz@kernel.org>

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

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

Reviewed-by: Marc Zyngier <maz@kernel.org>

Message-id: 20210310135218.255205-3-drjones@redhat.com

target/arm/kvm_arm.h | 6 ++++--

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

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

3 files changed, 23 insertions(+), 10 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 @@ bool kvm_arm_sve_supported(void);

/**

* kvm_arm_get_max_vm_ipa_size:

* @ms: Machine state handle

+ * @fixed_ipa: True when the IPA limit is fixed at 40. This is the case

+ * for legacy KVM.

*

* Returns the number of bits in the IPA address space supported by KVM

*/

-int kvm_arm_get_max_vm_ipa_size(MachineState *ms);

+int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa);

/**

* kvm_arm_sync_mpstate_to_kvm:

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

g_assert_not_reached();

}

-static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms)

+static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa)

{

g_assert_not_reached();

}

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 HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,

static int virt_kvm_type(MachineState *ms, const char *type_str)

{

VirtMachineState *vms = VIRT_MACHINE(ms);

- int max_vm_pa_size = kvm_arm_get_max_vm_ipa_size(ms);

- int requested_pa_size;

+ int max_vm_pa_size, requested_pa_size;

+ bool fixed_ipa;

+

+ max_vm_pa_size = kvm_arm_get_max_vm_ipa_size(ms, &fixed_ipa);

/* we freeze the memory map to compute the highest gpa */

virt_set_memmap(vms);

requested_pa_size = 64 - clz64(vms->highest_gpa);

+ /*

+ * KVM requires the IPA size to be at least 32 bits.

+ */

+ if (requested_pa_size < 32) {

+ requested_pa_size = 32;

+ }

+

if (requested_pa_size > max_vm_pa_size) {

error_report("-m and ,maxmem option values "

"require an IPA range (%d bits) larger than "

"the one supported by the host (%d bits)",

requested_pa_size, max_vm_pa_size);

- exit(1);

+ exit(1);

}

/*

- * By default we return 0 which corresponds to an implicit legacy

- * 40b IPA setting. Otherwise we return the actual requested PA

- * logsize

+ * We return the requested PA log size, unless KVM only supports

+ * the implicit legacy 40b IPA setting, in which case the kvm_type

+ * must be 0.

*/

- return requested_pa_size > 40 ? requested_pa_size : 0;

+ return fixed_ipa ? 0 : requested_pa_size;

}

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

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 @@ bool kvm_arm_pmu_supported(void)

return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3);

}

-int kvm_arm_get_max_vm_ipa_size(MachineState *ms)

+int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa)

{

KVMState *s = KVM_STATE(ms->accelerator);

int ret;

ret = kvm_check_extension(s, KVM_CAP_ARM_VM_IPA_SIZE);

+ *fixed_ipa = ret <= 0;

+

return ret > 0 ? ret : 40;

}

From: Niek Linnenbank <nieklinnenbank@gmail.com>

Previously the ARMBIAN_ARTIFACTS_CACHED pre-condition was added to allow running

tests that have already existing armbian.com artifacts stored in the local avocado cache,

but do not have working URLs to download a fresh copy.

At this time of writing the URLs for artifacts on the armbian.com server are updated and working.

Any future broken URLs will result in a skipped acceptance test, for example:

(1/5) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi:

CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.53 s)

This commits removes the ARMBIAN_ARTIFACTS_CACHED pre-condition such that

the acceptance tests for the orangepi-pc and cubieboard machines can run.

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

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Message-id: 20210310195820.21950-6-nieklinnenbank@gmail.com

tests/acceptance/boot_linux_console.py | 12 ------------

tests/acceptance/replay_kernel.py | 2 --

2 files changed, 14 deletions(-)

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 @@ def test_arm_exynos4210_initrd(self):

self.wait_for_console_pattern('Boot successful.')

# TODO user command, for now the uart is stuck

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_cubieboard_initrd(self):

"""

:avocado: tags=arch:arm

@@ -XXX,XX +XXX,XX @@ def test_arm_cubieboard_initrd(self):

'system-control@1c00000')

# cubieboard's reboot is not functioning; omit reboot test.

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_cubieboard_sata(self):

"""

:avocado: tags=arch:arm

@@ -XXX,XX +XXX,XX @@ def test_arm_quanta_gsj_initrd(self):

self.wait_for_console_pattern(

'Give root password for system maintenance')

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_orangepi(self):

"""

:avocado: tags=arch:arm

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi(self):

console_pattern = 'Kernel command line: %s' % kernel_command_line

self.wait_for_console_pattern(console_pattern)

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_orangepi_initrd(self):

"""

:avocado: tags=arch:arm

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi_initrd(self):

# Wait for VM to shut down gracefully

self.vm.wait()

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_orangepi_sd(self):

"""

:avocado: tags=arch:arm

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi_sd(self):

# Wait for VM to shut down gracefully

self.vm.wait()

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

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

def test_arm_orangepi_bionic_20_08(self):

"""

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

index XXXXXXX..XXXXXXX 100644

--- a/tests/acceptance/replay_kernel.py

+++ b/tests/acceptance/replay_kernel.py

@@ -XXX,XX +XXX,XX @@ def test_arm_virt(self):

self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1)

@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

def test_arm_cubieboard_initrd(self):

"""

:avocado: tags=arch:arm

From: Niek Linnenbank <nieklinnenbank@gmail.com>

Update the download URL of the Armbian 20.08 Bionic image for

test_arm_orangepi_bionic_20_08 of the orangepi-pc machine.

The archive.armbian.com URL contains more images and should keep stable

for a longer period of time than dl.armbian.com.

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

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

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

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Message-id: 20210310195820.21950-4-nieklinnenbank@gmail.com

tests/acceptance/boot_linux_console.py | 2 +-

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 @@ def test_arm_orangepi_bionic_20_08(self):

# to 1036 MiB, but the underlying filesystem is 1552 MiB...

# As we expand it to 2 GiB we are safe.

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

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

'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')

image_hash = ('b4d6775f5673486329e45a0586bf06b6'

'dbe792199fd182ac6b9c7bb6c7d3e6dd')

From: Niek Linnenbank <nieklinnenbank@gmail.com>

The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.com:

$ ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run -t machine:orangepi-pc tests/acceptance/boot_linux_console.py

Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi

...

(1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi:

CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s)

This commit updates the sunxi kernel to 5.10.16 for the acceptance

tests of the orangepi-pc and cubieboard machines.

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

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

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

tests/acceptance/boot_linux_console.py | 40 +++++++++++++-------------

tests/acceptance/replay_kernel.py | 8 +++---

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

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 @@ def test_arm_cubieboard_initrd(self):

:avocado: tags=machine:cubieboard

"""

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'

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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/sun4i-a10-cubieboard.dtb'

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

+ dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'

dtb_path = self.extract_from_deb(deb_path, dtb_path)

initrd_url = ('https://github.com/groeck/linux-build-test/raw/'

'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'

@@ -XXX,XX +XXX,XX @@ def test_arm_cubieboard_sata(self):

:avocado: tags=machine:cubieboard

"""

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'

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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/sun4i-a10-cubieboard.dtb'

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

+ dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'

dtb_path = self.extract_from_deb(deb_path, dtb_path)

rootfs_url = ('https://github.com/groeck/linux-build-test/raw/'

'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi(self):

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

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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'

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

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

dtb_path = self.extract_from_deb(deb_path, dtb_path)

self.vm.set_console()

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi_initrd(self):

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

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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'

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

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

dtb_path = self.extract_from_deb(deb_path, dtb_path)

initrd_url = ('https://github.com/groeck/linux-build-test/raw/'

'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'

@@ -XXX,XX +XXX,XX @@ def test_arm_orangepi_sd(self):

:avocado: tags=device:sd

"""

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'

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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'

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

+ dtb_path = '/usr/lib/linux-image-current-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')

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

index XXXXXXX..XXXXXXX 100644

--- a/tests/acceptance/replay_kernel.py

+++ b/tests/acceptance/replay_kernel.py

@@ -XXX,XX +XXX,XX @@ def test_arm_cubieboard_initrd(self):

:avocado: tags=machine:cubieboard

"""

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'

+ 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')

+ deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'

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/sun4i-a10-cubieboard.dtb'

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

+ dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'

dtb_path = self.extract_from_deb(deb_path, dtb_path)

initrd_url = ('https://github.com/groeck/linux-build-test/raw/'

'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'

From: Niek Linnenbank <nieklinnenbank@gmail.com>

The image for Armbian 19.11.3 bionic has been removed from the armbian server.

Without the image as input the test arm_orangepi_bionic_19_11 cannot run.

This commit removes the test completely and merges the code of the generic function

do_test_arm_orangepi_uboot_armbian back with the 20.08 test.

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

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Message-id: 20210310195820.21950-3-nieklinnenbank@gmail.com

tests/acceptance/boot_linux_console.py | 72 ++++++++------------------

1 file changed, 23 insertions(+), 49 deletions(-)

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 @@ def test_arm_orangepi_sd(self):

# Wait for VM to shut down gracefully

self.vm.wait()

- def do_test_arm_orangepi_uboot_armbian(self, image_path):

+ @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

+ 'Test artifacts fetched from unreliable apt.armbian.com')

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

+ def test_arm_orangepi_bionic_20_08(self):

+ """

+ :avocado: tags=arch:arm

+ :avocado: tags=machine:orangepi-pc

+ :avocado: tags=device:sd

+ """

+

+ # This test download a 275 MiB compressed image and expand it

+ # to 1036 MiB, but the underlying filesystem is 1552 MiB...

+ # As we expand it to 2 GiB we are safe.

+

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

+ 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')

+ image_hash = ('b4d6775f5673486329e45a0586bf06b6'

+ 'dbe792199fd182ac6b9c7bb6c7d3e6dd')

+ image_path_xz = self.fetch_asset(image_url, asset_hash=image_hash,

+ algorithm='sha256')

+ image_path = archive.extract(image_path_xz, self.workdir)

+ image_pow2ceil_expand(image_path)

+

self.vm.set_console()

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

'-nic', 'user',

@@ -XXX,XX +XXX,XX @@ def do_test_arm_orangepi_uboot_armbian(self, image_path):

'to <orangepipc>')

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

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

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

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

- def test_arm_orangepi_bionic_19_11(self):

- """

- :avocado: tags=arch:arm

- :avocado: tags=machine:orangepi-pc

- :avocado: tags=device:sd

- """

-

- # This test download a 196MB compressed image and expand it to 1GB

- 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))

- image_pow2ceil_expand(image_path)

-

- self.do_test_arm_orangepi_uboot_armbian(image_path)

-

- @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),

- 'Test artifacts fetched from unreliable apt.armbian.com')

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

- def test_arm_orangepi_bionic_20_08(self):

- """

- :avocado: tags=arch:arm

- :avocado: tags=machine:orangepi-pc

- :avocado: tags=device:sd

- """

-

- # This test download a 275 MiB compressed image and expand it

- # to 1036 MiB, but the underlying filesystem is 1552 MiB...

- # As we expand it to 2 GiB we are safe.

-

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

- 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')

- image_hash = ('b4d6775f5673486329e45a0586bf06b6'

- 'dbe792199fd182ac6b9c7bb6c7d3e6dd')

- image_path_xz = self.fetch_asset(image_url, asset_hash=image_hash,

- algorithm='sha256')

- image_path = archive.extract(image_path_xz, self.workdir)

- image_pow2ceil_expand(image_path)

-

- self.do_test_arm_orangepi_uboot_armbian(image_path)

-

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

def test_arm_orangepi_uboot_netbsd9(self):

"""

From: Andrew Jones <drjones@redhat.com>

Prior to commit f2ce39b4f067 a MachineClass kvm_type method

only needed to be registered to ensure it would be executed.

With commit f2ce39b4f067 a kvm-type machine property must also

be specified. hw/arm/virt relies on the kvm_type method to pass

its selected IPA limit to KVM, but this is not exposed as a

machine property. Restore the previous functionality of invoking

kvm_type when it's present.

Fixes: f2ce39b4f067 ("vl: make qemu_get_machine_opts static")

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

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

Message-id: 20210310135218.255205-2-drjones@redhat.com

include/hw/boards.h | 1 +

accel/kvm/kvm-all.c | 2 ++

2 files changed, 3 insertions(+)

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

--- a/include/hw/boards.h

+++ b/include/hw/boards.h

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

* @kvm_type:

* Return the type of KVM corresponding to the kvm-type string option or

* computed based on other criteria such as the host kernel capabilities.

+ * kvm-type may be NULL if it is not needed.

* @numa_mem_supported:

* true if '--numa node.mem' option is supported and false otherwise

* @smp_parse:

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c

index XXXXXXX..XXXXXXX 100644

--- a/accel/kvm/kvm-all.c

+++ b/accel/kvm/kvm-all.c

@@ -XXX,XX +XXX,XX @@ static int kvm_init(MachineState *ms)

"kvm-type",

&error_abort);

type = mc->kvm_type(ms, kvm_type);

+ } else if (mc->kvm_type) {

+ type = mc->kvm_type(ms, NULL);

}

do {

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

If the asid is not set, do not attempt to locate the key directly

as all inserted keys have a valid asid.

Use g_hash_table_foreach_remove instead.

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

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

hw/arm/smmu-common.c | 2 +-

diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c

--- a/hw/arm/smmu-common.c

+++ b/hw/arm/smmu-common.c

@@ -XXX,XX +XXX,XX @@ inline void

smmu_iotlb_inv_iova(SMMUState *s, int asid, dma_addr_t iova,

uint8_t tg, uint64_t num_pages, uint8_t ttl)

- if (ttl && (num_pages == 1)) {

+ if (ttl && (num_pages == 1) && (asid >= 0)) {

SMMUIOTLBKey key = smmu_get_iotlb_key(asid, iova, tg, ttl);

g_hash_table_remove(s->iotlb, &key);

The template header is now included only once; just inline its contents

in hw/display/pxa2xx_lcd.c.

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

Message-id: 20210211141515.8755-10-peter.maydell@linaro.org

hw/display/pxa2xx_template.h | 434 -----------------------------------

hw/display/pxa2xx_lcd.c | 427 +++++++++++++++++++++++++++++++++-

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

delete mode 100644 hw/display/pxa2xx_template.h

diff --git a/hw/display/pxa2xx_template.h b/hw/display/pxa2xx_template.h

deleted file mode 100644

index XXXXXXX..XXXXXXX

--- a/hw/display/pxa2xx_template.h

+++ /dev/null

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

-/*

- * Intel XScale PXA255/270 LCDC emulation.

- *

- * Copyright (c) 2006 Openedhand Ltd.

- * Written by Andrzej Zaborowski <balrog@zabor.org>

- *

- * This code is licensed under the GPLv2.

- *

- * Framebuffer format conversion routines.

- */

-

-# define SKIP_PIXEL(to) do { to += deststep; } while (0)

-# define COPY_PIXEL(to, from) \

- do { \

- *(uint32_t *) to = from; \

- SKIP_PIXEL(to); \

- } while (0)

-

-#ifdef HOST_WORDS_BIGENDIAN

-# define SWAP_WORDS 1

-#endif

-

-#define FN_2(x) FN(x + 1) FN(x)

-#define FN_4(x) FN_2(x + 2) FN_2(x)

-

-static void pxa2xx_draw_line2(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t *palette = opaque;

- uint32_t data;

- while (width > 0) {

- data = *(uint32_t *) src;

-#define FN(x) COPY_PIXEL(dest, palette[(data >> ((x) * 2)) & 3]);

-#ifdef SWAP_WORDS

- FN_4(12)

- FN_4(8)

- FN_4(4)

- FN_4(0)

-#else

- FN_4(0)

- FN_4(4)

- FN_4(8)

- FN_4(12)

-#endif

-#undef FN

- width -= 16;

- src += 4;

- }

-}

-

-static void pxa2xx_draw_line4(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t *palette = opaque;

- uint32_t data;

- while (width > 0) {

- data = *(uint32_t *) src;

-#define FN(x) COPY_PIXEL(dest, palette[(data >> ((x) * 4)) & 0xf]);

-#ifdef SWAP_WORDS

- FN_2(6)

- FN_2(4)

- FN_2(2)

- FN_2(0)

-#else

- FN_2(0)

- FN_2(2)

- FN_2(4)

- FN_2(6)

-#endif

-#undef FN

- width -= 8;

- src += 4;

- }

-}

-

-static void pxa2xx_draw_line8(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t *palette = opaque;

- uint32_t data;

- while (width > 0) {

- data = *(uint32_t *) src;

-#define FN(x) COPY_PIXEL(dest, palette[(data >> (x)) & 0xff]);

-#ifdef SWAP_WORDS

- FN(24)

- FN(16)

- FN(8)

- FN(0)

-#else

- FN(0)

- FN(8)

- FN(16)

- FN(24)

-#endif

-#undef FN

- width -= 4;

- src += 4;

- }

-}

-

-static void pxa2xx_draw_line16(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t data;

- unsigned int r, g, b;

- while (width > 0) {

- data = *(uint32_t *) src;

-#ifdef SWAP_WORDS

- data = bswap32(data);

-#endif

- b = (data & 0x1f) << 3;

- data >>= 5;

- g = (data & 0x3f) << 2;

- data >>= 6;

- r = (data & 0x1f) << 3;

- data >>= 5;

- COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));

- b = (data & 0x1f) << 3;

- data >>= 5;

- g = (data & 0x3f) << 2;

- data >>= 6;

- r = (data & 0x1f) << 3;

- COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));

- width -= 2;

- src += 4;

- }

-}

-

-static void pxa2xx_draw_line16t(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t data;

- unsigned int r, g, b;

- while (width > 0) {

- data = *(uint32_t *) src;

-#ifdef SWAP_WORDS

- data = bswap32(data);

-#endif

- b = (data & 0x1f) << 3;

- data >>= 5;

- g = (data & 0x1f) << 3;

- data >>= 5;

- r = (data & 0x1f) << 3;

- data >>= 5;

- if (data & 1) {

- SKIP_PIXEL(dest);

- } else {

- COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));

- }

- data >>= 1;

- b = (data & 0x1f) << 3;

- data >>= 5;

- g = (data & 0x1f) << 3;

- data >>= 5;

- r = (data & 0x1f) << 3;

- data >>= 5;

- if (data & 1) {

- SKIP_PIXEL(dest);

- } else {

- COPY_PIXEL(dest, rgb_to_pixel32(r, g, b));

- }

- width -= 2;

- src += 4;

- }

-}

-

-static void pxa2xx_draw_line18(void *opaque, uint8_t *dest, const uint8_t *src,

- int width, int deststep)

-{

- uint32_t data;

- unsigned int r, g, b;

- while (width > 0) {

- data = *(uint32_t *) src;