Patches for rc1: nothing major, just some minor bugfixes and

code cleanups.

The following changes since commit f7e1914adad8885a5d4c70239ab90d901ed97e9f:

Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20201109' into staging (2020-11-10 09:24:56 +0000)

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

for you to fetch changes up to b6c56c8a9a4064ea783f352f43c5df6231a110fa:

target/arm/translate-neon.c: Handle VTBL UNDEF case before VFP access check (2020-11-10 11:03:48 +0000)

* hw/arm/Kconfig: ARM_V7M depends on PTIMER

* Minor coding style fixes

* docs: add some notes on the sbsa-ref machine

* hw/arm/virt: Remove dependency on Cortex-A15 MPCore peripherals

* target/arm: Fix neon VTBL/VTBX for len > 1

* hw/arm/armsse: Correct expansion MPC interrupt lines

* hw/misc/stm32f2xx_syscfg: Remove extraneous IRQ

* hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup()

* hw/arm/musicpal: Don't connect two qemu_irqs directly to the same input

* hw/arm/musicpal: Only use qdev_get_gpio_in() when necessary

* hw/arm/nseries: Check return value from load_image_targphys()

* tests/qtest/npcm7xx_rng-test: count runs properly

* target/arm/translate-neon.c: Handle VTBL UNDEF case before VFP access check

Alex Bennée (1):

docs: add some notes on the sbsa-ref machine

AlexChen (1):

ssi: Fix bad printf format specifiers

Andrew Jones (1):

hw/arm/Kconfig: ARM_V7M depends on PTIMER

Havard Skinnemoen (1):

tests/qtest/npcm7xx_rng-test: count runs properly

Peter Maydell (2):

hw/arm/nseries: Check return value from load_image_targphys()

target/arm/translate-neon.c: Handle VTBL UNDEF case before VFP access check

Philippe Mathieu-Daudé (6):

hw/arm/virt: Remove dependency on Cortex-A15 MPCore peripherals

hw/arm/armsse: Correct expansion MPC interrupt lines

hw/misc/stm32f2xx_syscfg: Remove extraneous IRQ

hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup()

hw/arm/musicpal: Don't connect two qemu_irqs directly to the same input

hw/arm/musicpal: Only use qdev_get_gpio_in() when necessary

Richard Henderson (1):

target/arm: Fix neon VTBL/VTBX for len > 1

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

When using a Cortex-A15, the Virt machine does not use any

MPCore peripherals. Remove the dependency.

Fixes: 7951c7b7c05 ("hw/arm: Express dependencies of the virt machine with Kconfig")

Reported-by: Miroslav Rezanina <mrezanin@redhat.com>

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

Message-id: 20201107114852.271922-1-philmd@redhat.com

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

hw/arm/Kconfig | 1 -

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig

--- a/hw/arm/Kconfig

+++ b/hw/arm/Kconfig

@@ -XXX,XX +XXX,XX @@ config ARM_VIRT

imply VFIO_PLATFORM

imply VFIO_XGMAC

imply TPM_TIS_SYSBUS

- select A15MPCORE

select ACPI

select ARM_SMMUV3

select GPIO_KEY

2.20.1

From: Havard Skinnemoen <hskinnemoen@google.com>

The number of runs is equal to the number of 0-1 and 1-0 transitions,

plus one. Currently, it's counting the number of times these transitions

do _not_ happen, plus one.

Source:

https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-22r1a.pdf

section 2.3.4 point (3).

Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>

Message-id: 20201103011457.2959989-2-hskinnemoen@google.com

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

tests/qtest/npcm7xx_rng-test.c | 2 +-

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

diff --git a/tests/qtest/npcm7xx_rng-test.c b/tests/qtest/npcm7xx_rng-test.c

--- a/tests/qtest/npcm7xx_rng-test.c

+++ b/tests/qtest/npcm7xx_rng-test.c

@@ -XXX,XX +XXX,XX @@ static double calc_runs_p(const unsigned long *buf, unsigned int nr_bits)

