From owner-p4-projects@FreeBSD.ORG Mon Oct 26 15:16:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 949C71065676; Mon, 26 Oct 2009 15:16:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F02B106566C for ; Mon, 26 Oct 2009 15:16:39 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FB768FC0A for ; Mon, 26 Oct 2009 15:16:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9QFGctZ018131 for ; Mon, 26 Oct 2009 15:16:38 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9QFGcit018129 for perforce@freebsd.org; Mon, 26 Oct 2009 15:16:38 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 26 Oct 2009 15:16:38 GMT Message-Id: <200910261516.n9QFGcit018129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2009 15:16:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=169828 Change 169828 by yohanes@econa on 2009/10/26 15:16:38 clean up comments Affected files ... .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#9 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#2 edit Differences ... ==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#9 (text+ko) ==== @@ -548,7 +548,7 @@ return (ENXIO); } - /* Allocate a busdma tag for mbufs. */ + /* Allocate a busdma tag for mbufs. Alignment is 2 bytes */ error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ @@ -778,7 +778,9 @@ eth_rx_desc_t *descrx; int i; int error; + + /*create parent tag for tx and rx*/ error = bus_dma_tag_create( bus_get_dma_tag(sc->dev), /* parent */ @@ -832,7 +834,6 @@ ece_activate(device_t dev) { struct ece_softc *sc; - //int rid; int err; uint32_t mac_port_config; uint32_t cpu_port_config; @@ -1412,8 +1413,6 @@ fssd = (fssd_curr - (uint32_t)sc->ring_paddr_rx)>>4; -// printf("fssd = %d\n", fssd); - desc = sc->rx_desc[sc->last_rx].desc; if (fssd > sc->last_rx) { @@ -1433,7 +1432,6 @@ sc->dmamap_ring_rx, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - //printf("starting to read\n"); for (i= 0; itx_cons==sc->tx_prod) return; + /*prepare to read the ring (owner bit)*/ bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmamap_ring_tx, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - while (sc->tx_cons!=sc->tx_prod) { desc = sc->tx_desc[sc->tx_cons].desc; if (desc->cown != 0) { struct tx_desc_info *td = &(sc->tx_desc[sc->tx_cons]); + /*we are finished with this descriptor*/ + /*sync*/ bus_dmamap_sync(sc->dmatag_data_tx, td->dmamap, BUS_DMASYNC_POSTWRITE); + /*and unload, so we can reuse */ bus_dmamap_unload(sc->dmatag_data_tx, td->dmamap); m_freem(td->buff); td->buff = 0; @@ -1585,7 +1586,6 @@ } - static void ece_intr_qf(void *xsc) { ==== //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#2 (text+ko) ==== @@ -113,9 +113,12 @@ bus_dmamap_t dmamap_ring_tx; bus_dmamap_t dmamap_ring_rx; + + /*dma tag for ring*/ bus_dma_tag_t dmatag_ring_tx; bus_dma_tag_t dmatag_ring_rx; + /*dma tag for data*/ bus_dma_tag_t dmatag_data_tx; bus_dma_tag_t dmatag_data_rx; @@ -126,13 +129,16 @@ /*ring physical address*/ bus_addr_t ring_paddr_tx; bus_addr_t ring_paddr_rx; - + + /*index of last received descritor*/ uint32_t last_rx; struct rx_desc_info rx_desc[ECE_MAX_RX_BUFFERS]; - uint32_t tx_prod; + /* tx producer index */ + uint32_t tx_prod; + /* tx consumer index */ uint32_t tx_cons; - /*ring index*/ + /* tx ring index*/ uint32_t desc_curr_tx; struct tx_desc_info tx_desc[ECE_MAX_TX_BUFFERS];