The following changes since commit 5a67d7735d4162630769ef495cf813244fc850df:

Merge remote-tracking branch 'remotes/berrange-gitlab/tags/tls-deps-pull-request' into staging (2021-07-02 08:22:39 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 04ea4d3cfd0a21b248ece8eb7a9436a3d9898dd8:

target/arm: Implement MVE shifts by register (2021-07-02 11:48:38 +0100)

* more MVE instructions

* hw/gpio/gpio_pwr: use shutdown function for reboot

* target/arm: Check NaN mode before silencing NaN

* tests: Boot and halt a Linux guest on the Raspberry Pi 2 machine

* hw/arm: Add basic power management to raspi.

* docs/system/arm: Add quanta-gbs-bmc, quanta-q7l1-bmc

Joe Komlodi (1):

target/arm: Check NaN mode before silencing NaN

Maxim Uvarov (1):

hw/gpio/gpio_pwr: use shutdown function for reboot

Nolan Leake (1):

hw/arm: Add basic power management to raspi.

Patrick Venture (2):

docs/system/arm: Add quanta-q7l1-bmc reference

docs/system/arm: Add quanta-gbs-bmc reference

Peter Maydell (18):

target/arm: Fix MVE widening/narrowing VLDR/VSTR offset calculation

target/arm: Fix bugs in MVE VRMLALDAVH, VRMLSLDAVH

target/arm: Make asimd_imm_const() public

target/arm: Use asimd_imm_const for A64 decode

target/arm: Use dup_const() instead of bitfield_replicate()

target/arm: Implement MVE logical immediate insns

target/arm: Implement MVE vector shift left by immediate insns

target/arm: Implement MVE vector shift right by immediate insns

target/arm: Implement MVE VSHLL

target/arm: Implement MVE VSRI, VSLI

target/arm: Implement MVE VSHRN, VRSHRN

target/arm: Implement MVE saturating narrowing shifts

target/arm: Implement MVE VSHLC

target/arm: Implement MVE VADDLV

target/arm: Implement MVE long shifts by immediate

target/arm: Implement MVE long shifts by register

target/arm: Implement MVE shifts by immediate

target/arm: Implement MVE shifts by register

From: Patrick Venture <venture@google.com>

Adds a line-item reference to the supported quanta-q71l-bmc aspeed

entry.

Signed-off-by: Patrick Venture <venture@google.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Message-id: 20210615192848.1065297-2-venture@google.com

docs/system/arm/aspeed.rst | 1 +

1 file changed, 1 insertion(+)

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

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

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

@@ -XXX,XX +XXX,XX @@ etc.

AST2400 SoC based machines :

- ``palmetto-bmc`` OpenPOWER Palmetto POWER8 BMC

+- ``quanta-q71l-bmc`` OpenBMC Quanta BMC

AST2500 SoC based machines :

2.20.1

From: Patrick Venture <venture@google.com>

Add line item reference to quanta-gbs-bmc machine.

Signed-off-by: Patrick Venture <venture@google.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Message-id: 20210615192848.1065297-3-venture@google.com

[PMM: fixed underline Sphinx warning]

docs/system/arm/nuvoton.rst | 5 +++--

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

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

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

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

-Nuvoton iBMC boards (``npcm750-evb``, ``quanta-gsj``)

-=====================================================

+Nuvoton iBMC boards (``*-bmc``, ``npcm750-evb``, ``quanta-gsj``)

+================================================================

The `Nuvoton iBMC`_ chips (NPCM7xx) are a family of ARM-based SoCs that are

designed to be used as Baseboard Management Controllers (BMCs) in various

@@ -XXX,XX +XXX,XX @@ segment. The following machines are based on this chip :

The NPCM730 SoC has two Cortex-A9 cores and is targeted for Data Center and

Hyperscale applications. The following machines are based on this chip :

+- ``quanta-gbs-bmc`` Quanta GBS server BMC

- ``quanta-gsj`` Quanta GSJ server BMC

There are also two more SoCs, NPCM710 and NPCM705, which are single-core

2.20.1

From: Nolan Leake <nolan@sigbus.net>

This is just enough to make reboot and poweroff work. Works for

linux, u-boot, and the arm trusted firmware. Not tested, but should

work for plan9, and bare-metal/hobby OSes, since they seem to generally

do what linux does for reset.

The watchdog timer functionality is not yet implemented.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/64

Signed-off-by: Nolan Leake <nolan@sigbus.net>

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

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

Message-id: 20210625210209.1870217-1-nolan@sigbus.net

[PMM: tweaked commit title; fixed region size to 0x200;

moved header file to include/]

include/hw/arm/bcm2835_peripherals.h | 3 +-

include/hw/misc/bcm2835_powermgt.h | 29 +++++

hw/arm/bcm2835_peripherals.c | 13 ++-

hw/misc/bcm2835_powermgt.c | 160 +++++++++++++++++++++++++++

hw/misc/meson.build | 1 +

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

create mode 100644 include/hw/misc/bcm2835_powermgt.h

create mode 100644 hw/misc/bcm2835_powermgt.c

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

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

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

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

#include "hw/misc/bcm2835_mphi.h"

#include "hw/misc/bcm2835_thermal.h"

#include "hw/misc/bcm2835_cprman.h"

+#include "hw/misc/bcm2835_powermgt.h"

#include "hw/sd/sdhci.h"

#include "hw/sd/bcm2835_sdhost.h"

#include "hw/gpio/bcm2835_gpio.h"

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

BCM2835MphiState mphi;

UnimplementedDeviceState txp;

UnimplementedDeviceState armtmr;

- UnimplementedDeviceState powermgt;

+ BCM2835PowerMgtState powermgt;

BCM2835CprmanState cprman;

PL011State uart0;

BCM2835AuxState aux;

diff --git a/include/hw/misc/bcm2835_powermgt.h b/include/hw/misc/bcm2835_powermgt.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/include/hw/misc/bcm2835_powermgt.h

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

+/*

+ * BCM2835 Power Management emulation

+ *

+ * Copyright (C) 2017 Marcin Chojnacki <marcinch7@gmail.com>

+ * Copyright (C) 2021 Nolan Leake <nolan@sigbus.net>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ */

+

+#ifndef BCM2835_POWERMGT_H

+#define BCM2835_POWERMGT_H

+

+#include "hw/sysbus.h"

+#include "qom/object.h"

+

+#define TYPE_BCM2835_POWERMGT "bcm2835-powermgt"

+OBJECT_DECLARE_SIMPLE_TYPE(BCM2835PowerMgtState, BCM2835_POWERMGT)

+

+struct BCM2835PowerMgtState {

+ SysBusDevice busdev;

+ MemoryRegion iomem;

+

+ uint32_t rstc;

+ uint32_t rsts;

+ uint32_t wdog;

+};

+

+#endif

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/bcm2835_peripherals.c

+++ b/hw/arm/bcm2835_peripherals.c

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

object_property_add_const_link(OBJECT(&s->dwc2), "dma-mr",

OBJECT(&s->gpu_bus_mr));

+

+ /* Power Management */

+ object_initialize_child(obj, "powermgt", &s->powermgt,

+ TYPE_BCM2835_POWERMGT);

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

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

qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

INTERRUPT_USB));

