From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGZgJ-0003NE-Jz for qemu-devel@nongnu.org; Tue, 05 Jan 2016 17:02:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGZgI-0000kh-E0 for qemu-devel@nongnu.org; Tue, 05 Jan 2016 17:02:19 -0500 References: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> <1451376295-28834-12-git-send-email-hpoussin@reactos.org> From: John Snow Message-ID: <568C3D62.4030101@redhat.com> Date: Tue, 5 Jan 2016 17:02:10 -0500 MIME-Version: 1.0 In-Reply-To: <1451376295-28834-12-git-send-email-hpoussin@reactos.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Herv=c3=a9_Poussineau?= , qemu-devel@nongnu.org Cc: Kevin Wolf , "open list:Floppy" , "Michael S. Tsirkin" , Paolo Bonzini , Leon Alrae , Aurelien Jarno On 12/29/2015 03:04 AM, Herv=C3=A9 Poussineau wrote: > Floppy uses the DMA controller in rc4030 chipset, and not the i8259 fro= m the ISA bus. > It's better to disable DMA than to call the wrong DMA controller. >=20 I'll trust that these platforms' FDCs are already terribly broken and unusable, I've not tested them personally. > Signed-off-by: Herv=C3=A9 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(-) >=20 > 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; > } > =20 > -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_cha= nn, > dev =3D qdev_create(NULL, "sysbus-fdc"); > sys =3D SYSBUS_FDC(dev); > fdctrl =3D &sys->state; > - fdctrl->dma_chann =3D dma_chann; /* FIXME */ > + fdctrl->dma =3D dma; You haven't added this field yet; so this breaks the bisect. > + fdctrl->dma_chann =3D 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 =3D 0; n < MAX_FD; n++) { > fds[n] =3D 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, 0x8000300= 0, fds); > =20 > /* 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" > =20 > 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); >=20