From owner-svn-soc-all@freebsd.org Fri Aug 5 14:03:11 2016 Return-Path: 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 DEA3CBB02F8 for ; Fri, 5 Aug 2016 14:03:11 +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 B91C4174E for ; Fri, 5 Aug 2016 14:03:11 +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 u75E3BH1096364 for ; Fri, 5 Aug 2016 14:03:11 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75E3A3w096280 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:03:10 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:03:10 GMT Message-Id: <201608051403.u75E3A3w096280@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: r307228 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 14:03:12 -0000 Author: vincenzo Date: Fri Aug 5 14:03:10 2016 New Revision: 307228 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307228 Log: bhyve: ptnet: implement PTNET_IO_PTFEAT register write Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h Fri Aug 5 14:02:19 2016 (r307227) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h Fri Aug 5 14:03:10 2016 (r307228) @@ -112,10 +112,12 @@ uint16_t num_rx_slots; }; +int ptn_memdev_attach(void *mem_ptr, uint32_t mem_size, uint16_t mem_id); int ptnetmap_get_netmap_if(struct ptnetmap_state *ptn, struct netmap_if_info *nif); struct ptnetmap_state * get_ptnetmap(struct net_backend *be); -int ptn_memdev_attach(void *mem_ptr, uint32_t mem_size, uint16_t mem_id); +uint32_t ptnetmap_ack_features(struct ptnetmap_state *ptn, + uint32_t wanted_features); #include "pci_emul.h" 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:02:19 2016 (r307227) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:03:10 2016 (r307228) @@ -98,7 +98,7 @@ if (sc == NULL) return 0; - offset = offset & PTNET_IO_MASK; + offset &= PTNET_IO_MASK; if (baridx == PTNETMAP_IO_PCI_BAR && offset < PTNET_IO_END) { switch (offset) { @@ -127,10 +127,24 @@ int baridx, uint64_t offset, int size, uint64_t value) { struct ptnet_softc *sc = pi->pi_arg; + unsigned int index; if (sc == NULL) return; + offset &= PTNET_IO_MASK; + index = offset >> 2; + + if (baridx == PTNETMAP_IO_PCI_BAR && offset < PTNET_IO_END) { + switch (offset) { + case PTNET_IO_PTFEAT: + value = ptnetmap_ack_features(sc->ptbe, value); + sc->ioregs[index] = value; + break; + } + return; + } + fprintf(stderr, "%s: Unexpected register write [bar %u, offset %lx " "size %d value %lx]\n", __func__, baridx, offset, size, value); } @@ -181,6 +195,7 @@ sc->be = netbe_init(devname, NULL, sc); if (!sc->be) { fprintf(stderr, "net backend initialization failed\n"); + return -1; } free(devname);