 @@ -1,39 +1,39 @@
-/*	$NetBSD: sdhc.c,v 1.107 2020/07/15 15:57:52 msaitoh Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.108 2021/03/13 23:26:47 mlelstv Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * SD Host Controller driver based on the SD Host Controller Standard
  * Simplified Specification Version 1.00 (www.sdcard.com).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.107 2020/07/15 15:57:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.108 2021/03/13 23:26:47 mlelstv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/atomic.h>
 @@ -379,26 +379,28 @@ sdhc_host_found(struct sdhc_softc *sc, b
 			caps |= SDHC_ADMA2_SUPP;
 		sc->sc_caps = caps;
 		/* uSDHC has no SDHC_CAPABILITIES2 register */
 		caps2 = sc->sc_caps2 = SDHC_SDR50_SUPP | SDHC_DDR50_SUPP;
 	} else {
 		caps = sc->sc_caps = HREAD4(hp, SDHC_CAPABILITIES);
 		if (hp->specver >= SDHC_SPEC_VERS_300) {
 			caps2 = sc->sc_caps2 = HREAD4(hp, SDHC_CAPABILITIES2);
 		} else {
 			caps2 = sc->sc_caps2 = 0;
+		}
+	}
 	aprint_verbose(", caps <%08x/%08x>", caps, caps2);
 	const u_int retuning_mode = (caps2 >> SDHC_RETUNING_MODES_SHIFT) &
 	    SDHC_RETUNING_MODES_MASK;
 	if (retuning_mode == SDHC_RETUNING_MODE_1) {
 		hp->tuning_timer_count = (caps2 >> SDHC_TIMER_COUNT_SHIFT) &
 		    SDHC_TIMER_COUNT_MASK;
 		if (hp->tuning_timer_count == 0xf)
 			hp->tuning_timer_count = 0;
 		if (hp->tuning_timer_count)
 			hp->tuning_timer_count =
 << (hp->tuning_timer_count - 1);
+	}
 	/*
 @@ -1714,34 +1716,37 @@ sdhc_start_command(struct sdhc_host *hp,
 			aprint_error_dev(sc->sc_dev,
 			    "data not a multiple of %u bytes\n", blksize);
 			return EINVAL;
+		}
+	}
 	/* Check limit imposed by 9-bit block count. (1.7.2) */
 	if (blkcount > SDHC_BLOCK_COUNT_MAX) {
 		aprint_error_dev(sc->sc_dev, "too much data\n");
 		return EINVAL;
+	}
 	/* Prepare transfer mode register value. (2.2.5) */
-	mode = SDHC_BLOCK_COUNT_ENABLE;
+	mode = 0;
 	if (ISSET(cmd->c_flags, SCF_CMD_READ))
 		mode |= SDHC_READ_MODE;
-	if (blkcount > 1) {
+	if (blkcount > 0) {
-		mode |= SDHC_MULTI_BLOCK_MODE;
+		mode |= SDHC_BLOCK_COUNT_ENABLE;
-		/* XXX only for memory commands? */
+		if (blkcount > 1) {
-		if (!ISSET(sc->sc_flags, SDHC_FLAG_NO_AUTO_STOP))
+			mode |= SDHC_MULTI_BLOCK_MODE;
-			mode |= SDHC_AUTO_CMD12_ENABLE;
+			if (!ISSET(sc->sc_flags, SDHC_FLAG_NO_AUTO_STOP)
 			    && !ISSET(cmd->c_flags, SCF_NO_STOP))
 				mode |= SDHC_AUTO_CMD12_ENABLE;
+		}
+	}
 	if (cmd->c_dmamap != NULL && cmd->c_datalen > 0 &&
 	    ISSET(hp->flags,  SHF_MODE_DMAEN)) {
 		mode |= SDHC_DMA_ENABLE;
+	}
 	/*
 	 * Prepare command register value. (2.2.6)
 	 */
 	command = (cmd->c_opcode & SDHC_COMMAND_INDEX_MASK) << SDHC_COMMAND_INDEX_SHIFT;
 	if (ISSET(cmd->c_flags, SCF_RSP_CRC))
 		command |= SDHC_CRC_CHECK_ENABLE;