 @@ -1,39 +1,39 @@
-/*	$NetBSD: sdhc.c,v 1.60 2015/07/22 09:54:42 skrll Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.61 2015/07/23 23:52:54 jmcneill 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.60 2015/07/22 09:54:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.61 2015/07/23 23:52:54 jmcneill Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 @@ -45,27 +45,27 @@ __KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.6
 #include <dev/sdmmc/sdmmcvar.h>
 #ifdef SDHC_DEBUG
 int sdhcdebug = 1;
 #define DPRINTF(n,s)	do { if ((n) <= sdhcdebug) printf s; } while (0)
 void	sdhc_dump_regs(struct sdhc_host *);
 #else
 #define DPRINTF(n,s)	do {} while (0)
 #endif
 #define SDHC_COMMAND_TIMEOUT	hz
 #define SDHC_BUFFER_TIMEOUT	hz
 #define SDHC_TRANSFER_TIMEOUT	hz
-#define SDHC_DMA_TIMEOUT	hz
+#define SDHC_DMA_TIMEOUT	(hz*3)
 struct sdhc_host {
 	struct sdhc_softc *sc;		/* host controller device */
 	bus_space_tag_t iot;		/* host register set tag */
 	bus_space_handle_t ioh;		/* host register set handle */
 	bus_size_t ios;			/* host register space size */
 	bus_dma_tag_t dmat;		/* host DMA tag */
 	device_t sdmmc;			/* generic SD/MMC device */
 	struct kmutex host_mtx;
 @@ -1109,26 +1109,37 @@ sdhc_exec_command(sdmmc_chipset_handle_t
 	if (cmd->c_data && ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)) {
 		const uint16_t ready = SDHC_BUFFER_READ_READY | SDHC_BUFFER_WRITE_READY;
 		mutex_enter(&hp->intr_mtx);
 		if (ISSET(hp->flags, SHF_USE_DMA)) {
 			HCLR2(hp, SDHC_NINTR_SIGNAL_EN, ready);
 			HCLR2(hp, SDHC_NINTR_STATUS_EN, ready);
 		} else {
 			HSET2(hp, SDHC_NINTR_SIGNAL_EN, ready);
 			HSET2(hp, SDHC_NINTR_STATUS_EN, ready);
+		}
 		mutex_exit(&hp->intr_mtx);
+	}
 	if (ISSET(hp->sc->sc_flags, SDHC_FLAG_NO_TIMEOUT)) {
 		const uint16_t eintr = SDHC_CMD_TIMEOUT_ERROR;
 		if (cmd->c_data != NULL) {
 			HCLR2(hp, SDHC_EINTR_SIGNAL_EN, eintr);
 			HCLR2(hp, SDHC_EINTR_STATUS_EN, eintr);
 		} else {
 			HSET2(hp, SDHC_EINTR_SIGNAL_EN, eintr);
 			HSET2(hp, SDHC_EINTR_STATUS_EN, eintr);
+		}
+	}
 	/*
 	 * Start the MMC command, or mark `cmd' as failed and return.
 	 */
 	error = sdhc_start_command(hp, cmd);
 	if (error) {
 		cmd->c_error = error;
 		goto out;
+	}
 	/*
 	 * Wait until the command phase is done, or until the command
 	 * is marked done for any other reason.
 	 */
 @@ -1322,27 +1333,27 @@ sdhc_transfer_data(struct sdhc_host *hp,
 	/* XXX I forgot why I wanted to know when this happens :-( */
 	if ((cmd->c_opcode == 52 || cmd->c_opcode == 53) &&
 	    ISSET(MMC_R1(cmd->c_resp), 0xcb00)) {
 		aprint_error_dev(hp->sc->sc_dev,
 		    "CMD52/53 error response flags %#x\n",
 		    MMC_R1(cmd->c_resp) & 0xff00);
+	}
 #endif
 	if (cmd->c_dmamap != NULL) {
 		if (hp->sc->sc_vendor_transfer_data_dma != NULL) {
 			error = hp->sc->sc_vendor_transfer_data_dma(sc, cmd);
 			if (error == 0 && !sdhc_wait_intr(hp,
-			    SDHC_TRANSFER_COMPLETE, SDHC_TRANSFER_TIMEOUT)) {
+			    SDHC_TRANSFER_COMPLETE, SDHC_DMA_TIMEOUT)) {
 				error = ETIMEDOUT;
+			}
 		} else {
 			error = sdhc_transfer_data_dma(hp, cmd);
+		}
 	} else
 		error = sdhc_transfer_data_pio(hp, cmd);
 	if (error)
 		cmd->c_error = error;
 	SET(cmd->c_flags, SCF_ITSDONE);
 	DPRINTF(1,("%s: data transfer done (error=%d)\n",
 	    HDEVNAME(hp), cmd->c_error));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sdhcvar.h,v 1.18 2015/05/03 11:46:25 jmcneill Exp $	*/
+/*	$NetBSD: sdhcvar.h,v 1.19 2015/07/23 23:52:54 jmcneill Exp $	*/
 /*	$OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg 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
 @@ -44,26 +44,27 @@ struct sdhc_softc {
 #define	SDHC_FLAG_ENHANCED	0x00000020 /* Freescale ESDHC */
 #define	SDHC_FLAG_8BIT_MODE	0x00000040 /* MMC 8bit mode is supported */
 #define	SDHC_FLAG_HAVE_CGM	0x00000080 /* Netlogic XLP */
 #define	SDHC_FLAG_NO_LED_ON	0x00000100 /* LED_ON unsupported in HOST_CTL */
 #define	SDHC_FLAG_HOSTCAPS	0x00000200 /* No device provided capabilities */
 #define	SDHC_FLAG_RSP136_CRC	0x00000400 /* Resp 136 with CRC and end-bit */
 #define	SDHC_FLAG_SINGLE_ONLY	0x00000800 /* Single transfer only */
 #define	SDHC_FLAG_WAIT_RESET	0x00001000 /* Wait for soft resets to start */
 #define	SDHC_FLAG_NO_HS_BIT	0x00002000 /* Don't set SDHC_HIGH_SPEED bit */
 #define	SDHC_FLAG_EXTERNAL_DMA	0x00004000
 #define	SDHC_FLAG_EXTDMA_DMAEN	0x00008000 /* ext. dma need SDHC_DMA_ENABLE */
 #define	SDHC_FLAG_NO_CLKBASE	0x00020000 /* ignore clkbase register */
 #define	SDHC_FLAG_SINGLE_POWER_WRITE 0x00040000
 #define	SDHC_FLAG_NO_TIMEOUT	0x00080000 /* ignore timeout interrupts */
 	uint32_t		sc_clkbase;
 	int			sc_clkmsk;	/* Mask for SDCLK */
 	uint32_t		sc_caps;/* attachment provided capabilities */
 	int (*sc_vendor_rod)(struct sdhc_softc *, int);
 	int (*sc_vendor_write_protect)(struct sdhc_softc *);
 	int (*sc_vendor_card_detect)(struct sdhc_softc *);
 	int (*sc_vendor_bus_clock)(struct sdhc_softc *, int);
 	int (*sc_vendor_transfer_data_dma)(struct sdhc_softc *, struct sdmmc_command *);
 };
 /* Host controller functions called by the attachment driver. */