From patchwork Sun Jan 19 23:25:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 312415 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 BAB382C0092 for ; Mon, 20 Jan 2014 10:26:57 +1100 (EST) Received: from localhost ([::1]:47931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W51lW-00016l-J6 for incoming@patchwork.ozlabs.org; Sun, 19 Jan 2014 18:26:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W51kp-0008Gq-3a for qemu-devel@nongnu.org; Sun, 19 Jan 2014 18:26:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W51kg-00078o-J3 for qemu-devel@nongnu.org; Sun, 19 Jan 2014 18:26:11 -0500 Received: from mail-ee0-x230.google.com ([2a00:1450:4013:c00::230]:41361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W51kg-00078b-Ch for qemu-devel@nongnu.org; Sun, 19 Jan 2014 18:26:02 -0500 Received: by mail-ee0-f48.google.com with SMTP id t10so3067854eei.35 for ; Sun, 19 Jan 2014 15:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qRvY/NtJOpV9h6j+1+0hduiQsEH7bk8D2o7S3nmqy7c=; b=N6gA5VFmwO55D2tb6wph2rgsv7wB3Ll3oQQSGnS/GopDPbCF5ToNvaWnbHp6/i16qS a1xYHUpE9jh/mwBn9LclXxocTc494u3fhbHXNF9g7CiInO/bybGSdKmIo2T/8QA81N46 FaxRPQ+/NeSqxSKNWYotkgh91Coo70XYRTFot6cxHUs89U0O1oRufNWltGZu6F76/dKX ntHA2CskRIAFdg1isUOR0fu1YjbfenERcIrGJx0/JxcAoK7TH1R40Qev9Se/ZP220BOL conlfuqIjaf/ifGKTHBhGbhVYVDSIDQ/uCFHTaNAiBMCW+w0KsRbu3YwnPJCeynZP9x0 FewQ== X-Received: by 10.15.51.204 with SMTP id n52mr14901965eew.26.1390173961643; Sun, 19 Jan 2014 15:26:01 -0800 (PST) Received: from sark.local (host200-30-dynamic.31-79-r.retail.telecomitalia.it. [79.31.30.200]) by mx.google.com with ESMTPSA id l4sm47526122een.13.2014.01.19.15.25.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jan 2014 15:26:01 -0800 (PST) From: Beniamino Galvani To: qemu-devel@nongnu.org Date: Mon, 20 Jan 2014 00:25:19 +0100 Message-Id: <1390173920-23410-3-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390173920-23410-1-git-send-email-b.galvani@gmail.com> References: <1390173920-23410-1-git-send-email-b.galvani@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::230 Cc: Beniamino Galvani , Peter Maydell , Peter Crosthwaite , Li Guang , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3 2/2] hw/arm/allwinner-a10: initialize EMAC 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 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(+) 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) 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"); + qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); + } } 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]); + object_property_set_bool(OBJECT(&s->emac), true, "realized", &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } + sysbusdev = 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->irq[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 *args) Error *err = NULL; s->a10 = AW_A10(object_new(TYPE_AW_A10)); + + object_property_set_int(OBJECT(&s->a10->emac), 1, "phyaddr", &err); + if (err != NULL) { + error_report("Couldn't set phy address: %s\n", error_get_pretty(err)); + exit(1); + } + object_property_set_bool(OBJECT(s->a10), true, "realized", &err); if (err != NULL) { error_report("Couldn't realize Allwinner A10: %s\n", 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" #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 #define AW_A10_SDRAM_BASE 0x40000000 @@ -29,6 +31,7 @@ typedef struct AwA10State { qemu_irq irq[AW_A10_PIC_INT_NR]; AwA10PITState timer; AwA10PICState intc; + AwEmacState emac; } AwA10State; #define ALLWINNER_H_