From owner-svn-src-head@freebsd.org  Fri Jul  3 14:46:58 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C599994FDA;
 Fri,  3 Jul 2015 14:46:58 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D4671FEE;
 Fri,  3 Jul 2015 14:46:58 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63Ekwb5055087;
 Fri, 3 Jul 2015 14:46:58 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63Ekwla055084;
 Fri, 3 Jul 2015 14:46:58 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201507031446.t63Ekwla055084@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Fri, 3 Jul 2015 14:46:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285095 - in head/sys: boot/fdt/dts/mips mips/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2015 14:46:58 -0000

Author: br
Date: Fri Jul  3 14:46:57 2015
New Revision: 285095
URL: https://svnweb.freebsd.org/changeset/base/285095

Log:
  o Add a description for virtio block device implemented
    in PISM (Bluespec C-interface device)
  o Add a kernel config
  
  Sponsored by:	HEIF5

Added:
  head/sys/mips/conf/BERI_SIM_VIRTIO   (contents, props changed)
Modified:
  head/sys/boot/fdt/dts/mips/beri-sim.dts

Modified: head/sys/boot/fdt/dts/mips/beri-sim.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-sim.dts	Fri Jul  3 14:29:55 2015	(r285094)
+++ head/sys/boot/fdt/dts/mips/beri-sim.dts	Fri Jul  3 14:46:57 2015	(r285095)
@@ -128,6 +128,18 @@
 			reg = <0x7f002000 0x40>;
 		};
 
+		virtio_mmio_platform0: virtio_mmio_platform@0 {
+			compatible = "beri,virtio_mmio_platform";
+			interrupts = <1>;
+			interrupt-parent = <&beripic0>;
+		};
+
+		virtio_block@7f020000 {
+			compatible = "virtio,mmio";
+			reg = <0x7f020000 0x1000>;
+			platform = <&virtio_mmio_platform0>;
+		};
+
 		sdcard@7f008000 {
 			compatible = "altera,sdcard_11_2011";
 			reg = <0x7f008000 0x400>;

Added: head/sys/mips/conf/BERI_SIM_VIRTIO
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/conf/BERI_SIM_VIRTIO	Fri Jul  3 14:46:57 2015	(r285095)
@@ -0,0 +1,20 @@
+#
+# BERI_SIM_VIRTIO -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC Implementation) FPGA soft core, as configured for simulation.
+#
+# $FreeBSD$
+#
+
+include "BERI_SIM_BASE"
+
+ident		BERI_SIM_VIRTIO
+
+device		virtio
+device		virtio_blk
+device		virtio_mmio
+device		altera_pio
+
+#
+# This kernel expects to find its root filesystem on the SD Card.
+#
+options 	ROOTDEVNAME=\"ufs:/dev/vtbd0\"