[src/trunk]: src/sys/arch/arm/amlogic Disable multi-segment DMA as a workarou...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f127fdff4c5
branches:  trunk
changeset: 449682:2f127fdff4c5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Mar 16 12:52:47 2019 +0000

description:
Disable multi-segment DMA as a workaround for init crashes on ODROID-C2 when using root on eMMC

diffstat:

 sys/arch/arm/amlogic/mesongx_mmc.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 46d1c10cb6e3 -r 2f127fdff4c5 sys/arch/arm/amlogic/mesongx_mmc.c
--- a/sys/arch/arm/amlogic/mesongx_mmc.c        Sat Mar 16 12:23:49 2019 +0000
+++ b/sys/arch/arm/amlogic/mesongx_mmc.c        Sat Mar 16 12:52:47 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.3 2019/03/15 11:45:17 jmcneill Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.4 2019/03/16 12:52:47 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.3 2019/03/15 11:45:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.4 2019/03/16 12:52:47 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -526,8 +526,11 @@
        saa.saa_dmat = sc->sc_dmat;
        saa.saa_clkmin = SDMMC_SDCLK_400K;
        saa.saa_clkmax = sc->sc_max_frequency / 1000;
-       saa.saa_caps = SMC_CAPS_DMA |
-                      SMC_CAPS_MULTI_SEG_DMA;
+       saa.saa_caps = SMC_CAPS_DMA;
+#if notyet
+       /* XXX causes init to die when using root on eMMC with ODROID-C2 */
+       saa.saa_caps |= SMC_CAPS_MULTI_SEG_DMA;
+#endif
 
        sc->sc_host_ocr = MMC_OCR_3_2V_3_3V | MMC_OCR_3_3V_3_4V;