+ /* Power Management */

+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->powermgt), errp)) {

+ memory_region_add_subregion(&s->peri_mr, PM_OFFSET,

+ sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->powermgt), 0));

+

create_unimp(s, &s->txp, "bcm2835-txp", TXP_OFFSET, 0x1000);

create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET, 0x40);

- create_unimp(s, &s->powermgt, "bcm2835-powermgt", PM_OFFSET, 0x114);

create_unimp(s, &s->i2s, "bcm2835-i2s", I2S_OFFSET, 0x100);

create_unimp(s, &s->smi, "bcm2835-smi", SMI_OFFSET, 0x100);

create_unimp(s, &s->spi[0], "bcm2835-spi0", SPI0_OFFSET, 0x20);

diff --git a/hw/misc/bcm2835_powermgt.c b/hw/misc/bcm2835_powermgt.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/hw/misc/bcm2835_powermgt.c

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

+/*

+ * BCM2835 Power Management emulation

+ *

+ * Copyright (C) 2017 Marcin Chojnacki <marcinch7@gmail.com>

+ * Copyright (C) 2021 Nolan Leake <nolan@sigbus.net>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ */

+

+#include "qemu/osdep.h"

+#include "qemu/log.h"

+#include "qemu/module.h"

+#include "hw/misc/bcm2835_powermgt.h"

