From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Csf-0006Xy-4t for qemu-devel@nongnu.org; Sat, 25 Jan 2014 18:43:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7CsV-0008Dt-CD for qemu-devel@nongnu.org; Sat, 25 Jan 2014 18:43:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55139 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7CsU-0008Dl-Uo for qemu-devel@nongnu.org; Sat, 25 Jan 2014 18:43:07 -0500 Message-ID: <52E44C03.7060806@suse.de> Date: Sun, 26 Jan 2014 00:42:59 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1390173920-23410-1-git-send-email-b.galvani@gmail.com> <1390173920-23410-3-git-send-email-b.galvani@gmail.com> In-Reply-To: <1390173920-23410-3-git-send-email-b.galvani@gmail.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 2/2] hw/arm/allwinner-a10: initialize EMAC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Beniamino Galvani , qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Li Guang , Stefan Hajnoczi Am 20.01.2014 00:25, schrieb Beniamino Galvani: > Signed-off-by: Beniamino Galvani > --- > hw/arm/allwinner-a10.c | 16 ++++++++++++++++ > hw/arm/cubieboard.c | 7 +++++++ > include/hw/arm/allwinner-a10.h | 3 +++ > 3 files changed, 26 insertions(+) >=20 > diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c > index 4658e19..416cd49 100644 > --- a/hw/arm/allwinner-a10.c > +++ b/hw/arm/allwinner-a10.c > @@ -31,6 +31,13 @@ static void aw_a10_init(Object *obj) > =20 > object_initialize(&s->timer, sizeof(s->timer), TYPE_AW_A10_PIT); > qdev_set_parent_bus(DEVICE(&s->timer), sysbus_get_default()); > + > + object_initialize(&s->emac, sizeof(s->emac), TYPE_AW_EMAC); > + qdev_set_parent_bus(DEVICE(&s->emac), sysbus_get_default()); > + if (nd_table[0].used) { > + qemu_check_nic_model(&nd_table[0], "allwinner_emac"); Please adopt new-style names with dashes, i.e. "allwinner-emac". Peter C.'s comment wrt TYPE_* still applies though. > + qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); Since you're using DEVICE() twice, you should consider using a local variable like you did for sysbusdev below. It's a one-time initialization though, so not mandatory. > + } > } > =20 > static void aw_a10_realize(DeviceState *dev, Error **errp) > @@ -76,6 +83,15 @@ static void aw_a10_realize(DeviceState *dev, Error *= *errp) > sysbus_connect_irq(sysbusdev, 4, s->irq[67]); > sysbus_connect_irq(sysbusdev, 5, s->irq[68]); > =20 > + object_property_set_bool(OBJECT(&s->emac), true, "realized", &err)= ; > + if (err !=3D NULL) { > + error_propagate(errp, err); > + return; > + } > + sysbusdev =3D SYS_BUS_DEVICE(&s->emac); > + sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE); > + sysbus_connect_irq(sysbusdev, 0, s->irq[55]); > + > serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->i= rq[1], > 115200, serial_hds[0], DEVICE_NATIVE_ENDIAN); > } > diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c > index 3fcb6d2..b3f8f51 100644 > --- a/hw/arm/cubieboard.c > +++ b/hw/arm/cubieboard.c > @@ -36,6 +36,13 @@ static void cubieboard_init(QEMUMachineInitArgs *arg= s) > Error *err =3D NULL; > =20 > s->a10 =3D AW_A10(object_new(TYPE_AW_A10)); > + > + object_property_set_int(OBJECT(&s->a10->emac), 1, "phyaddr", &err)= ; "phy-addr"? > + if (err !=3D NULL) { > + error_report("Couldn't set phy address: %s\n", error_get_prett= y(err)); error_report() always without trailing \n. > + exit(1); > + } > + > object_property_set_bool(OBJECT(s->a10), true, "realized", &err); > if (err !=3D NULL) { > error_report("Couldn't realize Allwinner A10: %s\n", Bad example. ;) Fixes welcome. Cheers, Andreas > diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-= a10.h > index da36647..01a189b 100644 > --- a/include/hw/arm/allwinner-a10.h > +++ b/include/hw/arm/allwinner-a10.h > @@ -6,6 +6,7 @@ > #include "hw/arm/arm.h" > #include "hw/timer/allwinner-a10-pit.h" > #include "hw/intc/allwinner-a10-pic.h" > +#include "hw/net/allwinner_emac.h" > =20 > #include "sysemu/sysemu.h" > #include "exec/address-spaces.h" > @@ -14,6 +15,7 @@ > #define AW_A10_PIC_REG_BASE 0x01c20400 > #define AW_A10_PIT_REG_BASE 0x01c20c00 > #define AW_A10_UART0_REG_BASE 0x01c28000 > +#define AW_A10_EMAC_BASE 0x01c0b000 > =20 > #define AW_A10_SDRAM_BASE 0x40000000 > =20 > @@ -29,6 +31,7 @@ typedef struct AwA10State { > qemu_irq irq[AW_A10_PIC_INT_NR]; > AwA10PITState timer; > AwA10PICState intc; > + AwEmacState emac; > } AwA10State; > =20 > #define ALLWINNER_H_ >=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