Module Name: src
Committed By: macallan
Date: Sat Dec 27 17:22:16 UTC 2014
Modified Files:
src/sys/arch/mips/ingenic: apbus.c ingenic_dwctwo.c
Log Message:
restrict DMA buffers to the lower 256MB -> now dwc2 DMA works
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ingenic/apbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ingenic/ingenic_dwctwo.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/mips/ingenic/apbus.c
diff -u src/sys/arch/mips/ingenic/apbus.c:1.5 src/sys/arch/mips/ingenic/apbus.c:1.6
--- src/sys/arch/mips/ingenic/apbus.c:1.5 Thu Dec 25 05:10:50 2014
+++ src/sys/arch/mips/ingenic/apbus.c Sat Dec 27 17:22:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.5 2014/12/25 05:10:50 macallan Exp $ */
+/* $NetBSD: apbus.c,v 1.6 2014/12/27 17:22:15 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* catch-all for on-chip peripherals */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.5 2014/12/25 05:10:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.6 2014/12/27 17:22:15 macallan Exp $");
#include "locators.h"
#define _MIPS_BUS_DMA_PRIVATE
@@ -56,6 +56,7 @@ static struct mips_bus_space apbus_mbst;
bus_space_tag_t apbus_memt = NULL;
struct mips_bus_dma_tag apbus_dmat = {
+ ._bounce_alloc_hi = 0x10000000,
._dmamap_ops = _BUS_DMAMAP_OPS_INITIALIZER,
._dmamem_ops = _BUS_DMAMEM_OPS_INITIALIZER,
._dmatag_ops = _BUS_DMATAG_OPS_INITIALIZER,
Index: src/sys/arch/mips/ingenic/ingenic_dwctwo.c
diff -u src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.4 src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.5
--- src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.4 Thu Dec 25 05:13:49 2014
+++ src/sys/arch/mips/ingenic/ingenic_dwctwo.c Sat Dec 27 17:22:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_dwctwo.c,v 1.4 2014/12/25 05:13:49 macallan Exp $ */
+/* $NetBSD: ingenic_dwctwo.c,v 1.5 2014/12/27 17:22:15 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.4 2014/12/25 05:13:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.5 2014/12/27 17:22:15 macallan Exp $");
/*
* adapted from bcm2835_dwctwo.c
@@ -64,7 +64,7 @@ struct ingenic_dwc2_softc {
static struct dwc2_core_params ingenic_dwc2_params = {
.otg_cap = -1, /* HNP/SRP capable */
.otg_ver = -1, /* 1.3 */
- .dma_enable = 0, /* for now */
+ .dma_enable = 1,
.dma_desc_enable = 0,
.speed = -1, /* High Speed */
.enable_dynamic_fifo = -1,
