From patchwork Wed Apr 25 05:54:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 154805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 011C9B6F13 for ; Wed, 25 Apr 2012 15:56:02 +1000 (EST) Received: from localhost ([::1]:47349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvCp-0005tF-TT for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 01:55:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBX-0002xP-NC for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMvBU-0006lv-Sk for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:38 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:37586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBU-0006jf-Lb for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:36 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M3000H02TQ4CC80@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:04 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.9.191]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M300064STQJKX@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:32 +0100 (BST) Date: Wed, 25 Apr 2012 09:54:17 +0400 From: Evgeny Voevodin In-reply-to: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335333257-5128-10-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.5.4 References: <1335333257-5128-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.13 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, i.mitsyanko@samsung.com, Evgeny Voevodin , kyungmin.park@samsung.com, d.solodkiy@samsung.com, m.kozlov@samsung.com Subject: [Qemu-devel] [RFC 9/9] hw/exynos4210.c: Create two virtio-mmio transport instances. 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 NB: This is for test purposes only. Signed-off-by: Evgeny Voevodin --- hw/exynos4210.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/exynos4210.c b/hw/exynos4210.c index afc4bdc..e065a86 100644 --- a/hw/exynos4210.c +++ b/hw/exynos4210.c @@ -26,6 +26,7 @@ #include "sysbus.h" #include "arm-misc.h" #include "loader.h" +#include "virtio-mmio.h" #include "exynos4210.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 @@ -62,6 +63,11 @@ /* Display controllers (FIMD) */ #define EXYNOS4210_FIMD0_BASE_ADDR 0x11C00000 +/* VirtIO BLK */ +#define EXYNOS4210_VIRTIO_BLK_BASE_ADDR 0x10AD0000 +/* VirtIO NET */ +#define EXYNOS4210_VIRTIO_NET_BASE_ADDR 0x10AC0000 + static uint8_t chipid_and_omr[] = { 0x11, 0x02, 0x21, 0x43, 0x09, 0x00, 0x00, 0x00 }; @@ -105,6 +111,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, unsigned long mem_size; DeviceState *dev; SysBusDevice *busdev; + BusState *virtio_bus; for (n = 0; n < EXYNOS4210_NCPUS; n++) { s->env[n] = cpu_init("cortex-a9"); @@ -296,5 +303,10 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, s->irq_table[exynos4210_get_irq(11, 2)], NULL); + virtio_bus = virtio_mmio_bus_init(); + virtio_mmio_create_transport(virtio_bus, EXYNOS4210_VIRTIO_BLK_BASE_ADDR, + s->irq_table[exynos4210_get_irq(37, 3)]); + virtio_mmio_create_transport(virtio_bus, EXYNOS4210_VIRTIO_NET_BASE_ADDR, + s->irq_table[exynos4210_get_irq(37, 2)]); return s; }