+#include "migration/vmstate.h"

+#include "sysemu/runstate.h"

+

+#define PASSWORD 0x5a000000

+#define PASSWORD_MASK 0xff000000

+

+#define R_RSTC 0x1c

+#define V_RSTC_RESET 0x20

+#define R_RSTS 0x20

+#define V_RSTS_POWEROFF 0x555 /* Linux uses partition 63 to indicate halt. */

+#define R_WDOG 0x24

+

+static uint64_t bcm2835_powermgt_read(void *opaque, hwaddr offset,

+ unsigned size)

+{

+ BCM2835PowerMgtState *s = (BCM2835PowerMgtState *)opaque;

+ uint32_t res = 0;

+

+ switch (offset) {

+ case R_RSTC:

+ res = s->rstc;

+ break;

+ case R_RSTS:

+ res = s->rsts;

+ break;

+ case R_WDOG:

+ res = s->wdog;

+ break;

+

+ default:

+ qemu_log_mask(LOG_UNIMP,

+ "bcm2835_powermgt_read: Unknown offset 0x%08"HWADDR_PRIx

+ "\n", offset);

+ res = 0;

+ break;

+ }

+

+ return res;

+}

+

+static void bcm2835_powermgt_write(void *opaque, hwaddr offset,

+ uint64_t value, unsigned size)

+{

+ BCM2835PowerMgtState *s = (BCM2835PowerMgtState *)opaque;

+

+ if ((value & PASSWORD_MASK) != PASSWORD) {

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "bcm2835_powermgt_write: Bad password 0x%"PRIx64

+ " at offset 0x%08"HWADDR_PRIx"\n",

+ value, offset);

+ value = value & ~PASSWORD_MASK;

+

+ switch (offset) {

+ case R_RSTC:

+ s->rstc = value;

+ if (value & V_RSTC_RESET) {

+ if ((s->rsts & 0xfff) == V_RSTS_POWEROFF) {

+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

+ } else {

+ qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

+ }

+ }

+ break;

+ case R_RSTS:

+ qemu_log_mask(LOG_UNIMP,

+ "bcm2835_powermgt_write: RSTS\n");

+ s->rsts = value;

+ break;

+ case R_WDOG:

+ qemu_log_mask(LOG_UNIMP,

+ "bcm2835_powermgt_write: WDOG\n");

+ s->wdog = value;

+ break;

+

+ default:

+ qemu_log_mask(LOG_UNIMP,

+ "bcm2835_powermgt_write: Unknown offset 0x%08"HWADDR_PRIx

+ "\n", offset);

+ break;

+ }

+}

+

+static const MemoryRegionOps bcm2835_powermgt_ops = {

+ .read = bcm2835_powermgt_read,

+ .write = bcm2835_powermgt_write,

+ .endianness = DEVICE_NATIVE_ENDIAN,

+ .impl.min_access_size = 4,

+ .impl.max_access_size = 4,

+};

+

+static const VMStateDescription vmstate_bcm2835_powermgt = {

+ .name = TYPE_BCM2835_POWERMGT,

+ .version_id = 1,

+ .minimum_version_id = 1,

+ .fields = (VMStateField[]) {

+ VMSTATE_UINT32(rstc, BCM2835PowerMgtState),

+ VMSTATE_UINT32(rsts, BCM2835PowerMgtState),

+ VMSTATE_UINT32(wdog, BCM2835PowerMgtState),

+ VMSTATE_END_OF_LIST()

+ }

+};

+

+static void bcm2835_powermgt_init(Object *obj)

+{

+ BCM2835PowerMgtState *s = BCM2835_POWERMGT(obj);

+

+ memory_region_init_io(&s->iomem, obj, &bcm2835_powermgt_ops, s,

+ TYPE_BCM2835_POWERMGT, 0x200);

+ sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);

+}

+

+static void bcm2835_powermgt_reset(DeviceState *dev)

+{

+ BCM2835PowerMgtState *s = BCM2835_POWERMGT(dev);

+

+ /* https://elinux.org/BCM2835_registers#PM */

+ s->rstc = 0x00000102;

+ s->rsts = 0x00001000;

+ s->wdog = 0x00000000;

+}

