From owner-svn-soc-all@freebsd.org  Fri Aug  5 13:56:39 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@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 9CBDABAFEEC
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri,  5 Aug 2016 13:56:39 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 903AB1E98
 for <svn-soc-all@FreeBSD.org>; Fri,  5 Aug 2016 13:56:39 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u75DudqO040049
 for <svn-soc-all@FreeBSD.org>; Fri, 5 Aug 2016 13:56:39 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75DudHj040039
 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 13:56:39 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 5 Aug 2016 13:56:39 GMT
Message-Id: <201608051356.u75DudHj040039@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 vincenzo@FreeBSD.org using -f
From: vincenzo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r307221 - soc2016/vincenzo/head/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2016 13:56:39 -0000

Author: vincenzo
Date: Fri Aug  5 13:56:38 2016
New Revision: 307221
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307221

Log:
   bhyve: ptnet: add I/O register data structure

Modified:
  soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c

Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c
==============================================================================
--- soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c	Fri Aug  5 13:55:46 2016	(r307220)
+++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c	Fri Aug  5 13:56:38 2016	(r307221)
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <net/if.h>	/* IFNAMSIZ */
 #include <net/netmap.h>
@@ -48,7 +49,12 @@
 
 
 struct ptnet_softc {
-	struct pci_devinst *pi;		/* PCI device instance */
+	struct pci_devinst	*pi;
+
+	struct ptnetmap_state	*ptbe;
+	unsigned int		num_rings;
+	uint32_t		ioregs[PTNET_IO_END >> 2];
+	void			*csb;
 };
 
 static uint64_t
@@ -65,8 +71,8 @@
 		}
 	}
 
-	printf("%s: Unexpected register read [bar %u, offset %lx size %d]\n",
-		__func__, baridx, offset, size);
+	fprintf(stderr, "%s: Unexpected register read [bar %u, offset %lx "
+		"size %d]\n", __func__, baridx, offset, size);
 
 	return 0;
 }
@@ -80,8 +86,8 @@
 	if (sc == NULL)
 		return;
 
-	printf("%s: Unexpected register write [bar %u, offset %lx size %d "
-	       "value %lx]\n", __func__, baridx, offset, size, value);
+	fprintf(stderr, "%s: Unexpected register write [bar %u, offset %lx "
+		"size %d value %lx]\n", __func__, baridx, offset, size, value);
 }
 
 /* PCI device initialization. */
@@ -118,6 +124,12 @@
 		return ret;
 	}
 
+	/* Initialize registers and data structures. */
+	memset(sc->ioregs, 0, sizeof(sc->ioregs));
+	sc->csb = NULL;
+	sc->num_rings = 0;
+	sc->ptbe = NULL;
+
 	return 0;
 }