[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/32] piix4: add a i8257 dma controller as specified in datashee
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 14/32] piix4: add a i8257 dma controller as specified in datasheet |
Date: |
Tue, 15 Oct 2019 18:26:47 +0200 |
From: Hervé Poussineau <address@hidden>
Remove i8257 instanciated in malta board, to not have it twice.
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
[PMD: rebased]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/isa/piix4.c | 4 ++++
hw/mips/mips_malta.c | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 8998b0ca47..1bc91b590c 100644
--- 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"
@@ -164,6 +165,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
/* initialize ISA irqs */
isa_bus_irqs(isa_bus, s->isa);
+ /* DMA */
+ i8257_dma_init(isa_bus, 0);
+
piix4_dev = pci_dev;
}
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index e499b7a6bb..df247177ca 100644
--- 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 */
--
2.21.0
- [PATCH 09/32] piix4: add Reset Control Register, (continued)
- [PATCH 09/32] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 10/32] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 12/32] piix4: rename PIIX4 object to piix4-isa, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 13/32] piix4: convert reset function to QOM, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 14/32] piix4: add a i8257 dma controller as specified in datasheet,
Philippe Mathieu-Daudé <=
- [PATCH 15/32] piix4: add a i8254 pit controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 17/32] hw/mips/mips_malta: Create IDE hard drive array dynamically, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 18/32] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create(), Philippe Mathieu-Daudé, 2019/10/15