Module Name: src
Committed By: skrll
Date: Sun Feb 7 10:47:40 UTC 2021
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Check for programming errors in _bus_dmamap_load_buffer
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/arm/arm32/bus_dma.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/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.131 src/sys/arch/arm/arm32/bus_dma.c:1.132
--- src/sys/arch/arm/arm32/bus_dma.c:1.131 Sun Feb 7 10:20:35 2021
+++ src/sys/arch/arm/arm32/bus_dma.c Sun Feb 7 10:47:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.131 2021/02/07 10:20:35 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.132 2021/02/07 10:47:40 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 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.131 2021/02/07 10:20:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.132 2021/02/07 10:47:40 skrll Exp $");
#include <sys/param.h>
@@ -1633,7 +1633,14 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
*
*/
bool coherent;
- pmap_extract_coherency(pmap, vaddr, &curaddr, &coherent);
+ bool ok __diagused;
+ ok = pmap_extract_coherency(pmap, vaddr, &curaddr, &coherent);
+
+ /*
+ * trying to bus_dmamap_load an unmapped buffer is a
+ * programming error.
+ */
+ KASSERT(ok);
KASSERTMSG((vaddr & PAGE_MASK) == (curaddr & PAGE_MASK),
"va %#lx curaddr %#lx", vaddr, curaddr);
