* [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups
@ 2021-01-31 18:44 Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Philippe Mathieu-Daudé
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
Trivial bugfixes and cleanup patches noticed while rebasing
my "Support disabling TCG on ARM (part 2)" series.
Since v2:
- removed incorrect patches added in v2 =)
- more fixes for Versal board (CAN, RTC)
Since v1:
- added patches to remove 64-bit specific features on 32-bit build.
Philippe Mathieu-Daudé (6):
hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ
hw/arm/exynos4210: Add missing dependency on OR_IRQ
hw/arm/xlnx-versal: Versal SoC requires ZDMA
hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals
hw/net/can: ZynqMP CAN device requires PTIMER
hw/arm: Display CPU type in machine description
hw/arm/digic_boards.c | 2 +-
hw/arm/microbit.c | 2 +-
hw/arm/netduino2.c | 2 +-
hw/arm/netduinoplus2.c | 2 +-
hw/arm/orangepi.c | 2 +-
hw/arm/stellaris.c | 4 ++--
hw/Kconfig | 1 +
hw/arm/Kconfig | 5 +++++
hw/dma/Kconfig | 3 +++
hw/dma/meson.build | 2 +-
10 files changed, 17 insertions(+), 8 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-02-01 19:54 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 2/6] hw/arm/exynos4210: " Philippe Mathieu-Daudé
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
The STM32F405 SoC uses an OR gate on its ADC IRQs.
Fixes: 529fc5fd3e1 ("hw/arm: Add the STM32F4xx SoC")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: alistair@alistair23.me
---
hw/arm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 13cc42dcc84..a320a124855 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -336,6 +336,7 @@ config STM32F205_SOC
config STM32F405_SOC
bool
select ARM_V7M
+ select OR_IRQ
select STM32F4XX_SYSCFG
select STM32F4XX_EXTI
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 2/6] hw/arm/exynos4210: Add missing dependency on OR_IRQ
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA Philippe Mathieu-Daudé
` (4 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Igor Mitsyanko, Niek Linnenbank, qemu-arm, Antony Pavlov,
Joel Stanley
The Exynos4210 SoC uses an OR gate on the PL330 IRQ lines.
Fixes: dab15fbe2ab ("hw/arm/exynos4210: Fix DMA initialization")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Igor Mitsyanko <i.mitsyanko@gmail.com>
---
hw/arm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index a320a124855..223016bb4e8 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -52,6 +52,7 @@ config EXYNOS4
select PTIMER
select SDHCI
select USB_EHCI_SYSBUS
+ select OR_IRQ
config HIGHBANK
bool
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 2/6] hw/arm/exynos4210: " Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-02-01 19:55 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals Philippe Mathieu-Daudé
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Edgar E. Iglesias,
Joel Stanley
The Versal SoC instantiates the TYPE_XLNX_ZDMA object in
versal_create_admas(). Introduce the XLNX_ZDMA configuration
and select it to fix:
$ qemu-system-aarch64 -M xlnx-versal-virt ...
qemu-system-aarch64: missing object type 'xlnx.zdma'
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
---
hw/arm/Kconfig | 2 ++
hw/dma/Kconfig | 3 +++
hw/dma/meson.build | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 223016bb4e8..09298881f2f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -354,6 +354,7 @@ config XLNX_ZYNQMP_ARM
select XILINX_AXI
select XILINX_SPIPS
select XLNX_ZYNQMP
+ select XLNX_ZDMA
config XLNX_VERSAL
bool
@@ -362,6 +363,7 @@ config XLNX_VERSAL
select CADENCE
select VIRTIO_MMIO
select UNIMP
+ select XLNX_ZDMA
config NPCM7XX
bool
diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
index d67492d36c1..5d6be1a7a7a 100644
--- a/hw/dma/Kconfig
+++ b/hw/dma/Kconfig
@@ -18,6 +18,9 @@ config ZYNQ_DEVCFG
bool
select REGISTER
+config XLNX_ZDMA
+ bool
+
config STP2000
bool
diff --git a/hw/dma/meson.build b/hw/dma/meson.build
index b991d7698c7..47b4a7cb47b 100644
--- a/hw/dma/meson.build
+++ b/hw/dma/meson.build
@@ -9,7 +9,7 @@
softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-01-31 18:44 ` [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-02-01 19:56 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER Philippe Mathieu-Daudé
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Edgar E. Iglesias,
Joel Stanley
The Versal SoC instantiates the TYPE_XLNX_ZYNQMP_RTC object in
versal_create_rtc()(). Select CONFIG_XLNX_ZYNQMP to fix:
$ make check-qtest-aarch64
...
Running test qtest-aarch64/qom-test
qemu-system-aarch64: missing object type 'xlnx-zynmp.rtc'
Broken pipe
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
---
hw/arm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 09298881f2f..be017b997ab 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -364,6 +364,7 @@ config XLNX_VERSAL
select VIRTIO_MMIO
select UNIMP
select XLNX_ZDMA
+ select XLNX_ZYNQMP
config NPCM7XX
bool
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2021-01-31 18:44 ` [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-02-01 19:55 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 6/6] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
2021-02-02 16:48 ` [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Peter Maydell
6 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
Add a dependency XLNX_ZYNQMP -> PTIMER to fix:
/usr/bin/ld:
libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o: in function `xlnx_zynqmp_can_realize':
hw/net/can/xlnx-zynqmp-can.c:1082: undefined reference to `ptimer_init'
hw/net/can/xlnx-zynqmp-can.c:1085: undefined reference to `ptimer_transaction_begin'
hw/net/can/xlnx-zynqmp-can.c:1087: undefined reference to `ptimer_set_freq'
hw/net/can/xlnx-zynqmp-can.c:1088: undefined reference to `ptimer_set_limit'
hw/net/can/xlnx-zynqmp-can.c:1089: undefined reference to `ptimer_run'
hw/net/can/xlnx-zynqmp-can.c:1090: undefined reference to `ptimer_transaction_commit'
libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o:(.data.rel+0x2c8): undefined reference to `vmstate_ptimer'
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/Kconfig b/hw/Kconfig
index 5ad3c6b5a4b..d4cec9e476c 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -81,3 +81,4 @@ config XLNX_ZYNQMP
bool
select REGISTER
select CAN_BUS
+ select PTIMER
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 6/6] hw/arm: Display CPU type in machine description
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2021-01-31 18:44 ` [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER Philippe Mathieu-Daudé
@ 2021-01-31 18:44 ` Philippe Mathieu-Daudé
2021-01-31 21:53 ` Niek Linnenbank
2021-02-01 19:56 ` Alistair Francis
2021-02-02 16:48 ` [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Peter Maydell
6 siblings, 2 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-31 18:44 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
Laurent Vivier, Philippe Mathieu-Daudé,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
Most of ARM machines display their CPU when QEMU list the available
machines (-M help). Some machines do not. Fix to unify the help
output.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/digic_boards.c | 2 +-
hw/arm/microbit.c | 2 +-
hw/arm/netduino2.c | 2 +-
hw/arm/netduinoplus2.c | 2 +-
hw/arm/orangepi.c | 2 +-
hw/arm/stellaris.c | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index be12873673b..6cdc1d83fca 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -142,7 +142,7 @@ static void canon_a1100_init(MachineState *machine)
static void canon_a1100_machine_init(MachineClass *mc)
{
- mc->desc = "Canon PowerShot A1100 IS";
+ mc->desc = "Canon PowerShot A1100 IS (ARM946)";
mc->init = &canon_a1100_init;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_size = 64 * MiB;
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index 0947491cb97..e9494334ce7 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -64,7 +64,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "BBC micro:bit";
+ mc->desc = "BBC micro:bit (Cortex-M0)";
mc->init = microbit_init;
mc->max_cpus = 1;
}
diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index 8f103341443..1733b71507c 100644
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -54,7 +54,7 @@ static void netduino2_init(MachineState *machine)
static void netduino2_machine_init(MachineClass *mc)
{
- mc->desc = "Netduino 2 Machine";
+ mc->desc = "Netduino 2 Machine (Cortex-M3)";
mc->init = netduino2_init;
mc->ignore_memory_transaction_failures = true;
}
diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
index 68abd3ec69d..d3ad7a2b675 100644
--- a/hw/arm/netduinoplus2.c
+++ b/hw/arm/netduinoplus2.c
@@ -55,7 +55,7 @@ static void netduinoplus2_init(MachineState *machine)
static void netduinoplus2_machine_init(MachineClass *mc)
{
- mc->desc = "Netduino Plus 2 Machine";
+ mc->desc = "Netduino Plus 2 Machine (Cortex-M4)";
mc->init = netduinoplus2_init;
}
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index d6306dfddae..40cdb5c6d2c 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -113,7 +113,7 @@ static void orangepi_init(MachineState *machine)
static void orangepi_machine_init(MachineClass *mc)
{
- mc->desc = "Orange Pi PC";
+ mc->desc = "Orange Pi PC (Cortex-A7)";
mc->init = orangepi_init;
mc->block_default_type = IF_SD;
mc->units_per_default_bus = 1;
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index ad72c0959f1..27292ec4113 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1538,7 +1538,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "Stellaris LM3S811EVB";
+ mc->desc = "Stellaris LM3S811EVB (Cortex-M3)";
mc->init = lm3s811evb_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
@@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "Stellaris LM3S6965EVB";
+ mc->desc = "Stellaris LM3S6965EVB (Cortex-M3)";
mc->init = lm3s6965evb_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v3 6/6] hw/arm: Display CPU type in machine description
2021-01-31 18:44 ` [PATCH v3 6/6] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
@ 2021-01-31 21:53 ` Niek Linnenbank
2021-02-01 19:56 ` Alistair Francis
1 sibling, 0 replies; 14+ messages in thread
From: Niek Linnenbank @ 2021-01-31 21:53 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, qemu-trivial, Alistair Francis, Michael Tokarev,
QEMU Developers, Laurent Vivier, qemu-arm, Antony Pavlov,
Joel Stanley
[-- Attachment #1: Type: text/plain, Size: 4034 bytes --]
For Orange Pi PC:
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Op zo 31 jan. 2021 19:45 schreef Philippe Mathieu-Daudé <f4bug@amsat.org>:
> Most of ARM machines display their CPU when QEMU list the available
> machines (-M help). Some machines do not. Fix to unify the help
> output.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/arm/digic_boards.c | 2 +-
> hw/arm/microbit.c | 2 +-
> hw/arm/netduino2.c | 2 +-
> hw/arm/netduinoplus2.c | 2 +-
> hw/arm/orangepi.c | 2 +-
> hw/arm/stellaris.c | 4 ++--
> 6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
> index be12873673b..6cdc1d83fca 100644
> --- a/hw/arm/digic_boards.c
> +++ b/hw/arm/digic_boards.c
> @@ -142,7 +142,7 @@ static void canon_a1100_init(MachineState *machine)
>
> static void canon_a1100_machine_init(MachineClass *mc)
> {
> - mc->desc = "Canon PowerShot A1100 IS";
> + mc->desc = "Canon PowerShot A1100 IS (ARM946)";
> mc->init = &canon_a1100_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_ram_size = 64 * MiB;
> diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
> index 0947491cb97..e9494334ce7 100644
> --- a/hw/arm/microbit.c
> +++ b/hw/arm/microbit.c
> @@ -64,7 +64,7 @@ static void microbit_machine_class_init(ObjectClass *oc,
> void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "BBC micro:bit";
> + mc->desc = "BBC micro:bit (Cortex-M0)";
> mc->init = microbit_init;
> mc->max_cpus = 1;
> }
> diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
> index 8f103341443..1733b71507c 100644
> --- a/hw/arm/netduino2.c
> +++ b/hw/arm/netduino2.c
> @@ -54,7 +54,7 @@ static void netduino2_init(MachineState *machine)
>
> static void netduino2_machine_init(MachineClass *mc)
> {
> - mc->desc = "Netduino 2 Machine";
> + mc->desc = "Netduino 2 Machine (Cortex-M3)";
> mc->init = netduino2_init;
> mc->ignore_memory_transaction_failures = true;
> }
> diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
> index 68abd3ec69d..d3ad7a2b675 100644
> --- a/hw/arm/netduinoplus2.c
> +++ b/hw/arm/netduinoplus2.c
> @@ -55,7 +55,7 @@ static void netduinoplus2_init(MachineState *machine)
>
> static void netduinoplus2_machine_init(MachineClass *mc)
> {
> - mc->desc = "Netduino Plus 2 Machine";
> + mc->desc = "Netduino Plus 2 Machine (Cortex-M4)";
> mc->init = netduinoplus2_init;
> }
>
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> index d6306dfddae..40cdb5c6d2c 100644
> --- a/hw/arm/orangepi.c
> +++ b/hw/arm/orangepi.c
> @@ -113,7 +113,7 @@ static void orangepi_init(MachineState *machine)
>
> static void orangepi_machine_init(MachineClass *mc)
> {
> - mc->desc = "Orange Pi PC";
> + mc->desc = "Orange Pi PC (Cortex-A7)";
> mc->init = orangepi_init;
> mc->block_default_type = IF_SD;
> mc->units_per_default_bus = 1;
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index ad72c0959f1..27292ec4113 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1538,7 +1538,7 @@ static void lm3s811evb_class_init(ObjectClass *oc,
> void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "Stellaris LM3S811EVB";
> + mc->desc = "Stellaris LM3S811EVB (Cortex-M3)";
> mc->init = lm3s811evb_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
> @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc,
> void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "Stellaris LM3S6965EVB";
> + mc->desc = "Stellaris LM3S6965EVB (Cortex-M3)";
> mc->init = lm3s6965evb_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
> --
> 2.26.2
>
>
[-- Attachment #2: Type: text/html, Size: 5046 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ
2021-01-31 18:44 ` [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Philippe Mathieu-Daudé
@ 2021-02-01 19:54 ` Alistair Francis
0 siblings, 0 replies; 14+ messages in thread
From: Alistair Francis @ 2021-02-01 19:54 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, QEMU Trivial, Alistair Francis, Michael Tokarev,
qemu-devel@nongnu.org Developers, Laurent Vivier,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
On Sun, Jan 31, 2021 at 10:46 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The STM32F405 SoC uses an OR gate on its ADC IRQs.
>
> Fixes: 529fc5fd3e1 ("hw/arm: Add the STM32F4xx SoC")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> Cc: alistair@alistair23.me
> ---
> hw/arm/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 13cc42dcc84..a320a124855 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -336,6 +336,7 @@ config STM32F205_SOC
> config STM32F405_SOC
> bool
> select ARM_V7M
> + select OR_IRQ
> select STM32F4XX_SYSCFG
> select STM32F4XX_EXTI
>
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA
2021-01-31 18:44 ` [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA Philippe Mathieu-Daudé
@ 2021-02-01 19:55 ` Alistair Francis
0 siblings, 0 replies; 14+ messages in thread
From: Alistair Francis @ 2021-02-01 19:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, QEMU Trivial, Alistair Francis, Michael Tokarev,
qemu-devel@nongnu.org Developers, Laurent Vivier,
Niek Linnenbank, qemu-arm, Antony Pavlov, Edgar E. Iglesias,
Joel Stanley
On Sun, Jan 31, 2021 at 10:47 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The Versal SoC instantiates the TYPE_XLNX_ZDMA object in
> versal_create_admas(). Introduce the XLNX_ZDMA configuration
> and select it to fix:
>
> $ qemu-system-aarch64 -M xlnx-versal-virt ...
> qemu-system-aarch64: missing object type 'xlnx.zdma'
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> Cc: Alistair Francis <alistair@alistair23.me>
> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
> ---
> hw/arm/Kconfig | 2 ++
> hw/dma/Kconfig | 3 +++
> hw/dma/meson.build | 2 +-
> 3 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 223016bb4e8..09298881f2f 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -354,6 +354,7 @@ config XLNX_ZYNQMP_ARM
> select XILINX_AXI
> select XILINX_SPIPS
> select XLNX_ZYNQMP
> + select XLNX_ZDMA
>
> config XLNX_VERSAL
> bool
> @@ -362,6 +363,7 @@ config XLNX_VERSAL
> select CADENCE
> select VIRTIO_MMIO
> select UNIMP
> + select XLNX_ZDMA
>
> config NPCM7XX
> bool
> diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
> index d67492d36c1..5d6be1a7a7a 100644
> --- a/hw/dma/Kconfig
> +++ b/hw/dma/Kconfig
> @@ -18,6 +18,9 @@ config ZYNQ_DEVCFG
> bool
> select REGISTER
>
> +config XLNX_ZDMA
> + bool
> +
> config STP2000
> bool
>
> diff --git a/hw/dma/meson.build b/hw/dma/meson.build
> index b991d7698c7..47b4a7cb47b 100644
> --- a/hw/dma/meson.build
> +++ b/hw/dma/meson.build
> @@ -9,7 +9,7 @@
> softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
> softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
> softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
> -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c'))
> +softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
> softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
> softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
> softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER
2021-01-31 18:44 ` [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER Philippe Mathieu-Daudé
@ 2021-02-01 19:55 ` Alistair Francis
0 siblings, 0 replies; 14+ messages in thread
From: Alistair Francis @ 2021-02-01 19:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, QEMU Trivial, Alistair Francis, Michael Tokarev,
qemu-devel@nongnu.org Developers, Laurent Vivier,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
On Sun, Jan 31, 2021 at 10:49 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Add a dependency XLNX_ZYNQMP -> PTIMER to fix:
>
> /usr/bin/ld:
> libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o: in function `xlnx_zynqmp_can_realize':
> hw/net/can/xlnx-zynqmp-can.c:1082: undefined reference to `ptimer_init'
> hw/net/can/xlnx-zynqmp-can.c:1085: undefined reference to `ptimer_transaction_begin'
> hw/net/can/xlnx-zynqmp-can.c:1087: undefined reference to `ptimer_set_freq'
> hw/net/can/xlnx-zynqmp-can.c:1088: undefined reference to `ptimer_set_limit'
> hw/net/can/xlnx-zynqmp-can.c:1089: undefined reference to `ptimer_run'
> hw/net/can/xlnx-zynqmp-can.c:1090: undefined reference to `ptimer_transaction_commit'
> libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o:(.data.rel+0x2c8): undefined reference to `vmstate_ptimer'
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/Kconfig b/hw/Kconfig
> index 5ad3c6b5a4b..d4cec9e476c 100644
> --- a/hw/Kconfig
> +++ b/hw/Kconfig
> @@ -81,3 +81,4 @@ config XLNX_ZYNQMP
> bool
> select REGISTER
> select CAN_BUS
> + select PTIMER
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals
2021-01-31 18:44 ` [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals Philippe Mathieu-Daudé
@ 2021-02-01 19:56 ` Alistair Francis
0 siblings, 0 replies; 14+ messages in thread
From: Alistair Francis @ 2021-02-01 19:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, QEMU Trivial, Alistair Francis, Michael Tokarev,
qemu-devel@nongnu.org Developers, Laurent Vivier,
Niek Linnenbank, qemu-arm, Antony Pavlov, Edgar E. Iglesias,
Joel Stanley
On Sun, Jan 31, 2021 at 10:51 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The Versal SoC instantiates the TYPE_XLNX_ZYNQMP_RTC object in
> versal_create_rtc()(). Select CONFIG_XLNX_ZYNQMP to fix:
>
> $ make check-qtest-aarch64
> ...
> Running test qtest-aarch64/qom-test
> qemu-system-aarch64: missing object type 'xlnx-zynmp.rtc'
> Broken pipe
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> Cc: Alistair Francis <alistair@alistair23.me>
> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
> ---
> hw/arm/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 09298881f2f..be017b997ab 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -364,6 +364,7 @@ config XLNX_VERSAL
> select VIRTIO_MMIO
> select UNIMP
> select XLNX_ZDMA
> + select XLNX_ZYNQMP
>
> config NPCM7XX
> bool
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 6/6] hw/arm: Display CPU type in machine description
2021-01-31 18:44 ` [PATCH v3 6/6] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
2021-01-31 21:53 ` Niek Linnenbank
@ 2021-02-01 19:56 ` Alistair Francis
1 sibling, 0 replies; 14+ messages in thread
From: Alistair Francis @ 2021-02-01 19:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, QEMU Trivial, Alistair Francis, Michael Tokarev,
qemu-devel@nongnu.org Developers, Laurent Vivier,
Niek Linnenbank, qemu-arm, Antony Pavlov, Joel Stanley
On Sun, Jan 31, 2021 at 10:54 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Most of ARM machines display their CPU when QEMU list the available
> machines (-M help). Some machines do not. Fix to unify the help
> output.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/arm/digic_boards.c | 2 +-
> hw/arm/microbit.c | 2 +-
> hw/arm/netduino2.c | 2 +-
> hw/arm/netduinoplus2.c | 2 +-
> hw/arm/orangepi.c | 2 +-
> hw/arm/stellaris.c | 4 ++--
> 6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
> index be12873673b..6cdc1d83fca 100644
> --- a/hw/arm/digic_boards.c
> +++ b/hw/arm/digic_boards.c
> @@ -142,7 +142,7 @@ static void canon_a1100_init(MachineState *machine)
>
> static void canon_a1100_machine_init(MachineClass *mc)
> {
> - mc->desc = "Canon PowerShot A1100 IS";
> + mc->desc = "Canon PowerShot A1100 IS (ARM946)";
> mc->init = &canon_a1100_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_ram_size = 64 * MiB;
> diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
> index 0947491cb97..e9494334ce7 100644
> --- a/hw/arm/microbit.c
> +++ b/hw/arm/microbit.c
> @@ -64,7 +64,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "BBC micro:bit";
> + mc->desc = "BBC micro:bit (Cortex-M0)";
> mc->init = microbit_init;
> mc->max_cpus = 1;
> }
> diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
> index 8f103341443..1733b71507c 100644
> --- a/hw/arm/netduino2.c
> +++ b/hw/arm/netduino2.c
> @@ -54,7 +54,7 @@ static void netduino2_init(MachineState *machine)
>
> static void netduino2_machine_init(MachineClass *mc)
> {
> - mc->desc = "Netduino 2 Machine";
> + mc->desc = "Netduino 2 Machine (Cortex-M3)";
> mc->init = netduino2_init;
> mc->ignore_memory_transaction_failures = true;
> }
> diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
> index 68abd3ec69d..d3ad7a2b675 100644
> --- a/hw/arm/netduinoplus2.c
> +++ b/hw/arm/netduinoplus2.c
> @@ -55,7 +55,7 @@ static void netduinoplus2_init(MachineState *machine)
>
> static void netduinoplus2_machine_init(MachineClass *mc)
> {
> - mc->desc = "Netduino Plus 2 Machine";
> + mc->desc = "Netduino Plus 2 Machine (Cortex-M4)";
> mc->init = netduinoplus2_init;
> }
>
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> index d6306dfddae..40cdb5c6d2c 100644
> --- a/hw/arm/orangepi.c
> +++ b/hw/arm/orangepi.c
> @@ -113,7 +113,7 @@ static void orangepi_init(MachineState *machine)
>
> static void orangepi_machine_init(MachineClass *mc)
> {
> - mc->desc = "Orange Pi PC";
> + mc->desc = "Orange Pi PC (Cortex-A7)";
> mc->init = orangepi_init;
> mc->block_default_type = IF_SD;
> mc->units_per_default_bus = 1;
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index ad72c0959f1..27292ec4113 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1538,7 +1538,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "Stellaris LM3S811EVB";
> + mc->desc = "Stellaris LM3S811EVB (Cortex-M3)";
> mc->init = lm3s811evb_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
> @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
>
> - mc->desc = "Stellaris LM3S6965EVB";
> + mc->desc = "Stellaris LM3S6965EVB (Cortex-M3)";
> mc->init = lm3s6965evb_init;
> mc->ignore_memory_transaction_failures = true;
> mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2021-01-31 18:44 ` [PATCH v3 6/6] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
@ 2021-02-02 16:48 ` Peter Maydell
6 siblings, 0 replies; 14+ messages in thread
From: Peter Maydell @ 2021-02-02 16:48 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: QEMU Trivial, Alistair Francis, Michael Tokarev, QEMU Developers,
Laurent Vivier, Niek Linnenbank, qemu-arm, Antony Pavlov,
Joel Stanley
On Sun, 31 Jan 2021 at 18:44, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Trivial bugfixes and cleanup patches noticed while rebasing
> my "Support disabling TCG on ARM (part 2)" series.
>
> Since v2:
> - removed incorrect patches added in v2 =)
> - more fixes for Versal board (CAN, RTC)
>
> Since v1:
> - added patches to remove 64-bit specific features on 32-bit build.
>
> Philippe Mathieu-Daudé (6):
> hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ
> hw/arm/exynos4210: Add missing dependency on OR_IRQ
> hw/arm/xlnx-versal: Versal SoC requires ZDMA
> hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals
> hw/net/can: ZynqMP CAN device requires PTIMER
> hw/arm: Display CPU type in machine description
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-02-02 17:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-31 18:44 [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Philippe Mathieu-Daudé
2021-02-01 19:54 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 2/6] hw/arm/exynos4210: " Philippe Mathieu-Daudé
2021-01-31 18:44 ` [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA Philippe Mathieu-Daudé
2021-02-01 19:55 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals Philippe Mathieu-Daudé
2021-02-01 19:56 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER Philippe Mathieu-Daudé
2021-02-01 19:55 ` Alistair Francis
2021-01-31 18:44 ` [PATCH v3 6/6] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
2021-01-31 21:53 ` Niek Linnenbank
2021-02-01 19:56 ` Alistair Francis
2021-02-02 16:48 ` [PATCH v3 0/6] hw/arm: Misc trivial fixes/cleanups Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.