From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtBD2-0008HG-BE for qemu-devel@nongnu.org; Sun, 30 Jun 2013 02:34:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtBD0-0008GB-GW for qemu-devel@nongnu.org; Sun, 30 Jun 2013 02:34:04 -0400 Message-ID: <51CFD154.6070401@suse.de> Date: Sun, 30 Jun 2013 08:33:56 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1372555629-17976-1-git-send-email-agraf@suse.de> <1372555629-17976-3-git-send-email-agraf@suse.de> In-Reply-To: <1372555629-17976-3-git-send-email-agraf@suse.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 02/15] PPC: g3beige: Move secondary IDE bus to mac-io List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Kevin Wolf , programmingkidx@gmail.com, mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Am 30.06.2013 03:26, schrieb Alexander Graf: > On a real G3 Beige the secondary IDE bus lives on the mac-io chip, not > on some random PCI device. Move it there to become more compatible. >=20 > While at it, also clean up the IDE channel connection logic. >=20 > Signed-off-by: Alexander Graf >=20 > --- >=20 > v1 -> v2: >=20 > - fix IRQ mapping > --- > hw/ide/macio.c | 2 +- > hw/misc/macio/macio.c | 95 +++++++++++++++++++++++++++++--------------= -------- > hw/ppc/mac_oldworld.c | 17 +++++---- > 3 files changed, 64 insertions(+), 50 deletions(-) >=20 > diff --git a/hw/ide/macio.c b/hw/ide/macio.c > index a1952b0..7a1c573 100644 > --- a/hw/ide/macio.c > +++ b/hw/ide/macio.c > @@ -363,7 +363,7 @@ static void macio_ide_register_types(void) > type_register_static(&macio_ide_type_info); > } > =20 > -/* hd_table must contain 4 block drivers */ > +/* hd_table must contain 2 block drivers */ > void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table) > { > int i; > diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c > index fd4c8e5..d9971e2 100644 > --- a/hw/misc/macio/macio.c > +++ b/hw/misc/macio/macio.c > @@ -51,11 +51,9 @@ typedef struct OldWorldMacIOState { > /*< private >*/ > MacIOState parent_obj; > /*< public >*/ > - > - qemu_irq irqs[3]; > - > + qemu_irq irqs[5]; > MacIONVRAMState nvram; > - MACIOIDEState ide; > + MACIOIDEState ide[2]; > } OldWorldMacIOState; I had asked you to please keep my spacing: It separates parent field, local fields (IRQs) and child fields. > =20 > #define NEWWORLD_MACIO(obj) \ > @@ -147,18 +145,32 @@ static int macio_common_initfn(PCIDevice *d) > return 0; > } > =20 > +static int macio_initfn_ide(MacIOState *s, MACIOIDEState *ide, qemu_ir= q irq0, > + qemu_irq irq1, int dmaid) macio_realize_ide would be a better name since PCIDevices still use their legacy "initfn". Otherwise looks good. Andreas > +{ > + SysBusDevice *sysbus_dev; > + > + sysbus_dev =3D SYS_BUS_DEVICE(ide); > + sysbus_connect_irq(sysbus_dev, 0, irq0); > + sysbus_connect_irq(sysbus_dev, 1, irq1); > + macio_ide_register_dma(ide, s->dbdma, dmaid); > + return qdev_init(DEVICE(ide)); > +} > + > static int macio_oldworld_initfn(PCIDevice *d) > { > MacIOState *s =3D MACIO(d); > OldWorldMacIOState *os =3D OLDWORLD_MACIO(d); > SysBusDevice *sysbus_dev; > + int i; > + int cur_irq =3D 0; > int ret =3D macio_common_initfn(d); > if (ret < 0) { > return ret; > } > =20 > sysbus_dev =3D SYS_BUS_DEVICE(&s->cuda); > - sysbus_connect_irq(sysbus_dev, 0, os->irqs[0]); > + sysbus_connect_irq(sysbus_dev, 0, os->irqs[cur_irq++]); > =20 > ret =3D qdev_init(DEVICE(&os->nvram)); > if (ret < 0) { > @@ -174,23 +186,39 @@ static int macio_oldworld_initfn(PCIDevice *d) > memory_region_add_subregion(&s->bar, 0x00000, s->pic_mem); > } > =20 > - sysbus_dev =3D SYS_BUS_DEVICE(&os->ide); > - sysbus_connect_irq(sysbus_dev, 0, os->irqs[1]); > - sysbus_connect_irq(sysbus_dev, 1, os->irqs[2]); > - macio_ide_register_dma(&os->ide, s->dbdma, 0x16); > - ret =3D qdev_init(DEVICE(&os->ide)); > - if (ret < 0) { > - return ret; > + /* IDE buses */ > + for (i =3D 0; i < ARRAY_SIZE(os->ide); i++) { > + qemu_irq irq0 =3D os->irqs[cur_irq++]; > + qemu_irq irq1 =3D os->irqs[cur_irq++]; > + > + ret =3D macio_initfn_ide(s, &os->ide[i], irq0, irq1, 0x16 + (i= * 4)); > + if (ret < 0) { > + return ret; > + } > } > =20 > return 0; > } > =20 > +static void macio_init_ide(MacIOState *s, MACIOIDEState *ide, int inde= x) > +{ > + gchar *name; > + > + object_initialize(ide, TYPE_MACIO_IDE); > + qdev_set_parent_bus(DEVICE(ide), sysbus_get_default()); > + memory_region_add_subregion(&s->bar, 0x1f000 + ((index + 1) * 0x10= 00), > + &ide->mem); > + name =3D g_strdup_printf("ide[%i]", index); > + object_property_add_child(OBJECT(s), name, OBJECT(ide), NULL); > + g_free(name); > +} > + > static void macio_oldworld_init(Object *obj) > { > MacIOState *s =3D MACIO(obj); > OldWorldMacIOState *os =3D OLDWORLD_MACIO(obj); > DeviceState *dev; > + int i; > =20 > qdev_init_gpio_out(DEVICE(obj), os->irqs, ARRAY_SIZE(os->irqs)); > =20 > @@ -199,10 +227,9 @@ static void macio_oldworld_init(Object *obj) > qdev_prop_set_uint32(dev, "size", 0x2000); > qdev_prop_set_uint32(dev, "it_shift", 4); > =20 > - object_initialize(&os->ide, TYPE_MACIO_IDE); > - qdev_set_parent_bus(DEVICE(&os->ide), sysbus_get_default()); > - memory_region_add_subregion(&s->bar, 0x1f000 + (1 * 0x1000), &os->= ide.mem); > - object_property_add_child(obj, "ide", OBJECT(&os->ide), NULL); > + for (i =3D 0; i < 2; i++) { > + macio_init_ide(s, &os->ide[i], i); > + } > } > =20 > static int macio_newworld_initfn(PCIDevice *d) > @@ -210,35 +237,30 @@ static int macio_newworld_initfn(PCIDevice *d) > MacIOState *s =3D MACIO(d); > NewWorldMacIOState *ns =3D NEWWORLD_MACIO(d); > SysBusDevice *sysbus_dev; > + int i; > + int cur_irq =3D 0; > int ret =3D macio_common_initfn(d); > if (ret < 0) { > return ret; > } > =20 > sysbus_dev =3D SYS_BUS_DEVICE(&s->cuda); > - sysbus_connect_irq(sysbus_dev, 0, ns->irqs[0]); > + sysbus_connect_irq(sysbus_dev, 0, ns->irqs[cur_irq++]); > =20 > if (s->pic_mem) { > /* OpenPIC */ > memory_region_add_subregion(&s->bar, 0x40000, s->pic_mem); > } > =20 > - sysbus_dev =3D SYS_BUS_DEVICE(&ns->ide[0]); > - sysbus_connect_irq(sysbus_dev, 0, ns->irqs[1]); > - sysbus_connect_irq(sysbus_dev, 1, ns->irqs[2]); > - macio_ide_register_dma(&ns->ide[0], s->dbdma, 0x16); > - ret =3D qdev_init(DEVICE(&ns->ide[0])); > - if (ret < 0) { > - return ret; > - } > + /* IDE buses */ > + for (i =3D 0; i < ARRAY_SIZE(ns->ide); i++) { > + qemu_irq irq0 =3D ns->irqs[cur_irq++]; > + qemu_irq irq1 =3D ns->irqs[cur_irq++]; > =20 > - sysbus_dev =3D SYS_BUS_DEVICE(&ns->ide[1]); > - sysbus_connect_irq(sysbus_dev, 0, ns->irqs[3]); > - sysbus_connect_irq(sysbus_dev, 1, ns->irqs[4]); > - macio_ide_register_dma(&ns->ide[1], s->dbdma, 0x1a); > - ret =3D qdev_init(DEVICE(&ns->ide[1])); > - if (ret < 0) { > - return ret; > + ret =3D macio_initfn_ide(s, &ns->ide[i], irq0, irq1, 0x16 + (i= * 4)); > + if (ret < 0) { > + return ret; > + } > } > =20 > return 0; > @@ -249,18 +271,11 @@ static void macio_newworld_init(Object *obj) > MacIOState *s =3D MACIO(obj); > NewWorldMacIOState *ns =3D NEWWORLD_MACIO(obj); > int i; > - gchar *name; > =20 > qdev_init_gpio_out(DEVICE(obj), ns->irqs, ARRAY_SIZE(ns->irqs)); > =20 > for (i =3D 0; i < 2; i++) { > - object_initialize(&ns->ide[i], TYPE_MACIO_IDE); > - qdev_set_parent_bus(DEVICE(&ns->ide[i]), sysbus_get_default())= ; > - memory_region_add_subregion(&s->bar, 0x1f000 + ((i + 1) * 0x10= 00), > - &ns->ide[i].mem); > - name =3D g_strdup_printf("ide[%i]", i); > - object_property_add_child(obj, name, OBJECT(&ns->ide[i]), NULL= ); > - g_free(name); > + macio_init_ide(s, &ns->ide[i], i); > } > } > =20 > diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c > index 2aab54c..7422eb9 100644 > --- a/hw/ppc/mac_oldworld.c > +++ b/hw/ppc/mac_oldworld.c > @@ -268,20 +268,19 @@ static void ppc_heathrow_init(QEMUMachineInitArgs= *args) > macio =3D pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO); > dev =3D DEVICE(macio); > qdev_connect_gpio_out(dev, 0, pic[0x12]); /* CUDA */ > - qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE */ > - qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE DMA */ > + qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE-0 */ > + qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE-0 DMA */ > + qdev_connect_gpio_out(dev, 3, pic[0x0E]); /* IDE-1 */ > + qdev_connect_gpio_out(dev, 4, pic[0x03]); /* IDE-1 DMA */ > macio_init(macio, pic_mem, escc_bar); > =20 > - /* First IDE channel is a MAC IDE on the MacIO bus */ > macio_ide =3D MACIO_IDE(object_resolve_path_component(OBJECT(macio= ), > - "ide")); > + "ide[0]")); > macio_ide_init_drives(macio_ide, hd); > =20 > - /* Second IDE channel is a CMD646 on the PCI bus */ > - hd[0] =3D hd[MAX_IDE_DEVS]; > - hd[1] =3D hd[MAX_IDE_DEVS + 1]; > - hd[3] =3D hd[2] =3D NULL; > - pci_cmd646_ide_init(pci_bus, hd, 0); > + macio_ide =3D MACIO_IDE(object_resolve_path_component(OBJECT(macio= ), > + "ide[1]")); > + macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]); > =20 > dev =3D DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"= )); > adb_bus =3D qdev_get_child_bus(dev, "adb.0"); >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg