CVS commit: src/sys/dev

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Feb  9 17:16:42 UTC 2024

Modified Files:
        src/sys/dev/fdt: dwcmmc_fdt.c
        src/sys/dev/ic: dwc_mmc.c

Log Message:
Restrict dwcmmc to 32bit DMA (<4GB) regardless of attachment


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/fdt/dwcmmc_fdt.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/dwc_mmc.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.22 src/sys/dev/fdt/dwcmmc_fdt.c:1.23
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.22	Fri Feb  9 08:50:52 2024
+++ src/sys/dev/fdt/dwcmmc_fdt.c	Fri Feb  9 17:16:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.23 2024/02/09 17:16:42 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.22 2024/02/09 08:50:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.23 2024/02/09 17:16:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -149,16 +149,7 @@ dwcmmc_fdt_attach(device_t parent, devic
 
 	sc->sc_dev = self;
 	sc->sc_bst = faa->faa_bst;
-	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;
-	}
+	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",

Index: src/sys/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.30 src/sys/dev/ic/dwc_mmc.c:1.31
--- src/sys/dev/ic/dwc_mmc.c:1.30	Fri Feb  9 16:57:11 2024
+++ src/sys/dev/ic/dwc_mmc.c	Fri Feb  9 17:16:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.31 2024/02/09 17:16:42 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.31 2024/02/09 17:16:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -837,6 +837,16 @@ dwc_mmc_init(struct dwc_mmc_softc *sc)
 	val = MMC_READ(sc, DWC_MMC_VERID);
 	sc->sc_verid = __SHIFTOUT(val, DWC_MMC_VERID_ID);
 
+	if (sizeof(bus_addr_t) > 4) {
+		int error = bus_dmatag_subregion(sc->sc_dmat, 0, __MASK(32),
+		    &sc->sc_dmat, BUS_DMA_WAITOK);
+		if (error != 0) {
+			aprint_error_dev(sc->sc_dev,
+			    "failed to create DMA subregion\n");
+			return ENOMEM;
+		}
+	}
+
 	if (sc->sc_fifo_reg == 0) {
 		if (sc->sc_verid < DWC_MMC_VERID_240A)
 			sc->sc_fifo_reg = 0x100;