From owner-svn-src-user@FreeBSD.ORG Sat Apr 24 20:39:19 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3231D1065670; Sat, 24 Apr 2010 20:39:19 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 21F1F8FC16; Sat, 24 Apr 2010 20:39:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3OKdJKI040376; Sat, 24 Apr 2010 20:39:19 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3OKdJi6040374; Sat, 24 Apr 2010 20:39:19 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004242039.o3OKdJi6040374@svn.freebsd.org> From: Juli Mallett Date: Sat, 24 Apr 2010 20:39:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207159 - user/jmallett/octeon/sys/mips/cavium/octe X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 20:39:19 -0000 Author: jmallett Date: Sat Apr 24 20:39:18 2010 New Revision: 207159 URL: http://svn.freebsd.org/changeset/base/207159 Log: o) Uncomment some prefetches. o) Adjust m_data by the offset within the buffer of the packet. Now packet receive actually works. Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c Sat Apr 24 19:52:07 2010 (r207158) +++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c Sat Apr 24 20:39:18 2010 (r207159) @@ -203,9 +203,7 @@ void cvm_oct_tasklet_rx(void *context, i else work = NULL; } -#if 0 - prefetch(work); -#endif + CVMX_PREFETCH(work, 0); if (work == NULL) break; @@ -224,10 +222,8 @@ void cvm_oct_tasklet_rx(void *context, i mbuf_in_hw = USE_MBUFS_IN_HW && work->word2.s.bufs == 1; if ((mbuf_in_hw)) { m = *(struct mbuf **)(cvm_oct_get_buffer_ptr(work->packet_ptr) - sizeof(void *)); -#if 0 - CVMX_PREFETCH(m, offsetof(struct mbuf, head)); - CVMX_PREFETCH(m, offsetof(struct mbuf, len)); -#endif + CVMX_PREFETCH(m, offsetof(struct mbuf, m_data)); + CVMX_PREFETCH(m, offsetof(struct mbuf, m_pkthdr)); } CVMX_PREFETCH(cvm_oct_device[work->ipprt], 0); //CVMX_PREFETCH(m, 0); @@ -248,6 +244,12 @@ void cvm_oct_tasklet_rx(void *context, i m->m_pkthdr.len = m->m_len = work->len; packet_not_copied = 1; + + /* + * Adjust the data pointer based on the offset + * of the packet within the buffer. + */ + m->m_data += (work->packet_ptr.s.back << 7) + (work->packet_ptr.s.addr & 0x7f); } else { /* We have to copy the packet. First allocate an