+

+static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data)

+{

+ DeviceClass *dc = DEVICE_CLASS(klass);

+

+ dc->reset = bcm2835_powermgt_reset;

+ dc->vmsd = &vmstate_bcm2835_powermgt;

+}

+

+static TypeInfo bcm2835_powermgt_info = {

+ .name = TYPE_BCM2835_POWERMGT,

+ .parent = TYPE_SYS_BUS_DEVICE,

+ .instance_size = sizeof(BCM2835PowerMgtState),

+ .class_init = bcm2835_powermgt_class_init,

+ .instance_init = bcm2835_powermgt_init,

+};

+

+static void bcm2835_powermgt_register_types(void)

+{

+ type_register_static(&bcm2835_powermgt_info);

+}

+

+type_init(bcm2835_powermgt_register_types)

diff --git a/hw/misc/meson.build b/hw/misc/meson.build

index XXXXXXX..XXXXXXX 100644

--- a/hw/misc/meson.build

+++ b/hw/misc/meson.build

@@ -XXX,XX +XXX,XX @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(

'bcm2835_rng.c',

'bcm2835_thermal.c',

'bcm2835_cprman.c',

+ 'bcm2835_powermgt.c',

))

softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))

softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-xadc.c'))

2.20.1

Add a test booting and quickly shutdown a raspi2 machine,

to test the power management model:

