From patchwork Tue Dec 29 08:04:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 561486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E90EB140C11 for ; Tue, 29 Dec 2015 19:09:42 +1100 (AEDT) Received: from localhost ([::1]:47633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpLg-00031M-Fl for incoming@patchwork.ozlabs.org; Tue, 29 Dec 2015 03:09:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHs-0003DV-HP for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDpHr-0001fa-9J for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:44 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:18024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHl-0001co-2k; Tue, 29 Dec 2015 03:05:37 -0500 Received: from localhost.localdomain (unknown [78.230.185.200]) by smtp5-g21.free.fr (Postfix) with ESMTP id C3794D4812F; Tue, 29 Dec 2015 09:05:01 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Tue, 29 Dec 2015 09:04:48 +0100 Message-Id: <1451376295-28834-12-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> References: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.5 Cc: Kevin Wolf , "open list:Floppy" , "Michael S. Tsirkin" , Leon Alrae , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , John Snow , Aurelien Jarno Subject: [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Floppy uses the DMA controller in rc4030 chipset, and not the i8259 from the ISA bus. It's better to disable DMA than to call the wrong DMA controller. Signed-off-by: Hervé Poussineau --- hw/block/fdc.c | 5 +++-- hw/mips/mips_jazz.c | 3 ++- include/hw/block/fdc.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 4292ece..cfdd625 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2255,7 +2255,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds) return isadev; } -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, +void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma, hwaddr mmio_base, DriveInfo **fds) { FDCtrl *fdctrl; @@ -2266,7 +2266,8 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, dev = qdev_create(NULL, "sysbus-fdc"); sys = SYSBUS_FDC(dev); fdctrl = &sys->state; - fdctrl->dma_chann = dma_chann; /* FIXME */ + fdctrl->dma = dma; + fdctrl->dma_chann = dma ? dma_chann : -1; if (fds[0]) { qdev_prop_set_drive_nofail(dev, "driveA", blk_by_legacy_dinfo(fds[0])); } diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 64a0de2..300c199 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -296,7 +296,8 @@ static void mips_jazz_init(MachineState *machine, for (n = 0; n < MAX_FD; n++) { fds[n] = drive_get(IF_FLOPPY, 0, n); } - fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, 0x80003000, fds); + /* FIXME: we should enable DMA with a custom IsaDma device */ + fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, NULL, 0x80003000, fds); /* Real time clock */ rtc_init(isa_bus, 1980, NULL); diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index d48b2f8..f92e44f 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,7 +16,7 @@ typedef enum FDriveType { #define TYPE_ISA_FDC "isa-fdc" ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds); -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, +void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma, hwaddr mmio_base, DriveInfo **fds); void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc);