Module Name: src
Committed By: rin
Date: Tue Aug 7 08:36:31 UTC 2018
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Do not call usb_syncmem(9) with len = 0 to avoid diagnostic assertion
failure in bus_dmamap_sync(9) on Raspberry Pi 3 Model B running in
aarch64 mode.
Workaround for PR port-evbarm/53503.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/dwc2/dwc2.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/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.49 src/sys/external/bsd/dwc2/dwc2.c:1.50
--- src/sys/external/bsd/dwc2/dwc2.c:1.49 Mon Apr 9 16:21:11 2018
+++ src/sys/external/bsd/dwc2/dwc2.c Tue Aug 7 08:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $ */
+/* $NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $");
#include "opt_usb.h"
@@ -1475,7 +1475,9 @@ void dwc2_host_complete(struct dwc2_hsot
* everything else does.
*/
if (!(xfertype == UE_CONTROL &&
- UGETW(xfer->ux_request.wLength) == 0)) {
+ UGETW(xfer->ux_request.wLength) == 0) &&
+ xfer->ux_actlen > 0 /* XXX PR/53503 */
+ ) {
int rd = usbd_xfer_isread(xfer);
usb_syncmem(&xfer->ux_dmabuf, 0, xfer->ux_actlen,
