[src/netbsd-9]: src/sys/arch/vax/vsa Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/35dc0eb1d557
branches:  netbsd-9
changeset: 746165:35dc0eb1d557
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Mar 23 10:06:26 2020 +0000

description:
Pull up following revision(s) (requested by ragge in ticket #802):

        sys/arch/vax/vsa/ncr.c: revision 1.50

Do not expect a struct buf to be present if doing DMA to kernel space.
Fixes bug reported by sadness on port-vax.

diffstat:

 sys/arch/vax/vsa/ncr.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 3e4e59ce0bd1 -r 35dc0eb1d557 sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Mon Mar 23 10:03:28 2020 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Mon Mar 23 10:06:26 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.49 2018/09/03 16:29:28 riastradh Exp $       */
+/*     $NetBSD: ncr.c,v 1.49.4.1 2020/03/23 10:06:26 martin Exp $      */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.49 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.49.4.1 2020/03/23 10:06:26 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,7 +275,11 @@
        dh->dh_flags = SIDH_BUSY;
        dh->dh_addr = ncr_sc->sc_dataptr;
        dh->dh_len = xlen;
-       dh->dh_proc = xs->bp->b_proc;
+       if (((vaddr_t)ncr_sc->sc_dataptr & KERNBASE) == 0) {
+               if (xs->bp == NULL)
+                       panic("si_dma_alloc");
+               dh->dh_proc = xs->bp->b_proc;
+       }
 
        /* Remember dest buffer parameters */
        if (xs->xs_control & XS_CTL_DATA_OUT)