The following changes since commit 3214bec13d8d4c40f707d21d8350d04e4123ae97:

Merge tag 'migration-20250110-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-01-10 13:39:19 -0500)

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

for you to fetch changes up to 435d260e7ec5ff9c79e3e62f1d66ec82d2d691ae:

docs/system/arm/virt: mention specific migration information (2025-01-13 12:35:35 +0000)

* hw/arm_sysctl: fix extracting 31th bit of val

* hw/misc: cast rpm to uint64_t

* tests/qtest/boot-serial-test: Improve ASM

* target/arm: Move minor arithmetic helpers out of helper.c

* target/arm: change default pauth algorithm to impdef

Anastasia Belova (1):

hw/arm_sysctl: fix extracting 31th bit of val

Peter Maydell (2):

target/arm: Move minor arithmetic helpers out of helper.c

tests/tcg/aarch64: force qarma5 for pauth-3 test

From: Anastasia Belova <abelova@astralinux.ru>

1 << 31 is casted to uint64_t while bitwise and with val.

So this value may become 0xffffffff80000000 but only

31th "start" bit is required.

hw/misc/arm_sysctl.c | 2 +-

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

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

--- a/hw/misc/arm_sysctl.c

+++ b/hw/misc/arm_sysctl.c

@@ -XXX,XX +XXX,XX @@ static void arm_sysctl_write(void *opaque, hwaddr offset,

* as zero.

*/

s->sys_cfgctrl = val & ~((3 << 18) | (1 << 31));

- if (val & (1 << 31)) {

+ if (extract64(val, 31, 1)) {

/* Start bit set -- actually do something */

unsigned int dcc = extract32(s->sys_cfgctrl, 26, 4);

unsigned int function = extract32(s->sys_cfgctrl, 20, 6);

2.34.1

From: Tigran Sogomonian <tsogomonian@astralinux.ru>

The value of an arithmetic expression

'rpm * NPCM7XX_MFT_PULSE_PER_REVOLUTION' is a subject

to overflow because its operands are not cast to

a larger data type before performing arithmetic. Thus, need

to cast rpm to uint64_t.

hw/misc/npcm7xx_mft.c | 5 +++--

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

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

--- a/hw/misc/npcm7xx_mft.c

+++ b/hw/misc/npcm7xx_mft.c

@@ -XXX,XX +XXX,XX @@ static NPCM7xxMFTCaptureState npcm7xx_mft_compute_cnt(

* RPM = revolution/min. The time for one revlution (in ns) is

* MINUTE_TO_NANOSECOND / RPM.

*/

- count = clock_ns_to_ticks(clock, (60 * NANOSECONDS_PER_SECOND) /

- (rpm * NPCM7XX_MFT_PULSE_PER_REVOLUTION));

+ count = clock_ns_to_ticks(clock,

+ (uint64_t)(60 * NANOSECONDS_PER_SECOND) /

+ ((uint64_t)rpm * NPCM7XX_MFT_PULSE_PER_REVOLUTION));

if (count > NPCM7XX_MFT_MAX_CNT) {

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

tests/qtest/boot-serial-test.c | 18 +++++++++---------

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

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c

--- a/tests/qtest/boot-serial-test.c

+++ b/tests/qtest/boot-serial-test.c

@@ -XXX,XX +XXX,XX @@ static const uint8_t kernel_plml605[] = {

};

static const uint8_t bios_raspi2[] = {

- 0x08, 0x30, 0x9f, 0xe5, /* ldr r3,[pc,#8] Get base */

- 0x54, 0x20, 0xa0, 0xe3, /* mov r2,#'T' */

- 0x00, 0x20, 0xc3, 0xe5, /* strb r2,[r3] */

- 0xfb, 0xff, 0xff, 0xea, /* b loop */

- 0x00, 0x10, 0x20, 0x3f, /* 0x3f201000 = UART0 base addr */

+ 0x08, 0x30, 0x9f, 0xe5, /* loop: ldr r3, [pc, #8] Get &UART0 */

+ 0x54, 0x20, 0xa0, 0xe3, /* mov r2, #'T' */

+ 0x00, 0x20, 0xc3, 0xe5, /* strb r2, [r3] *TXDAT = 'T' */

+ 0xfb, 0xff, 0xff, 0xea, /* b -12 (loop) */

+ 0x00, 0x10, 0x20, 0x3f, /* UART0: 0x3f201000 */

};

static const uint8_t kernel_aarch64[] = {

- 0x81, 0x0a, 0x80, 0x52, /* mov w1, #0x54 */

- 0x02, 0x20, 0xa1, 0xd2, /* mov x2, #0x9000000 */

- 0x41, 0x00, 0x00, 0x39, /* strb w1, [x2] */

- 0xfd, 0xff, 0xff, 0x17, /* b -12 (loop) */

+ 0x81, 0x0a, 0x80, 0x52, /* loop: mov w1, #'T' */

+ 0x02, 0x20, 0xa1, 0xd2, /* mov x2, #0x9000000 Load UART0 */

+ 0x41, 0x00, 0x00, 0x39, /* strb w1, [x2] *TXDAT = 'T' */

+ 0xfd, 0xff, 0xff, 0x17, /* b -12 (loop) */

};

static const uint8_t kernel_nrf51[] = {

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Since registers are not modified, we don't need

to refill their values. Directly jump to the previous

store instruction to keep filling the TXDAT register.

The equivalent C code remains:

while (true) {

*UART_DATA = 'T';

}

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

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

Reviewed-by: Fabiano Rosas <farosas@suse.de>

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

---

tests/qtest/boot-serial-test.c | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c

--- a/tests/qtest/boot-serial-test.c

+++ b/tests/qtest/boot-serial-test.c

@@ -XXX,XX +XXX,XX @@ static const uint8_t kernel_plml605[] = {

static const uint8_t bios_raspi2[] = {

- 0x08, 0x30, 0x9f, 0xe5, /* loop: ldr r3, [pc, #8] Get &UART0 */

+ 0x08, 0x30, 0x9f, 0xe5, /* ldr r3, [pc, #8] Get &UART0 */

0x54, 0x20, 0xa0, 0xe3, /* mov r2, #'T' */

- 0x00, 0x20, 0xc3, 0xe5, /* strb r2, [r3] *TXDAT = 'T' */

- 0xfb, 0xff, 0xff, 0xea, /* b -12 (loop) */

+ 0x00, 0x20, 0xc3, 0xe5, /* loop: strb r2, [r3] *TXDAT = 'T' */

+ 0xff, 0xff, 0xff, 0xea, /* b -4 (loop) */

0x00, 0x10, 0x20, 0x3f, /* UART0: 0x3f201000 */

static const uint8_t kernel_aarch64[] = {

- 0x81, 0x0a, 0x80, 0x52, /* loop: mov w1, #'T' */

+ 0x81, 0x0a, 0x80, 0x52, /* mov w1, #'T' */

0x02, 0x20, 0xa1, 0xd2, /* mov x2, #0x9000000 Load UART0 */

- 0x41, 0x00, 0x00, 0x39, /* strb w1, [x2] *TXDAT = 'T' */

- 0xfd, 0xff, 0xff, 0x17, /* b -12 (loop) */

+ 0x41, 0x00, 0x00, 0x39, /* loop: strb w1, [x2] *TXDAT = 'T' */

+ 0xff, 0xff, 0xff, 0x17, /* b -4 (loop) */

static const uint8_t kernel_nrf51[] = {

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

tests/qtest/boot-serial-test.c | 2 +-

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

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c

--- a/tests/qtest/boot-serial-test.c

+++ b/tests/qtest/boot-serial-test.c

@@ -XXX,XX +XXX,XX @@ static const uint8_t bios_raspi2[] = {

};

static const uint8_t kernel_aarch64[] = {

- 0x81, 0x0a, 0x80, 0x52, /* mov w1, #'T' */

0x02, 0x20, 0xa1, 0xd2, /* mov x2, #0x9000000 Load UART0 */

+ 0x81, 0x0a, 0x80, 0x52, /* mov w1, #'T' */

0x41, 0x00, 0x00, 0x39, /* loop: strb w1, [x2] *TXDAT = 'T' */

0xff, 0xff, 0xff, 0x17, /* b -4 (loop) */

};

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

tests/qtest/boot-serial-test.c | 7 ++++++-

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

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c

--- a/tests/qtest/boot-serial-test.c

+++ b/tests/qtest/boot-serial-test.c

@@ -XXX,XX +XXX,XX @@ static const uint8_t kernel_plml605[] = {

2.34.1

helper.c includes some small TCG helper functions used for mostly

arithmetic instructions. These are TCG only and there's no need for

them to be in the large and unwieldy helper.c. Move them out to