Module Name: src
Committed By: skrll
Date: Fri Feb 9 08:50:52 UTC 2024
Modified Files:
src/sys/dev/fdt: dwcmmc_fdt.c
Log Message:
Limit DMA to below 4GB - the supported controllers are limited this
way.
Thanks to jmcneill for a version of this patch.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/fdt/dwcmmc_fdt.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/dev/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.21 src/sys/dev/fdt/dwcmmc_fdt.c:1.22
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.21 Fri Feb 9 06:28:50 2024
+++ src/sys/dev/fdt/dwcmmc_fdt.c Fri Feb 9 08:50:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.21 2024/02/09 06:28:50 skrll Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.21 2024/02/09 06:28:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -149,7 +149,16 @@ dwcmmc_fdt_attach(device_t parent, devic
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
- sc->sc_dmat = faa->faa_dmat;
+ if (sizeof(bus_addr_t) > 4) {
+ error = bus_dmatag_subregion(faa->faa_dmat, 0, __MASK(32),
+ &sc->sc_dmat, BUS_DMA_WAITOK);
+ if (error != 0) {
+ aprint_error(": couldn't create DMA tag: %d\n", error);
+ return;
+ }
+ } else {
+ sc->sc_dmat = faa->faa_dmat;
+ }
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
aprint_error(": couldn't map %#" PRIx64 ": %d\n",
