OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/sparc/sun4m: Realize DMA controller before accessing it

Browse Source 
We should not wire IRQs on unrealized device.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240213130341.1793-9-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-19 12:09:52 +02:00
parent 5e37bc4997
commit 73a143b340
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/sparc/sun4m.c
View File

@ -312,13 +312,11 @@ static void *sparc32_dma_init(hwaddr dma_base,
dma = qdev_new(TYPE_SPARC32_DMA); dma = qdev_new(TYPE_SPARC32_DMA);
espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component( espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
OBJECT(dma), "espdma")); OBJECT(dma), "espdma"));
sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq);
esp = SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp")); esp = SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component( ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(
OBJECT(dma), "ledma")); OBJECT(dma), "ledma"));
sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq);
lance = SYSBUS_PCNET(object_resolve_path_component( lance = SYSBUS_PCNET(object_resolve_path_component(
OBJECT(ledma), "lance")); OBJECT(ledma), "lance"));
@ -332,6 +330,11 @@ static void *sparc32_dma_init(hwaddr dma_base,
} }
sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq);
sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base); sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base);
sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base); sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base);