Module Name: src
Committed By: jmcneill
Date: Sat Jan 2 12:39:03 UTC 2021
Modified Files:
src/sys/dev/usb: usb_mem.c usb_mem.h
Log Message:
Add USBMALLOC_ZERO flag for requesting zero initialized DMA memory.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/usb_mem.h
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/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.77 src/sys/dev/usb/usb_mem.c:1.78
--- src/sys/dev/usb/usb_mem.c:1.77 Fri May 15 06:26:44 2020
+++ src/sys/dev/usb/usb_mem.c Sat Jan 2 12:39:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.77 2020/05/15 06:26:44 skrll Exp $ */
+/* $NetBSD: usb_mem.c,v 1.78 2021/01/02 12:39:03 jmcneill Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.77 2020/05/15 06:26:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.78 2021/01/02 12:39:03 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -179,9 +179,16 @@ usb_block_allocmem(bus_dma_tag_t tag, si
goto destroy;
*dmap = b;
+
#ifdef USB_FRAG_DMA_WORKAROUND
- memset(b->kaddr, 0, b->size);
+ flags |= USBMALLOC_ZERO;
#endif
+ if ((flags & USBMALLOC_ZERO) != 0) {
+ memset(b->kaddr, 0, b->size);
+ bus_dmamap_sync(b->tag, b->map, 0, b->size,
+ BUS_DMASYNC_PREWRITE);
+ }
+
mutex_enter(&usb_blk_lock);
return USBD_NORMAL_COMPLETION;
Index: src/sys/dev/usb/usb_mem.h
diff -u src/sys/dev/usb/usb_mem.h:1.32 src/sys/dev/usb/usb_mem.h:1.33
--- src/sys/dev/usb/usb_mem.h:1.32 Sun Apr 5 20:59:38 2020
+++ src/sys/dev/usb/usb_mem.h Sat Jan 2 12:39:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.h,v 1.32 2020/04/05 20:59:38 skrll Exp $ */
+/* $NetBSD: usb_mem.h,v 1.33 2021/01/02 12:39:03 jmcneill Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -49,6 +49,7 @@ typedef struct usb_dma_block {
#define USBMALLOC_MULTISEG __BIT(0)
#define USBMALLOC_COHERENT __BIT(1)
+#define USBMALLOC_ZERO __BIT(2)
usbd_status usb_allocmem(struct usbd_bus *, size_t, size_t, u_int, usb_dma_t *);
void usb_freemem(struct usbd_bus *, usb_dma_t *);