pi = (double)nr_ones / nr_bits;

for (k = 0; k < nr_bits - 1; k++) {

- vn_obs += !(test_bit(k, buf) ^ test_bit(k + 1, buf));

+ vn_obs += (test_bit(k, buf) ^ test_bit(k + 1, buf));

vn_obs += 1;

2.20.1

From: AlexChen <alex.chen@huawei.com>

We should use printf format specifier "%u" instead of "%d" for

argument of type "unsigned int".

Reported-by: Euler Robot <euler.robot@huawei.com>

Signed-off-by: Alex Chen <alex.chen@huawei.com>

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

Message-id: 5FA280F5.8060902@huawei.com

hw/ssi/imx_spi.c | 2 +-

hw/ssi/xilinx_spi.c | 2 +-

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

diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c

--- a/hw/ssi/imx_spi.c

+++ b/hw/ssi/imx_spi.c

@@ -XXX,XX +XXX,XX @@ static const char *imx_spi_reg_name(uint32_t reg)

case ECSPI_MSGDATA:

return "ECSPI_MSGDATA";

default:

- sprintf(unknown, "%d ?", reg);

+ sprintf(unknown, "%u ?", reg);

return unknown;

}

}

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/ssi/xilinx_spi.c

+++ b/hw/ssi/xilinx_spi.c

@@ -XXX,XX +XXX,XX @@ static void xlx_spi_update_irq(XilinxSPI *s)

irq chain unless things really changed. */

if (pending != s->irqline) {

s->irqline = pending;

- DB_PRINT("irq_change of state %d ISR:%x IER:%X\n",

+ DB_PRINT("irq_change of state %u ISR:%x IER:%X\n",

pending, s->regs[R_IPISR], s->regs[R_IPIER]);

qemu_set_irq(s->irq, pending);

}

2.20.1

From: Andrew Jones <drjones@redhat.com>

commit 32bd322a0134 ("hw/timer/armv7m_systick: Rewrite to use ptimers")

changed armv7m_systick to build on ptimers. Make sure we have ptimers

in the build when building armv7m_systick.

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

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

Message-id: 20201104103343.30392-1-drjones@redhat.com

hw/arm/Kconfig | 1 +

1 file changed, 1 insertion(+)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig

--- a/hw/arm/Kconfig

+++ b/hw/arm/Kconfig

@@ -XXX,XX +XXX,XX @@ config ZYNQ

config ARM_V7M

bool

+ select PTIMER

config ALLWINNER_A10

bool

2.20.1

The nseries machines have a codepath that allows them to load a

secondary bootloader. This code wasn't checking that the

load_image_targphys() succeeded. Check the return value and report

the error to the user.

While we're in the vicinity, fix the comment style of the

comment documenting what this image load is doing.

Fixes: Coverity CID 1192904

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

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

Message-id: 20201103114918.11807-1-peter.maydell@linaro.org

---

hw/arm/nseries.c | 15 +++++++++++----

1 file changed, 11 insertions(+), 4 deletions(-)

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

--- a/hw/arm/nseries.c

+++ b/hw/arm/nseries.c

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

/* No, wait, better start at the ROM. */

s->mpu->cpu->env.regs[15] = OMAP2_Q2_BASE + 0x400000;

- /* This is intended for loading the `secondary.bin' program from

+ /*

+ * This is intended for loading the `secondary.bin' program from

* Nokia images (the NOLO bootloader). The entry point seems

* to be at OMAP2_Q2_BASE + 0x400000.

*

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

* for them the entry point needs to be set to OMAP2_SRAM_BASE.

*

* The code above is for loading the `zImage' file from Nokia

- * images. */

- load_image_targphys(option_rom[0].name, OMAP2_Q2_BASE + 0x400000,

- machine->ram_size - 0x400000);

+ * images.

+ */

+ if (load_image_targphys(option_rom[0].name,

+ OMAP2_Q2_BASE + 0x400000,

+ machine->ram_size - 0x400000) < 0) {

+ error_report("Failed to load secondary bootloader %s",

+ option_rom[0].name);

+ exit(EXIT_FAILURE);

+ }

n800_setup_nolo_tags(nolo_tags);

cpu_physical_memory_write(OMAP2_SRAM_BASE, nolo_tags, 0x10000);

2.20.1

From: Xinhao Zhang <zhangxinhao1@huawei.com>

Fix code style. Operator needs spaces both sides.

Signed-off-by: Xinhao Zhang <zhangxinhao1@huawei.com>

Signed-off-by: Kai Deng <dengkai1@huawei.com>

Message-id: 20201103114529.638233-1-zhangxinhao1@huawei.com

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

target/arm/arch_dump.c | 8 ++++----

target/arm/arm-semi.c | 8 ++++----

target/arm/helper.c | 2 +-

3 files changed, 9 insertions(+), 9 deletions(-)

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(usad8)(uint32_t a, uint32_t b)

uint32_t sum;

sum = do_usad(a, b);

sum += do_usad(a >> 8, b >> 8);

- sum += do_usad(a >> 16, b >>16);

+ sum += do_usad(a >> 16, b >> 16);

sum += do_usad(a >> 24, b >> 24);

return sum;

}

