From owner-svn-src-all@FreeBSD.ORG Sun Oct 20 01:41:00 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 38A23F97; Sun, 20 Oct 2013 01:41:00 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23C232D1A; Sun, 20 Oct 2013 01:41:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9K1f0Ae044293; Sun, 20 Oct 2013 01:41:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9K1exbj044291; Sun, 20 Oct 2013 01:40:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201310200140.r9K1exbj044291@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 20 Oct 2013 01:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256779 - head/sys/powerpc/pseries X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 01:41:00 -0000 Author: nwhitehorn Date: Sun Oct 20 01:40:59 2013 New Revision: 256779 URL: http://svnweb.freebsd.org/changeset/base/256779 Log: Clean up some debug code that snuck in. Add a block comment on future work. Modified: head/sys/powerpc/pseries/phyp_llan.c Modified: head/sys/powerpc/pseries/phyp_llan.c ============================================================================== --- head/sys/powerpc/pseries/phyp_llan.c Sun Oct 20 01:31:09 2013 (r256778) +++ head/sys/powerpc/pseries/phyp_llan.c Sun Oct 20 01:40:59 2013 (r256779) @@ -381,15 +381,14 @@ llan_send_packet(void *xsc, bus_dma_segm bufdescs[i] |= segs[i].ds_addr; } - error = phyp_hcall(H_SEND_LOGICAL_LAN, sc->unit, bufdescs[0], + phyp_hcall(H_SEND_LOGICAL_LAN, sc->unit, bufdescs[0], bufdescs[1], bufdescs[2], bufdescs[3], bufdescs[4], bufdescs[5], 0); -#if 0 - if (error) - sc->ifp->if_drv_flags |= IFF_DRV_OACTIVE; - - /* XXX: handle H_BUSY? */ - /* H_SEND_LOGICAL_LAN returning 0 implies completion of the send op */ -#endif + /* + * The hypercall returning implies completion -- or that the call will + * not complete. In principle, we should try a few times if we get back + * H_BUSY based on the continuation token in R4. For now, just drop + * the packet in such cases. + */ } static void @@ -425,9 +424,9 @@ llan_start_locked(struct ifnet *ifp) } } - bus_dmamap_load_mbuf(sc->tx_dma_tag, sc->tx_dma_map, //xfer->dmamap, + bus_dmamap_load_mbuf(sc->tx_dma_tag, sc->tx_dma_map, mb_head, llan_send_packet, sc, 0); - bus_dmamap_unload(sc->tx_dma_tag, sc->tx_dma_map); // XXX + bus_dmamap_unload(sc->tx_dma_tag, sc->tx_dma_map); m_freem(mb_head); } }