Module Name: src
Committed By: martin
Date: Mon Jun 18 15:39:49 UTC 2018
Modified Files:
src/sys/dev/ic [netbsd-8]: dwc_gmac.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #885):
sys/dev/ic/dwc_gmac.c: revision 1.47
Avoid calling bus_dmamap_sync with len=0
To generate a diff of this commit:
cvs rdiff -u -r1.40.6.3 -r1.40.6.4 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.40.6.3 src/sys/dev/ic/dwc_gmac.c:1.40.6.4
--- src/sys/dev/ic/dwc_gmac.c:1.40.6.3 Sat Jan 13 04:44:29 2018
+++ src/sys/dev/ic/dwc_gmac.c Mon Jun 18 15:39:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.40.6.3 2018/01/13 04:44:29 snj Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.40.6.4 2018/06/18 15:39:49 martin Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.3 2018/01/13 04:44:29 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.4 2018/06/18 15:39:49 martin Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -636,11 +636,13 @@ dwc_gmac_txdesc_sync(struct dwc_gmac_sof
TX_DESC_OFFSET(start),
TX_DESC_OFFSET(AWGE_TX_RING_COUNT)-TX_DESC_OFFSET(start),
ops);
- /* sync from start of ring to 'end' */
- bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map,
- TX_DESC_OFFSET(0),
- TX_DESC_OFFSET(end)-TX_DESC_OFFSET(0),
- ops);
+ if (TX_DESC_OFFSET(end) - TX_DESC_OFFSET(0) > 0) {
+ /* sync from start of ring to 'end' */
+ bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map,
+ TX_DESC_OFFSET(0),
+ TX_DESC_OFFSET(end)-TX_DESC_OFFSET(0),
+ ops);
+ }
}
static void