2.20.1

From: Xinhao Zhang <zhangxinhao1@huawei.com>

Fix code style. Don't use '#' flag of printf format ('%#') in

format strings, use '0x' prefix instead

Signed-off-by: Xinhao Zhang <zhangxinhao1@huawei.com>

Signed-off-by: Kai Deng <dengkai1@huawei.com>

Message-id: 20201103114529.638233-2-zhangxinhao1@huawei.com

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

target/arm/translate-a64.c | 4 ++--

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

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

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

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

@@ -XXX,XX +XXX,XX @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn)

gen_helper_advsimd_acgt_f16(tcg_res, tcg_op1, tcg_op2, fpst);

break;

default:

- fprintf(stderr, "%s: insn %#04x, fpop %#2x @ %#" PRIx64 "\n",

+ fprintf(stderr, "%s: insn 0x%04x, fpop 0x%2x @ 0x%" PRIx64 "\n",

__func__, insn, fpopcode, s->pc_curr);

g_assert_not_reached();

}

@@ -XXX,XX +XXX,XX @@ static void disas_simd_two_reg_misc_fp16(DisasContext *s, uint32_t insn)

case 0x7f: /* FSQRT (vector) */

2.20.1

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

The system configuration controller (SYSCFG) doesn't have

any output IRQ (and the INTC input #71 belongs to the UART6).

Remove the invalid code.

Fixes: db635521a02 ("stm32f205: Add the stm32f205 SoC")

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

Message-id: 20201107193403.436146-3-f4bug@amsat.org

include/hw/misc/stm32f2xx_syscfg.h | 2 --

hw/arm/stm32f205_soc.c | 1 -

hw/misc/stm32f2xx_syscfg.c | 2 --

3 files changed, 5 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/misc/stm32f2xx_syscfg.h

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

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

uint32_t syscfg_exticr3;

uint32_t syscfg_exticr4;

uint32_t syscfg_cmpcr;

-

- qemu_irq irq;

#endif /* HW_STM32F2XX_SYSCFG_H */

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/stm32f205_soc.c

+++ b/hw/arm/stm32f205_soc.c

@@ -XXX,XX +XXX,XX @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)

busdev = SYS_BUS_DEVICE(dev);

sysbus_mmio_map(busdev, 0, 0x40013800);

- sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(armv7m, 71));

/* Attach UART (uses USART registers) and USART controllers */

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

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/misc/stm32f2xx_syscfg.c

+++ b/hw/misc/stm32f2xx_syscfg.c

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

STM32F2XXSyscfgState *s = STM32F2XX_SYSCFG(obj);

- sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);

-

memory_region_init_io(&s->mmio, obj, &stm32f2xx_syscfg_ops, s,

TYPE_STM32F2XX_SYSCFG, 0x400);

sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);

2.20.1

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

