[src/netbsd-9]: src/sys/dev/hyperv Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47cf60ec8ca9
branches:  netbsd-9
changeset: 461418:47cf60ec8ca9
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 25 16:58:54 2019 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #480):

        sys/dev/hyperv/hvs.c: revision 1.3
        sys/dev/hyperv/if_hvn.c: revision 1.10

hvs(4), hvn(4): Set correct size for bus_dmamap_sync(9).

diffstat:

 sys/dev/hyperv/hvs.c    |   7 ++++---
 sys/dev/hyperv/if_hvn.c |  16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (86 lines):

diff -r a0541bc9aaea -r 47cf60ec8ca9 sys/dev/hyperv/hvs.c
--- a/sys/dev/hyperv/hvs.c      Mon Nov 25 16:55:09 2019 +0000
+++ b/sys/dev/hyperv/hvs.c      Mon Nov 25 16:58:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hvs.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $   */
+/*     $NetBSD: hvs.c,v 1.1.8.1 2019/11/25 16:58:54 martin Exp $       */
 /*     $OpenBSD: hvs.c,v 1.17 2017/08/10 17:22:48 mikeb Exp $  */
 
 /*-
@@ -37,7 +37,7 @@
 /* #define HVS_DEBUG_IO */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.1.8.1 2019/11/25 16:58:54 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1095,7 +1095,8 @@
                if (ccb->ccb_dmap == NULL)
                        continue;
 
-               bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmap, 0, 0,
+               bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmap,
+                   0, ccb->ccb_dmap->dm_mapsize,
                    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
                bus_dmamap_unload(sc->sc_dmat, ccb->ccb_dmap);
                bus_dmamap_destroy(sc->sc_dmat, ccb->ccb_dmap);
diff -r a0541bc9aaea -r 47cf60ec8ca9 sys/dev/hyperv/if_hvn.c
--- a/sys/dev/hyperv/if_hvn.c   Mon Nov 25 16:55:09 2019 +0000
+++ b/sys/dev/hyperv/if_hvn.c   Mon Nov 25 16:58:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $    */
+/*     $NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $    */
 /*     $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $       */
 
 /*-
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -632,7 +632,8 @@
 {
        struct ifnet *ifp = SC2IFP(sc);
 
-       bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+       bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+           0, txd->txd_dmap->dm_mapsize,
            BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
        bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
        txd->txd_buf = NULL;
@@ -667,7 +668,8 @@
        }
        txd->txd_buf = NULL;
 
-       bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+       bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+           0, txd->txd_dmap->dm_mapsize,
            BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
        bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
        m_freem(m);
@@ -844,7 +846,8 @@
                txd = &sc->sc_tx_desc[i];
                if (txd->txd_dmap == NULL)
                        continue;
-               bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+               bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+                   0, txd->txd_dmap->dm_mapsize,
                    BUS_DMASYNC_POSTWRITE);
                bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
                bus_dmamap_destroy(sc->sc_dmat, txd->txd_dmap);
@@ -855,7 +858,8 @@
                txd->txd_buf = NULL;
        }
        if (sc->sc_tx_rmap) {
-               bus_dmamap_sync(sc->sc_dmat, sc->sc_tx_rmap, 0, 0,
+               bus_dmamap_sync(sc->sc_dmat, sc->sc_tx_rmap,
+                   0, txd->txd_dmap->dm_mapsize,
                    BUS_DMASYNC_POSTWRITE);
                bus_dmamap_unload(sc->sc_dmat, sc->sc_tx_rmap);
                bus_dmamap_destroy(sc->sc_dmat, sc->sc_tx_rmap);