Module Name: src
Committed By: jmcneill
Date: Fri Sep 12 15:29:30 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_dmac.c
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
use dma channel mask from firmware
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_dmac.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/rpi/rpi_machdep.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/broadcom/bcm2835_dmac.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.2 src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.3
--- src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.2 Sun Sep 7 15:21:27 2014
+++ src/sys/arch/arm/broadcom/bcm2835_dmac.c Fri Sep 12 15:29:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.c,v 1.2 2014/09/07 15:21:27 jmcneill Exp $ */
+/* $NetBSD: bcm2835_dmac.c,v 1.3 2014/09/12 15:29:30 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.2 2014/09/07 15:21:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.3 2014/09/12 15:29:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -109,6 +109,7 @@ static void
bcm_dmac_attach(device_t parent, device_t self, void *aux)
{
struct bcm_dmac_softc *sc = device_private(self);
+ const prop_dictionary_t *cfg = device_properties(self);
struct bcm_dmac_channel *ch;
struct amba_attach_args *aaa = aux;
uint32_t val;
@@ -123,12 +124,12 @@ bcm_dmac_attach(device_t parent, device_
return;
}
- sc->sc_channelmask = BCM_DMAC_CHANNELMASK;
- sc->sc_nchannels = 31 - __builtin_clz(sc->sc_channelmask);
+ prop_dictionary_get_uint32(cfg, "chanmask", &sc->sc_channelmask);
+ sc->sc_channelmask &= BCM_DMAC_CHANNELMASK;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
- sc->sc_nchannels = 31 - __builtin_clz(BCM_DMAC_CHANNELMASK);
+ sc->sc_nchannels = 31 - __builtin_clz(sc->sc_channelmask);
sc->sc_channels = kmem_alloc(
sizeof(*sc->sc_channels) * sc->sc_nchannels, KM_SLEEP);
if (sc->sc_channels == NULL) {
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.46 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.47
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.46 Sun Sep 7 15:28:24 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Fri Sep 12 15:29:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.46 2014/09/07 15:28:24 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.47 2014/09/12 15:29:30 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.46 2014/09/07 15:28:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.47 2014/09/12 15:29:30 jmcneill Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -892,6 +892,11 @@ rpi_device_register(device_t dev, void *
{
prop_dictionary_t dict = device_properties(dev);
+ if (device_is_a(dev, "bcmdmac") &&
+ vcprop_tag_success_p(&vb.vbt_dmachan.tag)) {
+ prop_dictionary_set_uint32(dict,
+ "chanmask", vb.vbt_dmachan.mask);
+ }
#if NSDHC > 0
if (device_is_a(dev, "sdhc") &&
vcprop_tag_success_p(&vb.vbt_emmcclockrate.tag) &&
