From patchwork Mon Dec 19 11:53:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 132221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 649BEB7030 for ; Mon, 19 Dec 2011 23:25:41 +1100 (EST) Received: from localhost ([::1]:36284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcbnj-0002X8-Md for incoming@patchwork.ozlabs.org; Mon, 19 Dec 2011 06:54:39 -0500 Received: from eggs.gnu.org ([140.186.70.92]:49119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcbnI-0001SU-WF for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcbnC-00018M-9Q for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:54:12 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:19053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcbnC-00018B-0m for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:54:06 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0LWG001SK924IS40@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 19 Dec 2011 11:54:04 +0000 (GMT) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.48]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LWG00HE891GSM@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 19 Dec 2011 11:54:04 +0000 (GMT) Date: Mon, 19 Dec 2011 15:53:36 +0400 From: Evgeny Voevodin In-reply-to: <1324295617-5798-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1324295617-5798-11-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1324295617-5798-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.14 Cc: m.kozlov@samsung.com, d.solodkiy@samsung.com, Evgeny Voevodin Subject: [Qemu-devel] [PATCH v4 10/11] hw/exynos4210.c: Add LAN support for SMDKC210. 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 SMDKC210 uses lan9215 chip, but lan9118 in 16-bit mode seems to be enough. Signed-off-by: Evgeny Voevodin --- hw/exynos4_boards.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c index 5410a6f..a005e0a 100644 --- a/hw/exynos4_boards.c +++ b/hw/exynos4_boards.c @@ -22,6 +22,8 @@ */ #include "sysemu.h" +#include "sysbus.h" +#include "net.h" #include "arm-misc.h" #include "exec-memory.h" #include "exynos4210.h" @@ -41,6 +43,8 @@ #define PRINT_DEBUG(fmt, args...) do {} while (0) #endif +#define SMDK_LAN9118_BASE_ADDR 0x05000000 + typedef enum exynos4_board_type { EXYNOS4_BOARD_NURI, EXYNOS4_BOARD_SMDKC210, @@ -67,6 +71,24 @@ static struct arm_boot_info exynos4_board_binfo = { .smp_loader_start = EXYNOS4210_SMP_BOOT_ADDR, }; +static void lan9215_init(uint32_t base, qemu_irq irq) +{ + DeviceState *dev; + SysBusDevice *s; + + /* This should be a 9215 but the 9118 is close enough */ + if (nd_table[0].vlan) { + qemu_check_nic_model(&nd_table[0], "lan9118"); + dev = qdev_create(NULL, "lan9118"); + qdev_set_nic_properties(dev, &nd_table[0]); + qdev_prop_set_uint32(dev, "mode_16bit", 1); + qdev_init_nofail(dev); + s = sysbus_from_qdev(dev); + sysbus_mmio_map(s, 0, base); + sysbus_connect_irq(s, 0, irq); + } +} + static Exynos4210State *exynos4_boards_init_common( const char *kernel_filename, const char *kernel_cmdline, @@ -113,9 +135,12 @@ static void smdkc210_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - exynos4_boards_init_common(kernel_filename, + Exynos4210State *s = exynos4_boards_init_common(kernel_filename, kernel_cmdline, initrd_filename, EXYNOS4_BOARD_SMDKC210); + lan9215_init(SMDK_LAN9118_BASE_ADDR, + qemu_irq_invert(s->irq_table[exynos4210_get_irq(37, 1)])); + arm_load_kernel(first_cpu, &exynos4_board_binfo); }