CVS commit: src/sys/arch/arm/sunxi

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Mon Mar 19 08:57:57 UTC 2018

Modified Files:
        src/sys/arch/arm/sunxi: sunxi_mmc.c

Log Message:
sunxi: mmc: increase max number of descriptors available for DMA transfers

patch from jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sunxi/sunxi_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/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.20 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.21
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.20	Mon Feb 19 20:26:51 2018
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c	Mon Mar 19 08:57:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.20 2018/02/19 20:26:51 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.21 2018/03/19 08:57:57 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_sunximmc.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.20 2018/02/19 20:26:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.21 2018/03/19 08:57:57 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -87,7 +87,7 @@ static const struct sunxi_mmc_delay sun9
 	[SUNXI_MMC_TIMING_50M_DDR_8BIT]	= {  72,	 72 },
 };
 
-#define SUNXI_MMC_NDESC		16
+#define SUNXI_MMC_NDESC		64
 
 struct sunxi_mmc_softc;
 
@@ -954,8 +954,9 @@ sunxi_mmc_dma_prepare(struct sunxi_mmc_s
 	}
 	if (desc == sc->sc_idma_ndesc) {
 		aprint_error_dev(sc->sc_dev,
-		    "not enough descriptors for %d byte transfer!\n",
-		    cmd->c_datalen);
+		    "not enough descriptors for %d byte transfer! "
+		    "there are %u segments with a max xfer length of %u\n",
+		    cmd->c_datalen, map->dm_nsegs, sc->sc_config->idma_xferlen);
 		return EIO;
 	}