[src/netbsd-9]: src/sys/arch/arm/arm32 Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/7a11a354bcf6
branches:  netbsd-9
changeset: 745225:7a11a354bcf6
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Feb 25 19:16:23 2020 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #721):

        sys/arch/arm/arm32/bus_dma.c: revision 1.119
        sys/arch/arm/arm32/bus_dma.c: revision 1.120

Make sure to convey a failure to the calling function
Likely fix for PR kern/54999, but that was a one-off panic.
 -
Fix previous for non-_ARM32_NEED_BUS_DMA_BOUNCE builds

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r f8b952183521 -r 7a11a354bcf6 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Tue Feb 25 19:10:51 2020 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Tue Feb 25 19:16:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $ */
+/*     $NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -315,6 +315,7 @@
 {
        struct arm32_bus_dmamap *map;
        void *mapstore;
+       int error = 0;
 
 #ifdef DEBUG_DMA
        printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx"
@@ -357,7 +358,6 @@
        struct arm32_bus_dma_cookie *cookie;
        int cookieflags;
        void *cookiestore;
-       int error;
 
        cookieflags = 0;
 
@@ -404,7 +404,7 @@
 #ifdef DEBUG_DMA
        printf("dmamap_create:map=%p\n", map);
 #endif /* DEBUG_DMA */
-       return 0;
+       return error;
 }
 
 /*