From 6499c89471a0f8df8d4d26d351413a7df1e41de2 Mon Sep 17 00:00:00 2001 From: skrll Date: Fri, 9 Feb 2024 08:50:52 +0000 Subject: [PATCH] Limit DMA to below 4GB - the supported controllers are limited this way. Thanks to jmcneill for a version of this patch. --- sys/dev/fdt/dwcmmc_fdt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/dwcmmc_fdt.c b/sys/dev/fdt/dwcmmc_fdt.c index 6f627fa02e36..509f715217e4 100644 --- a/sys/dev/fdt/dwcmmc_fdt.c +++ b/sys/dev/fdt/dwcmmc_fdt.c @@ -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 @@ -27,7 +27,7 @@ */ #include -__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 #include @@ -149,7 +149,16 @@ dwcmmc_fdt_attach(device_t parent, device_t self, void *aux) 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",