Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add USBMALLOC_ZERO flag for requesting zero initialized DMA memory.

This commit is contained in:
jmcneill 2021-01-02 12:39:03 +00:00
parent 8582796087
commit af3c884e20
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/usb/usb_mem.c
View File

@ -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, size_t size, size_t align,
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;

3
sys/dev/usb/usb_mem.h
View File

@ -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 *);