From owner-svn-soc-all@freebsd.org  Fri Aug  5 14:04:40 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 AAD22BB0423
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri,  5 Aug 2016 14:04:40 +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 9E74918D2
 for <svn-soc-all@FreeBSD.org>; Fri,  5 Aug 2016 14:04:40 +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 u75E4e82098813
 for <svn-soc-all@FreeBSD.org>; Fri, 5 Aug 2016 14:04:40 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75E4ehs098792
 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:04:40 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 5 Aug 2016 14:04:40 GMT
Message-Id: <201608051404.u75E4ehs098792@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: r307230 - 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 14:04:40 -0000

Author: vincenzo
Date: Fri Aug  5 14:04:39 2016
New Revision: 307230
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307230

Log:
   bhyve: ptnet: add CSB allocation protocol support

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 14:04:03 2016	(r307229)
+++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c	Fri Aug  5 14:04:39 2016	(r307230)
@@ -229,6 +229,19 @@
 }
 
 static void
+ptnet_csb_mapping(struct ptnet_softc *sc)
+{
+	uint64_t base = ((uint64_t)sc->ioregs[PTNET_IO_CSBBAH >> 2] << 32) |
+			sc->ioregs[PTNET_IO_CSBBAL >> 2];
+	uint64_t len = 4096;
+
+	sc->csb = NULL;
+	if (base) {
+		sc->csb = paddr_guest2host(sc->pi->pi_vmctx, base, len);
+	}
+}
+
+static void
 ptnet_bar_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
 	      int baridx, uint64_t offset, int size, uint64_t value)
 {
@@ -252,6 +265,18 @@
 			ptnet_ptctl(sc, value);
 			break;
 
+		case PTNET_IO_CTRL:
+			/* Nothing to do for now (done at regif time). */
+			break;
+
+		case PTNET_IO_CSBBAH:
+			sc->ioregs[index] = value;
+			break;
+
+		case PTNET_IO_CSBBAL:
+			sc->ioregs[index] = value;
+			ptnet_csb_mapping(sc);
+			break;
 		}
 		return;
 	}