(1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:

console: [ 0.000000] Booting Linux on physical CPU 0xf00

console: [ 0.000000] Linux version 4.14.98-v7+ (dom@dom-XPS-13-9370) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 SMP Tue Feb 12 20:27:48 GMT 2019

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

console: [ 0.000000] CPU: div instructions available: patching division code

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

console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi 2 Model B

...

console: Boot successful.

console: cat /proc/cpuinfo

console: / # cat /proc/cpuinfo

...

console: processor : 3

console: model name : ARMv7 Processor rev 5 (v7l)

console: BogoMIPS : 125.00

console: Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm

console: CPU implementer : 0x41

console: CPU architecture: 7

console: CPU variant : 0x0

console: CPU part : 0xc07

console: CPU revision : 5

console: Hardware : BCM2835

console: Revision : 0000

console: Serial : 0000000000000000

console: cat /proc/iomem

console: / # cat /proc/iomem

console: 00000000-3bffffff : System RAM

console: 00008000-00afffff : Kernel code

console: 00c00000-00d468ef : Kernel data

console: 3f006000-3f006fff : dwc_otg

console: 3f007000-3f007eff : /soc/dma@7e007000

console: 3f00b880-3f00b8bf : /soc/mailbox@7e00b880

console: 3f100000-3f100027 : /soc/watchdog@7e100000

console: 3f101000-3f102fff : /soc/cprman@7e101000

console: 3f200000-3f2000b3 : /soc/gpio@7e200000

PASS (24.59 s)

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

JOB TIME : 25.02 s

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

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

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

1 file changed, 43 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 import skip

from avocado import skipUnless

from avocado_qemu import Test

+from avocado_qemu import exec_command

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

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

"""

self.do_test_arm_raspi2(0)

+ def test_arm_raspi2_initrd(self):

+ """

+ :avocado: tags=arch:arm

+ :avocado: tags=machine:raspi2

+ """

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

+ 'pool/main/r/raspberrypi-firmware/'

+ 'raspberrypi-kernel_1.20190215-1_armhf.deb')

+ deb_hash = 'cd284220b32128c5084037553db3c482426f3972'

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

+ kernel_path = self.extract_from_deb(deb_path, '/boot/kernel7.img')

+ dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2709-rpi-2-b.dtb')

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

+ '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'

+ 'arm/rootfs-armv7a.cpio.gz')

+ initrd_hash = '604b2e45cdf35045846b8bbfbf2129b1891bdc9c'

+ initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)

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

+ archive.gzip_uncompress(initrd_path_gz, initrd_path)

+ self.vm.set_console()

+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

+ 'earlycon=pl011,0x3f201000 console=ttyAMA0 '

+ 'panic=-1 noreboot ' +

+ 'dwc_otg.fiq_fsm_enable=0')

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

+ '-dtb', dtb_path,

+ '-initrd', initrd_path,

+ '-append', kernel_command_line,

+ '-no-reboot')

+ self.vm.launch()

+ self.wait_for_console_pattern('Boot successful.')

+

+ exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',

+ 'BCM2835')

+ exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',

+ '/soc/cprman@7e101000')

+ exec_command(self, 'halt')

+ # Wait for VM to shut down gracefully

+ self.vm.wait()

+

def test_arm_exynos4210_initrd(self):

"""

:avocado: tags=arch:arm

2.20.1

From: Joe Komlodi <joe.komlodi@xilinx.com>

If the CPU is running in default NaN mode (FPCR.DN == 1) and we execute

FRSQRTE, FRECPE, or FRECPX with a signaling NaN, parts_silence_nan_frac() will

assert due to fpst->default_nan_mode being set.

To avoid this, we check to see what NaN mode we're running in before we call

floatxx_silence_nan().

Signed-off-by: Joe Komlodi <joe.komlodi@xilinx.com>

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

Message-id: 1624662174-175828-2-git-send-email-joe.komlodi@xilinx.com

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

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

target/arm/vfp_helper.c | 24 ++++++++++++++++++------

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

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

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

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

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(frecpx_f16)(uint32_t a, void *fpstp)

float16 nan = a;

if (float16_is_signaling_nan(a, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float16_silence_nan(a, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float16_silence_nan(a, fpst);

+ }

}

if (fpst->default_nan_mode) {

nan = float16_default_nan(fpst);

@@ -XXX,XX +XXX,XX @@ float32 HELPER(frecpx_f32)(float32 a, void *fpstp)

float32 nan = a;

if (float32_is_signaling_nan(a, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float32_silence_nan(a, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float32_silence_nan(a, fpst);

+ }

}

if (fpst->default_nan_mode) {

nan = float32_default_nan(fpst);

@@ -XXX,XX +XXX,XX @@ float64 HELPER(frecpx_f64)(float64 a, void *fpstp)

float64 nan = a;

if (float64_is_signaling_nan(a, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float64_silence_nan(a, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float64_silence_nan(a, fpst);

+ }

}

if (fpst->default_nan_mode) {

nan = float64_default_nan(fpst);

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

--- a/target/arm/vfp_helper.c

+++ b/target/arm/vfp_helper.c

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(recpe_f16)(uint32_t input, void *fpstp)

float16 nan = f16;

if (float16_is_signaling_nan(f16, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float16_silence_nan(f16, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float16_silence_nan(f16, fpst);

+ }

if (fpst->default_nan_mode) {

nan = float16_default_nan(fpst);

@@ -XXX,XX +XXX,XX @@ float32 HELPER(recpe_f32)(float32 input, void *fpstp)

float32 nan = f32;

if (float32_is_signaling_nan(f32, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float32_silence_nan(f32, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float32_silence_nan(f32, fpst);

+ }

}

if (fpst->default_nan_mode) {

nan = float32_default_nan(fpst);

@@ -XXX,XX +XXX,XX @@ float64 HELPER(recpe_f64)(float64 input, void *fpstp)

float64 nan = f64;

if (float64_is_signaling_nan(f64, fpst)) {

float_raise(float_flag_invalid, fpst);

- nan = float64_silence_nan(f64, fpst);

+ if (!fpst->default_nan_mode) {

+ nan = float64_silence_nan(f64, fpst);

+ }

}

if (fpst->default_nan_mode) {

nan = float64_default_nan(fpst);

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(rsqrte_f16)(uint32_t input, void *fpstp)

float16 nan = f16;

if (float16_is_signaling_nan(f16, s)) {

float_raise(float_flag_invalid, s);

- nan = float16_silence_nan(f16, s);

+ if (!s->default_nan_mode) {

+ nan = float16_silence_nan(f16, fpstp);

+ }

}

if (s->default_nan_mode) {

nan = float16_default_nan(s);

@@ -XXX,XX +XXX,XX @@ float32 HELPER(rsqrte_f32)(float32 input, void *fpstp)

float32 nan = f32;

if (float32_is_signaling_nan(f32, s)) {

float_raise(float_flag_invalid, s);

- nan = float32_silence_nan(f32, s);

+ if (!s->default_nan_mode) {

+ nan = float32_silence_nan(f32, fpstp);

+ }

}

if (s->default_nan_mode) {

nan = float32_default_nan(s);

@@ -XXX,XX +XXX,XX @@ float64 HELPER(rsqrte_f64)(float64 input, void *fpstp)

float64 nan = f64;

if (float64_is_signaling_nan(f64, s)) {

float_raise(float_flag_invalid, s);

- nan = float64_silence_nan(f64, s);

+ if (!s->default_nan_mode) {

+ nan = float64_silence_nan(f64, fpstp);

+ }

}

if (s->default_nan_mode) {

nan = float64_default_nan(s);

2.20.1

From: Maxim Uvarov <maxim.uvarov@linaro.org>

qemu has 2 type of functions: shutdown and reboot. Shutdown

function has to be used for machine shutdown. Otherwise we cause

a reset with a bogus "cause" value, when we intended a shutdown.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

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

Message-id: 20210625111842.3790-3-maxim.uvarov@linaro.org

[PMM: tweaked commit message]

hw/gpio/gpio_pwr.c | 2 +-

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

diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c

--- a/hw/gpio/gpio_pwr.c

+++ b/hw/gpio/gpio_pwr.c

@@ -XXX,XX +XXX,XX @@ static void gpio_pwr_reset(void *opaque, int n, int level)

static void gpio_pwr_shutdown(void *opaque, int n, int level)

{

if (level) {

- qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

}

}

2.20.1

In do_ldst(), the calculation of the offset needs to be based on the

size of the memory access, not the size of the elements in the

vector. This meant we were getting it wrong for the widening and

narrowing variants of the various VLDR and VSTR insns.

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

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

target/arm/translate-mve.c | 17 +++++++++--------

1 file changed, 9 insertions(+), 8 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ static bool mve_skip_first_beat(DisasContext *s)

}

-static bool do_ldst(DisasContext *s, arg_VLDR_VSTR *a, MVEGenLdStFn *fn)

+static bool do_ldst(DisasContext *s, arg_VLDR_VSTR *a, MVEGenLdStFn *fn,

+ unsigned msize)

{

TCGv_i32 addr;

uint32_t offset;

@@ -XXX,XX +XXX,XX @@ static bool do_ldst(DisasContext *s, arg_VLDR_VSTR *a, MVEGenLdStFn *fn)

return true;

- offset = a->imm << a->size;

+ offset = a->imm << msize;

if (!a->a) {

offset = -offset;

}

@@ -XXX,XX +XXX,XX @@ static bool trans_VLDR_VSTR(DisasContext *s, arg_VLDR_VSTR *a)

{ gen_helper_mve_vstrw, gen_helper_mve_vldrw },

{ NULL, NULL }

};

- return do_ldst(s, a, ldstfns[a->size][a->l]);

+ return do_ldst(s, a, ldstfns[a->size][a->l], a->size);

-#define DO_VLDST_WIDE_NARROW(OP, SLD, ULD, ST) \

+#define DO_VLDST_WIDE_NARROW(OP, SLD, ULD, ST, MSIZE) \

static bool trans_##OP(DisasContext *s, arg_VLDR_VSTR *a) \

{ \

static MVEGenLdStFn * const ldstfns[2][2] = { \

{ gen_helper_mve_##ST, gen_helper_mve_##SLD }, \

{ NULL, gen_helper_mve_##ULD }, \

}; \

- return do_ldst(s, a, ldstfns[a->u][a->l]); \

+ return do_ldst(s, a, ldstfns[a->u][a->l], MSIZE); \

}

-DO_VLDST_WIDE_NARROW(VLDSTB_H, vldrb_sh, vldrb_uh, vstrb_h)

-DO_VLDST_WIDE_NARROW(VLDSTB_W, vldrb_sw, vldrb_uw, vstrb_w)

-DO_VLDST_WIDE_NARROW(VLDSTH_W, vldrh_sw, vldrh_uw, vstrh_w)

+DO_VLDST_WIDE_NARROW(VLDSTB_H, vldrb_sh, vldrb_uh, vstrb_h, MO_8)

+DO_VLDST_WIDE_NARROW(VLDSTB_W, vldrb_sw, vldrb_uw, vstrb_w, MO_8)

+DO_VLDST_WIDE_NARROW(VLDSTH_W, vldrh_sw, vldrh_uw, vstrh_w, MO_16)

static bool trans_VDUP(DisasContext *s, arg_VDUP *a)

{

2.20.1

The initial implementation of the MVE VRMLALDAVH and VRMLSLDAVH

insns had some bugs:

* the 32x32 multiply of elements was being done as 32x32->32,

not 32x32->64

* we were incorrectly maintaining the accumulator in its full

72-bit form across all 4 beats of the insn; in the pseudocode

it is squashed back into the 64 bits of the RdaHi:RdaLo

registers after each beat

In particular, fixing the second of these allows us to recast

the implementation to avoid 128-bit arithmetic entirely.

Since the element size here is always 4, we can also drop the

parameterization of ESIZE to make the code a little more readable.

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

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

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

target/arm/mve_helper.c | 38 +++++++++++++++++++++-----------------

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

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

--- a/target/arm/mve_helper.c

+++ b/target/arm/mve_helper.c

-#include "qemu/int128.h"

#include "cpu.h"

#include "internals.h"

#include "vec_internal.h"

@@ -XXX,XX +XXX,XX @@ DO_LDAV(vmlsldavsw, 4, int32_t, false, +=, -=)

DO_LDAV(vmlsldavxsw, 4, int32_t, true, +=, -=)

/*

- * Rounding multiply add long dual accumulate high: we must keep

- * a 72-bit internal accumulator value and return the top 64 bits.

+ * Rounding multiply add long dual accumulate high. In the pseudocode

+ * this is implemented with a 72-bit internal accumulator value of which

+ * the top 64 bits are returned. We optimize this to avoid having to

+ * use 128-bit arithmetic -- we can do this because the 74-bit accumulator

+ * is squashed back into 64-bits after each beat.

*/

-#define DO_LDAVH(OP, ESIZE, TYPE, XCHG, EVENACC, ODDACC, TO128) \

+#define DO_LDAVH(OP, TYPE, LTYPE, XCHG, SUB) \

uint64_t HELPER(glue(mve_, OP))(CPUARMState *env, void *vn, \

void *vm, uint64_t a) \

{ \

uint16_t mask = mve_element_mask(env); \

unsigned e; \

TYPE *n = vn, *m = vm; \

- Int128 acc = int128_lshift(TO128(a), 8); \

- for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \

+ for (e = 0; e < 16 / 4; e++, mask >>= 4) { \

if (mask & 1) { \

+ LTYPE mul; \

if (e & 1) { \

- acc = ODDACC(acc, TO128(n[H##ESIZE(e - 1 * XCHG)] * \

- m[H##ESIZE(e)])); \

+ mul = (LTYPE)n[H4(e - 1 * XCHG)] * m[H4(e)]; \

+ if (SUB) { \

+ mul = -mul; \

+ } \

} else { \

- acc = EVENACC(acc, TO128(n[H##ESIZE(e + 1 * XCHG)] * \

- m[H##ESIZE(e)])); \

+ mul = (LTYPE)n[H4(e + 1 * XCHG)] * m[H4(e)]; \

} \

- acc = int128_add(acc, int128_make64(1 << 7)); \

+ mul = (mul >> 8) + ((mul >> 7) & 1); \

+ a += mul; \

} \

} \

mve_advance_vpt(env); \

- return int128_getlo(int128_rshift(acc, 8)); \

+ return a; \

-DO_LDAVH(vrmlaldavhsw, 4, int32_t, false, int128_add, int128_add, int128_makes64)

-DO_LDAVH(vrmlaldavhxsw, 4, int32_t, true, int128_add, int128_add, int128_makes64)

+DO_LDAVH(vrmlaldavhsw, int32_t, int64_t, false, false)

+DO_LDAVH(vrmlaldavhxsw, int32_t, int64_t, true, false)

-DO_LDAVH(vrmlaldavhuw, 4, uint32_t, false, int128_add, int128_add, int128_make64)

+DO_LDAVH(vrmlaldavhuw, uint32_t, uint64_t, false, false)

-DO_LDAVH(vrmlsldavhsw, 4, int32_t, false, int128_add, int128_sub, int128_makes64)

-DO_LDAVH(vrmlsldavhxsw, 4, int32_t, true, int128_add, int128_sub, int128_makes64)

+DO_LDAVH(vrmlsldavhsw, int32_t, int64_t, false, true)

+DO_LDAVH(vrmlsldavhxsw, int32_t, int64_t, true, true)

/* Vector add across vector */

#define DO_VADDV(OP, ESIZE, TYPE) \

2.20.1

The function asimd_imm_const() in translate-neon.c is an

implementation of the pseudocode AdvSIMDExpandImm(), which we will

also want for MVE. Move the implementation to translate.c, with a

prototype in translate.h.

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

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

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

---

target/arm/translate.h | 16 ++++++++++

target/arm/translate-neon.c | 63 -------------------------------------

target/arm/translate.c | 57 +++++++++++++++++++++++++++++++++

3 files changed, 73 insertions(+), 63 deletions(-)

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

--- a/target/arm/translate.h

+++ b/target/arm/translate.h

@@ -XXX,XX +XXX,XX @@ static inline MemOp finalize_memop(DisasContext *s, MemOp opc)

return opc | s->be_data;

+/**

+ * asimd_imm_const: Expand an encoded SIMD constant value

+ *

+ * Expand a SIMD constant value. This is essentially the pseudocode

+ * AdvSIMDExpandImm, except that we also perform the boolean NOT needed for

+ * VMVN and VBIC (when cmode < 14 && op == 1).

+ *

+ * The combination cmode == 15 op == 1 is a reserved encoding for AArch32;

+ * callers must catch this.

+ *

+ * cmode = 2,3,4,5,6,7,10,11,12,13 imm=0 was UNPREDICTABLE in v7A but

+ * is either not unpredictable or merely CONSTRAINED UNPREDICTABLE in v8A;

+ * we produce an immediate constant value of 0 in these cases.

+ */

+uint64_t asimd_imm_const(uint32_t imm, int cmode, int op);

+

#endif /* TARGET_ARM_TRANSLATE_H */

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ DO_FP_2SH(VCVT_UH, gen_helper_gvec_vcvt_uh)

DO_FP_2SH(VCVT_HS, gen_helper_gvec_vcvt_hs)

DO_FP_2SH(VCVT_HU, gen_helper_gvec_vcvt_hu)

-static uint64_t asimd_imm_const(uint32_t imm, int cmode, int op)

-{

- /*

- * Expand the encoded constant.

- * Note that cmode = 2,3,4,5,6,7,10,11,12,13 imm=0 is UNPREDICTABLE.

- * We choose to not special-case this and will behave as if a

- * valid constant encoding of 0 had been given.

- * cmode = 15 op = 1 must UNDEF; we assume decode has handled that.

- */

- switch (cmode) {

- case 0: case 1:

- /* no-op */

- break;

- case 2: case 3:

- imm <<= 8;

- break;

- case 4: case 5:

- imm <<= 16;

- break;

- case 6: case 7:

- imm <<= 24;

- break;

- case 8: case 9:

- imm |= imm << 16;

- break;

- case 10: case 11:

- imm = (imm << 8) | (imm << 24);

- break;

- case 12:

- imm = (imm << 8) | 0xff;

- break;

- case 13:

- imm = (imm << 16) | 0xffff;

- break;

- case 14:

- if (op) {

- /*

- * This is the only case where the top and bottom 32 bits

- * of the encoded constant differ.

- */

- uint64_t imm64 = 0;

- int n;

-

- for (n = 0; n < 8; n++) {

- if (imm & (1 << n)) {

- imm64 |= (0xffULL << (n * 8));

- }

- }

- return imm64;

- }

- imm |= (imm << 8) | (imm << 16) | (imm << 24);

- break;

- case 15:

- imm = ((imm & 0x80) << 24) | ((imm & 0x3f) << 19)

- | ((imm & 0x40) ? (0x1f << 25) : (1 << 30));

- break;

- }

- if (op) {

- imm = ~imm;

- }

- return dup_const(MO_32, imm);

-}

-

static bool do_1reg_imm(DisasContext *s, arg_1reg_imm *a,

GVecGen2iFn *fn)

{

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

index XXXXXXX..XXXXXXX 100644