From owner-svn-src-projects@FreeBSD.ORG Wed Jul 8 02:21:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CA0E106567B; Wed, 8 Jul 2009 02:21:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 609818FC20; Wed, 8 Jul 2009 02:21:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n682L81p035471; Wed, 8 Jul 2009 02:21:08 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n682L8u9035469; Wed, 8 Jul 2009 02:21:08 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200907080221.n682L8u9035469@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 8 Jul 2009 02:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195434 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2009 02:21:08 -0000 Author: gonzo Date: Wed Jul 8 02:21:08 2009 New Revision: 195434 URL: http://svn.freebsd.org/changeset/base/195434 Log: - Fix off-by-one bug in arge_fixup_rx. If mbuf is located by the end of the page and even number of bytes long, that may cause TLBMiss exception for unallocated address. - Fix mess with DMA sync opeartions Modified: projects/mips/sys/mips/atheros/if_arge.c Modified: projects/mips/sys/mips/atheros/if_arge.c ============================================================================== --- projects/mips/sys/mips/atheros/if_arge.c Wed Jul 8 02:12:47 2009 (r195433) +++ projects/mips/sys/mips/atheros/if_arge.c Wed Jul 8 02:21:08 2009 (r195434) @@ -162,7 +162,6 @@ DRIVER_MODULE(miibus, arge, miibus_drive */ extern uint32_t ar711_base_mac[ETHER_ADDR_LEN]; - /* * Flushes all */ @@ -1323,7 +1322,7 @@ arge_rx_ring_init(struct arge_softc *sc) bus_dmamap_sync(sc->arge_cdata.arge_rx_ring_tag, sc->arge_cdata.arge_rx_ring_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREWRITE); return (0); } @@ -1356,8 +1355,6 @@ arge_newbuf(struct arge_softc *sc, int i rxd = &sc->arge_cdata.arge_rxdesc[idx]; if (rxd->rx_m != NULL) { - bus_dmamap_sync(sc->arge_cdata.arge_rx_tag, rxd->rx_dmamap, - BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->arge_cdata.arge_rx_tag, rxd->rx_dmamap); } map = rxd->rx_dmamap; @@ -1370,6 +1367,10 @@ arge_newbuf(struct arge_softc *sc, int i desc->packet_addr = segs[0].ds_addr; desc->packet_ctrl = ARGE_DESC_EMPTY | ARGE_DMASIZE(segs[0].ds_len); + bus_dmamap_sync(sc->arge_cdata.arge_rx_ring_tag, + sc->arge_cdata.arge_rx_ring_map, + BUS_DMASYNC_PREWRITE); + return (0); } @@ -1382,8 +1383,12 @@ arge_fixup_rx(struct mbuf *m) src = mtod(m, uint16_t *); dst = src - 1; - for (i = 0; i < (m->m_len / sizeof(uint16_t) + 1); i++) + for (i = 0; i < m->m_len / sizeof(uint16_t); i++) { *dst++ = *src++; + } + + if (m->m_len % sizeof(uint16_t)) + *(uint8_t *)dst = *(uint8_t *)src; m->m_data -= ETHER_ALIGN; } @@ -1497,7 +1502,7 @@ arge_rx_locked(struct arge_softc *sc) packet_len = ARGE_DMASIZE(cur_rx->packet_ctrl); bus_dmamap_sync(sc->arge_cdata.arge_rx_tag, rxd->rx_dmamap, - BUS_DMASYNC_PREREAD); + BUS_DMASYNC_POSTREAD); m = rxd->rx_m; arge_fixup_rx(m); @@ -1526,14 +1531,9 @@ arge_rx_locked(struct arge_softc *sc) bus_dmamap_sync(sc->arge_cdata.arge_rx_ring_tag, sc->arge_cdata.arge_rx_ring_map, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - + BUS_DMASYNC_PREWRITE); sc->arge_cdata.arge_rx_cons = cons; - - bus_dmamap_sync(sc->arge_cdata.arge_rx_ring_tag, - sc->arge_cdata.arge_rx_ring_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } }