 @@ -1,14 +1,14 @@
-/*	$NetBSD: sdmmc_mem.c,v 1.25 2012/12/14 23:22:21 jakllsch Exp $	*/
+/*	$NetBSD: sdmmc_mem.c,v 1.26 2012/12/15 00:03:00 jakllsch Exp $	*/
 /*	$OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 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
 @@ -35,59 +35,61 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* Routines for SD/MMC memory cards. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.25 2012/12/14 23:22:21 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.26 2012/12/15 00:03:00 jakllsch Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/sdmmc/sdmmcchip.h>
 #include <dev/sdmmc/sdmmcreg.h>
 #include <dev/sdmmc/sdmmcvar.h>
 #ifdef SDMMC_DEBUG
 #define DPRINTF(s)	do { printf s; } while (/*CONSTCOND*/0)
 #else
 #define DPRINTF(s)	do {} while (/*CONSTCOND*/0)
 #endif
 typedef struct { uint32_t _bits[512/32]; } __packed __aligned(4) sdmmc_bitfield512_t;
 static int sdmmc_mem_sd_init(struct sdmmc_softc *, struct sdmmc_function *);
 static int sdmmc_mem_mmc_init(struct sdmmc_softc *, struct sdmmc_function *);
 static int sdmmc_mem_send_cid(struct sdmmc_softc *, sdmmc_response *);
 static int sdmmc_mem_send_csd(struct sdmmc_softc *, struct sdmmc_function *,
     sdmmc_response *);
 static int sdmmc_mem_send_scr(struct sdmmc_softc *, struct sdmmc_function *,
     uint32_t scr[2]);
 static int sdmmc_mem_decode_scr(struct sdmmc_softc *, struct sdmmc_function *);
 static int sdmmc_mem_send_cxd_data(struct sdmmc_softc *, int, void *, size_t);
 static int sdmmc_set_bus_width(struct sdmmc_function *, int);
-static int sdmmc_mem_sd_switch(struct sdmmc_function *, int, int, int, void *);
+static int sdmmc_mem_sd_switch(struct sdmmc_function *, int, int, int, sdmmc_bitfield512_t *);
 static int sdmmc_mem_mmc_switch(struct sdmmc_function *, uint8_t, uint8_t,
     uint8_t);
 static int sdmmc_mem_spi_read_ocr(struct sdmmc_softc *, uint32_t, uint32_t *);
 static int sdmmc_mem_single_read_block(struct sdmmc_function *, uint32_t,
     u_char *, size_t);
 static int sdmmc_mem_single_write_block(struct sdmmc_function *, uint32_t,
     u_char *, size_t);
 static int sdmmc_mem_read_block_subr(struct sdmmc_function *, uint32_t,
     u_char *, size_t);
 static int sdmmc_mem_write_block_subr(struct sdmmc_function *, uint32_t,
     u_char *, size_t);
 /*
 @@ -564,100 +566,114 @@ sdmmc_mem_set_blocklen(struct sdmmc_soft
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.c_opcode = MMC_SET_BLOCKLEN;
 	cmd.c_arg = SDMMC_SECTOR_SIZE;
 	cmd.c_flags = SCF_CMD_AC | SCF_RSP_R1 | SCF_RSP_SPI_R1;
 	error = sdmmc_mmc_command(sc, &cmd);
 	DPRINTF(("%s: sdmmc_mem_set_blocklen: read_bl_len=%d sector_size=%d\n",
 	    SDMMCDEVNAME(sc), 1 << sf->csd.read_bl_len, SDMMC_SECTOR_SIZE));
 	return error;
+}
 /* make 512-bit BE quantity __bitfield()-compatible */
 static void
 sdmmc_be512_to_bitfield512(sdmmc_bitfield512_t *buf) {
 	size_t i;
 	uint32_t tmp0, tmp1;
 	const size_t bitswords = __arraycount(buf->_bits);
 	for (i = 0; i < bitswords/2; i++) {
 		tmp0 = buf->_bits[i];
 		tmp1 = buf->_bits[bitswords - 1 - i];
 		buf->_bits[i] = be32toh(tmp1);
 		buf->_bits[bitswords - 1 - i] = be32toh(tmp0);
+	}
+}
 static int
 sdmmc_mem_sd_init(struct sdmmc_softc *sc, struct sdmmc_function *sf)
+{
 	static const struct {
 		int v;
 		int freq;
 	} switch_group0_functions[] = {
 		/* Default/SDR12 */
 		{ MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V |
 		  MMC_OCR_3_2V_3_3V | MMC_OCR_3_3V_3_4V,	 25000 },
 		/* High-Speed/SDR25 */
 		{ MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V |
 		  MMC_OCR_3_2V_3_3V | MMC_OCR_3_3V_3_4V,	 50000 },
 		/* SDR50 */
 		{ MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V,	100000 },
 		/* SDR104 */
 		{ MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V,	208000 },
 		/* DDR50 */
 		{ MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V,	 50000 },
 	};
 	int host_ocr, support_func, best_func, error, g, i;
-	char status[64];
+	sdmmc_bitfield512_t status; /* Switch Function Status */
 	error = sdmmc_mem_send_scr(sc, sf, sf->raw_scr);
 	if (error) {
 		aprint_error_dev(sc->sc_dev, "SD_SEND_SCR send failed.\n");
 		return error;
+	}
 	error = sdmmc_mem_decode_scr(sc, sf);
 	if (error)
 		return error;
 	if (ISSET(sc->sc_caps, SMC_CAPS_4BIT_MODE) &&
 	    ISSET(sf->scr.bus_width, SCR_SD_BUS_WIDTHS_4BIT)) {
 		DPRINTF(("%s: change bus width\n", SDMMCDEVNAME(sc)));
 		error = sdmmc_set_bus_width(sf, 4);
 		if (error) {
 			aprint_error_dev(sc->sc_dev,
 			    "can't change bus width (%d bit)\n", 4);
 			return error;
+		}
 		sf->width = 4;
+	}
 	if (sf->scr.sd_spec >= SCR_SD_SPEC_VER_1_10 &&
 	    ISSET(sf->csd.ccc, SD_CSD_CCC_SWITCH)) {
 		DPRINTF(("%s: switch func mode 0\n", SDMMCDEVNAME(sc)));
-		error = sdmmc_mem_sd_switch(sf, 0, 1, 0, status);
+		error = sdmmc_mem_sd_switch(sf, 0, 1, 0, &status);
 		if (error) {
 			aprint_error_dev(sc->sc_dev,
 			    "switch func mode 0 failed\n");
 			return error;
+		}
 		host_ocr = sdmmc_chip_host_ocr(sc->sc_sct, sc->sc_sch);
-		support_func = SFUNC_STATUS_GROUP(status, 1);
+		support_func = SFUNC_STATUS_GROUP(&status, 1);
 		best_func = 0;
 		for (i = 0, g = 1;
 		    i < __arraycount(switch_group0_functions); i++, g <<= 1) {
 			if (!(switch_group0_functions[i].v & host_ocr))
 				continue;
 			if (g & support_func)
 				best_func = i;
+		}
 		if (ISSET(sc->sc_caps, SMC_CAPS_SD_HIGHSPEED) &&
 		    best_func != 0) {
 			DPRINTF(("%s: switch func mode 1(func=%d)\n",
 			    SDMMCDEVNAME(sc), best_func));
 			error =
-			    sdmmc_mem_sd_switch(sf, 1, 1, best_func, status);
+			    sdmmc_mem_sd_switch(sf, 1, 1, best_func, &status);
 			if (error) {
 				aprint_error_dev(sc->sc_dev,
 				    "switch func mode 1 failed:"
 				    " group 1 function %d(0x%2x)\n",
 				    best_func, support_func);
 				return error;
+			}
 			sf->csd.tran_speed =
 			    switch_group0_functions[best_func].freq;
 			/* Wait 400KHz x 8 clock (2.5us * 8 + slop) */
 			delay(25);
+		}
 @@ -1049,27 +1065,27 @@ sdmmc_set_bus_width(struct sdmmc_functio
 	default:
 		return EINVAL;
+	}
 	error = sdmmc_app_command(sc, sf, &cmd);
 	if (error == 0)
 		error = sdmmc_chip_bus_width(sc->sc_sct, sc->sc_sch, width);
 	return error;
+}
 static int
 sdmmc_mem_sd_switch(struct sdmmc_function *sf, int mode, int group,
-    int function, void *status)
+    int function, sdmmc_bitfield512_t *status)
+{
 	struct sdmmc_softc *sc = sf->sc;
 	struct sdmmc_command cmd;
 	bus_dma_segment_t ds[1];
 	void *ptr = NULL;
 	int gsft, rseg, error = 0;
 	const int statlen = 64;
 	if (sf->scr.sd_spec >= SCR_SD_SPEC_VER_1_10 &&
 	    !ISSET(sf->csd.ccc, SD_CSD_CCC_SWITCH))
 		return EINVAL;
 	if (group <= 0 || group > 6 ||
 @@ -1122,26 +1138,30 @@ sdmmc_mem_sd_switch(struct sdmmc_functio
 out:
 	if (ptr != NULL) {
 		if (ISSET(sc->sc_caps, SMC_CAPS_DMA)) {
 			bus_dmamap_unload(sc->sc_dmat, sc->sc_dmap);
 dmamem_unmap:
 			bus_dmamem_unmap(sc->sc_dmat, ptr, statlen);
 dmamem_free:
 			bus_dmamem_free(sc->sc_dmat, ds, rseg);
 		} else {
 			free(ptr, M_DEVBUF);
+		}
+	}
 	if (error == 0)
 		sdmmc_be512_to_bitfield512(status);
 	return error;
+}
 static int
 sdmmc_mem_mmc_switch(struct sdmmc_function *sf, uint8_t set, uint8_t index,
     uint8_t value)
+{
 	struct sdmmc_softc *sc = sf->sc;
 	struct sdmmc_command cmd;
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.c_opcode = MMC_SWITCH;
 	cmd.c_arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sdmmcreg.h,v 1.12 2012/07/28 18:38:03 matt Exp $	*/
+/*	$NetBSD: sdmmcreg.h,v 1.13 2012/12/15 00:03:00 jakllsch Exp $	*/
 /*	$OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 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
 @@ -308,34 +308,34 @@
 #define  SCR_SD_SECURITY_1_0_2		2 /* security protocol 1.0 */
 #define SCR_SD_BUS_WIDTHS(scr)		MMC_RSP_BITS((scr), 48, 4)
 #define  SCR_SD_BUS_WIDTHS_1BIT		(1 << 0) /* 1bit (DAT0) */
 #define  SCR_SD_BUS_WIDTHS_4BIT		(1 << 2) /* 4bit (DAT0-3) */
 #define SCR_SD_SPEC3(scr)		MMC_RSP_BITS((scr), 47, 1)
 #define SCR_EX_SECURITY(scr)		MMC_RSP_BITS((scr), 43, 4)
 #define SCR_RESERVED(scr)		MMC_RSP_BITS((scr), 34, 9)
 #define SCR_CMD_SUPPORT_CMD23(scr)	MMC_RSP_BITS((scr), 33, 1)
 #define SCR_CMD_SUPPORT_CMD20(scr)	MMC_RSP_BITS((scr), 32, 1)
 #define SCR_RESERVED2(scr)		MMC_RSP_BITS((scr), 0, 32)
 /* Status of Switch Function */
 #define SFUNC_STATUS_GROUP(status, group) \
-	be16toh(__bitfield((uint32_t *)(status), (7 - (group)) << 4, 16))
+	(__bitfield((uint32_t *)(status), 400 + (group - 1) * 16, 16))
 /* This assumes the response fields are in host byte order in 32-bit units.  */
 #define MMC_RSP_BITS(resp, start, len)	__bitfield((resp), (start)-8, (len))
 static inline uint32_t
 __bitfield(const uint32_t *src, size_t start, size_t len)
+{
-	if (start + len > 128 || len == 0 || len > 32)
+	if (start + len > 512 || len == 0 || len > 32)
 		return 0;
 	src += start / 32;
 	start %= 32;
 	uint32_t dst = src[0] >> start;
 	if (__predict_false((start + len - 1) / 32 != start / 32)) {
 		dst |= src[1] << (32 - start);
+	}
 	return dst & (__BIT(len) - 1);
+}