We don't need to fill the full pic[] array if we only use

few of the interrupt lines. Directly call qdev_get_gpio_in()

when necessary.

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

Message-id: 20201107193403.436146-6-f4bug@amsat.org

hw/arm/musicpal.c | 25 +++++++++++++------------

1 file changed, 13 insertions(+), 12 deletions(-)

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

--- a/hw/arm/musicpal.c

+++ b/hw/arm/musicpal.c

@@ -XXX,XX +XXX,XX @@ static struct arm_boot_info musicpal_binfo = {

static void musicpal_init(MachineState *machine)

{

ARMCPU *cpu;

- qemu_irq pic[32];

DeviceState *dev;

+ DeviceState *pic;

DeviceState *uart_orgate;

DeviceState *i2c_dev;

DeviceState *lcd_dev;

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

&error_fatal);

memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram);

- dev = sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE,

+ pic = sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE,

qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));

- for (i = 0; i < 32; i++) {

- pic[i] = qdev_get_gpio_in(dev, i);

- }

- sysbus_create_varargs(TYPE_MV88W8618_PIT, MP_PIT_BASE, pic[MP_TIMER1_IRQ],

- pic[MP_TIMER2_IRQ], pic[MP_TIMER3_IRQ],

- pic[MP_TIMER4_IRQ], NULL);

+ sysbus_create_varargs(TYPE_MV88W8618_PIT, MP_PIT_BASE,

+ qdev_get_gpio_in(pic, MP_TIMER1_IRQ),

+ qdev_get_gpio_in(pic, MP_TIMER2_IRQ),

+ qdev_get_gpio_in(pic, MP_TIMER3_IRQ),

+ qdev_get_gpio_in(pic, MP_TIMER4_IRQ), NULL);

/* Logically OR both UART IRQs together */

uart_orgate = DEVICE(object_new(TYPE_OR_IRQ));

object_property_set_int(OBJECT(uart_orgate), "num-lines", 2, &error_fatal);

qdev_realize_and_unref(uart_orgate, NULL, &error_fatal);

- qdev_connect_gpio_out(DEVICE(uart_orgate), 0, pic[MP_UART_SHARED_IRQ]);

+ qdev_connect_gpio_out(DEVICE(uart_orgate), 0,

+ qdev_get_gpio_in(pic, MP_UART_SHARED_IRQ));

serial_mm_init(address_space_mem, MP_UART1_BASE, 2,

qdev_get_gpio_in(uart_orgate, 0),

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

OBJECT(get_system_memory()), &error_fatal);

sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, MP_ETH_BASE);

- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[MP_ETH_IRQ]);

+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,

+ qdev_get_gpio_in(pic, MP_ETH_IRQ));

sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL);

sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL);

dev = sysbus_create_simple(TYPE_MUSICPAL_GPIO, MP_GPIO_BASE,

- pic[MP_GPIO_IRQ]);

+ qdev_get_gpio_in(pic, MP_GPIO_IRQ));

i2c_dev = sysbus_create_simple("gpio_i2c", -1, NULL);

i2c = (I2CBus *)qdev_get_child_bus(i2c_dev, "i2c");

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

NULL);

sysbus_realize_and_unref(s, &error_fatal);

sysbus_mmio_map(s, 0, MP_AUDIO_BASE);

- sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]);

+ sysbus_connect_irq(s, 0, qdev_get_gpio_in(pic, MP_AUDIO_IRQ));

musicpal_binfo.ram_size = MP_RAM_DEFAULT_SIZE;

arm_load_kernel(cpu, machine, &musicpal_binfo);

2.20.1

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

The MusicPal board code connects both of the IRQ outputs of the UART

to the same INTC qemu_irq. Connecting two qemu_irqs outputs directly

to the same input is not valid as it produces subtly wrong behaviour

(for instance if both the IRQ lines are high, and then one goes

low, the INTC input will see this as a high-to-low transition

even though the second IRQ line should still be holding it high).

This kind of wiring needs an explicitly created OR gate; add one.