piix4: Add an i8257 DMA Controller as specified in datasheet

The i8257 is not a chipset on the Malta board, but is part of
the PIIX4 chipset.
Create the i8257 in the PIIX4 code, remove the one instantiated
in malta board, to not have it twice.

Acked-by: Michael S. Tsirkin <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
Signed-off-by: Hervé Poussineau <[email protected]>
Message-Id: <20171216090228[email protected]>
Reviewed-by: Aleksandar Markovic <[email protected]>
Reviewed-by: Esteban Bosse <[email protected]>
[PMD: rebased, reworded description]
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index fa387919b5e50cded15a3527847ca960b5595069..9ebe98bdc324481e710dbfb33c9becf4e0cf6c24 100644 (file)
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -29,6 +29,7 @@
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "hw/sysbus.h"
+#include "hw/dma/i8257.h"
 #include "migration/vmstate.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
@@ -167,6 +168,9 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
     /* initialize ISA irqs */
     isa_bus_irqs(isa_bus, s->isa);
 
+    /* DMA */
+    i8257_dma_init(isa_bus, 0);
+
     piix4_dev = dev;
 }
 

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 50860248213e24b2d12ba706ad1f21564b849105..44e5f8b26be210fb15c1f722435fff4d46115b5e 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -28,7 +28,6 @@
 #include "cpu.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/superio.h"
-#include "hw/dma/i8257.h"
 #include "hw/char/serial.h"
 #include "net/net.h"
 #include "hw/boards.h"
@@ -1430,7 +1429,6 @@ void mips_malta_init(MachineState *machine)
     smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
                           isa_get_irq(NULL, 9), NULL, 0, NULL);
     pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
-    i8257_dma_init(isa_bus, 0);
     mc146818_rtc_init(isa_bus, 2000, NULL);
 
     /* generate SPD EEPROM data */