Module Name: src
Committed By: bouyer
Date: Sun Jun 4 20:45:54 UTC 2017
Modified Files:
src/sys/dev/ic [netbsd-8]: pl181.c
src/sys/dev/sdmmc [netbsd-8]: sdmmc_mem.c sdmmcvar.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #3):
sys/dev/sdmmc/sdmmcvar.h: revision 1.24
sys/dev/sdmmc/sdmmc_mem.c: revision 1.57
sys/dev/ic/pl181.c: revision 1.4
Give a hint to controllers in the command flags if we are performing a
transfer with an SDHC capable card. If the controller needs to adjust
command args, it can use this hint to understand how it is encoded.
Re-introduce support for multi-block transfers and split transfers to fit
within the 65535-byte limit.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/dev/ic/pl181.c
cvs rdiff -u -r1.56 -r1.56.4.1 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.23 -r1.23.6.1 src/sys/dev/sdmmc/sdmmcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/pl181.c
diff -u src/sys/dev/ic/pl181.c:1.3 src/sys/dev/ic/pl181.c:1.3.2.1
--- src/sys/dev/ic/pl181.c:1.3 Fri Jun 2 11:01:15 2017
+++ src/sys/dev/ic/pl181.c Sun Jun 4 20:45:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pl181.c,v 1.3 2017/06/02 11:01:15 jmcneill Exp $ */
+/* $NetBSD: pl181.c,v 1.3.2.1 2017/06/04 20:45:54 bouyer Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.3 2017/06/02 11:01:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.3.2.1 2017/06/04 20:45:54 bouyer Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -43,6 +43,12 @@ __KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.
#include <dev/ic/pl181reg.h>
#include <dev/ic/pl181var.h>
+/*
+ * Data length register is 16 bits for a maximum of 65535 bytes. Round
+ * maximum transfer size down to the nearest sector.
+ */
+#define PLMMC_MAXXFER rounddown(65535, SDMMC_SECTOR_SIZE)
+
static int plmmc_host_reset(sdmmc_chipset_handle_t);
static uint32_t plmmc_host_ocr(sdmmc_chipset_handle_t);
static int plmmc_host_maxblklen(sdmmc_chipset_handle_t);
@@ -61,7 +67,7 @@ static int plmmc_wait_status(struct plmm
static int plmmc_pio_wait(struct plmmc_softc *,
struct sdmmc_command *);
static int plmmc_pio_transfer(struct plmmc_softc *,
- struct sdmmc_command *);
+ struct sdmmc_command *, int);
static struct sdmmc_chip_functions plmmc_chip_functions = {
.host_reset = plmmc_host_reset,
@@ -119,7 +125,7 @@ plmmc_init(struct plmmc_softc *sc)
saa.saa_clkmin = 400;
saa.saa_clkmax = sc->sc_max_freq > 0 ?
sc->sc_max_freq / 1000 : sc->sc_clock_freq / 1000;
- saa.saa_caps = SMC_CAPS_4BIT_MODE | SMC_CAPS_SINGLE_ONLY;
+ saa.saa_caps = SMC_CAPS_4BIT_MODE;
sc->sc_sdmmc_dev = config_found(sc->sc_dev, &saa, NULL);
}
@@ -203,13 +209,13 @@ plmmc_pio_wait(struct plmmc_softc *sc, s
}
static int
-plmmc_pio_transfer(struct plmmc_softc *sc, struct sdmmc_command *cmd)
+plmmc_pio_transfer(struct plmmc_softc *sc, struct sdmmc_command *cmd,
+ int xferlen)
{
- uint32_t *datap = (uint32_t *)cmd->c_data;
+ uint32_t *datap = (uint32_t *)cmd->c_buf;
int i;
- cmd->c_resid = cmd->c_datalen;
- for (i = 0; i < (cmd->c_datalen >> 2); i++) {
+ for (i = 0; i < xferlen / 4; i++) {
if (plmmc_pio_wait(sc, cmd))
return ETIMEDOUT;
if (cmd->c_flags & SCF_CMD_READ) {
@@ -218,6 +224,7 @@ plmmc_pio_transfer(struct plmmc_softc *s
MMCI_WRITE(sc, MMCI_FIFO_REG, datap[i]);
}
cmd->c_resid -= 4;
+ cmd->c_buf += 4;
}
return 0;
@@ -309,18 +316,21 @@ plmmc_bus_rod(sdmmc_chipset_handle_t sch
}
static void
-plmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
+plmmc_do_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
{
struct plmmc_softc *sc = sch;
uint32_t cmdval = MMCI_COMMAND_ENABLE;
+ KASSERT(mutex_owned(&sc->sc_intr_lock));
+
+ const int xferlen = min(cmd->c_resid, PLMMC_MAXXFER);
+
#ifdef PLMMC_DEBUG
- device_printf(sc->sc_dev, "opcode %d flags %#x datalen %d\n",
- cmd->c_opcode, cmd->c_flags, cmd->c_datalen);
+ device_printf(sc->sc_dev,
+ "opcode %d flags %#x datalen %d resid %d xferlen %d\n",
+ cmd->c_opcode, cmd->c_flags, cmd->c_datalen, cmd->c_resid, xferlen);
#endif
- mutex_enter(&sc->sc_intr_lock);
-
MMCI_WRITE(sc, MMCI_COMMAND_REG, 0);
MMCI_WRITE(sc, MMCI_MASK0_REG, 0);
MMCI_WRITE(sc, MMCI_CLEAR_REG, 0xffffffff);
@@ -337,9 +347,11 @@ plmmc_exec_command(sdmmc_chipset_handle_
if (cmd->c_flags & SCF_RSP_136)
cmdval |= MMCI_COMMAND_LONGRSP;
- if (cmd->c_datalen > 0) {
- unsigned int nblks = cmd->c_datalen / cmd->c_blklen;
- if (nblks == 0 || (cmd->c_datalen % cmd->c_blklen) != 0)
+ uint32_t arg = cmd->c_arg;
+
+ if (xferlen > 0) {
+ unsigned int nblks = xferlen / cmd->c_blklen;
+ if (nblks == 0 || (xferlen % cmd->c_blklen) != 0)
++nblks;
const uint32_t dir = (cmd->c_flags & SCF_CMD_READ) ? 1 : 0;
@@ -351,13 +363,20 @@ plmmc_exec_command(sdmmc_chipset_handle_
__SHIFTIN(dir, MMCI_DATA_CTRL_DIRECTION) |
__SHIFTIN(blksize, MMCI_DATA_CTRL_BLOCKSIZE) |
MMCI_DATA_CTRL_ENABLE);
+
+ /* Adjust blkno if necessary */
+ u_int blkoff =
+ (cmd->c_datalen - cmd->c_resid) / SDMMC_SECTOR_SIZE;
+ if (!ISSET(cmd->c_flags, SCF_XFER_SDHC))
+ blkoff <<= SDMMC_SECTOR_SIZE_SB;
+ arg += blkoff;
}
- MMCI_WRITE(sc, MMCI_ARGUMENT_REG, cmd->c_arg);
+ MMCI_WRITE(sc, MMCI_ARGUMENT_REG, arg);
MMCI_WRITE(sc, MMCI_COMMAND_REG, cmdval | cmd->c_opcode);
- if (cmd->c_datalen > 0) {
- cmd->c_error = plmmc_pio_transfer(sc, cmd);
+ if (xferlen > 0) {
+ cmd->c_error = plmmc_pio_transfer(sc, cmd, xferlen);
if (cmd->c_error) {
device_printf(sc->sc_dev,
"error (%d) waiting for xfer\n", cmd->c_error);
@@ -365,7 +384,7 @@ plmmc_exec_command(sdmmc_chipset_handle_
}
}
- if (cmd->c_flags & SCF_RSP_PRESENT) {
+ if ((cmd->c_flags & SCF_RSP_PRESENT) && cmd->c_resid == 0) {
cmd->c_error = plmmc_wait_status(sc,
MMCI_INT_CMD_RESP_END|MMCI_INT_CMD_TIMEOUT, hz * 2);
if (cmd->c_error == 0 &&
@@ -400,7 +419,6 @@ plmmc_exec_command(sdmmc_chipset_handle_
}
done:
- cmd->c_flags |= SCF_ITSDONE;
MMCI_WRITE(sc, MMCI_COMMAND_REG, 0);
MMCI_WRITE(sc, MMCI_MASK0_REG, 0);
MMCI_WRITE(sc, MMCI_CLEAR_REG, 0xffffffff);
@@ -410,6 +428,38 @@ done:
device_printf(sc->sc_dev, "MMCI_STATUS_REG = %#x\n",
MMCI_READ(sc, MMCI_STATUS_REG));
#endif
+}
+
+static void
+plmmc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
+{
+ struct plmmc_softc *sc = sch;
+
+#ifdef PLMMC_DEBUG
+ device_printf(sc->sc_dev, "opcode %d flags %#x data %p datalen %d\n",
+ cmd->c_opcode, cmd->c_flags, cmd->c_data, cmd->c_datalen);
+#endif
+
+ mutex_enter(&sc->sc_intr_lock);
+ cmd->c_resid = cmd->c_datalen;
+ cmd->c_buf = cmd->c_data;
+ do {
+ plmmc_do_command(sch, cmd);
+
+ if (cmd->c_resid > 0 && cmd->c_error == 0) {
+ /*
+ * Multi block transfer and there is still data
+ * remaining. Send a stop cmd between transfers.
+ */
+ struct sdmmc_command stop_cmd;
+ memset(&stop_cmd, 0, sizeof(stop_cmd));
+ stop_cmd.c_opcode = MMC_STOP_TRANSMISSION;
+ stop_cmd.c_flags = SCF_CMD_AC | SCF_RSP_R1B |
+ SCF_RSP_SPI_R1B;
+ plmmc_do_command(sch, &stop_cmd);
+ }
+ } while (cmd->c_resid > 0 && cmd->c_error == 0);
+ cmd->c_flags |= SCF_ITSDONE;
mutex_exit(&sc->sc_intr_lock);
}
Index: src/sys/dev/sdmmc/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.56 src/sys/dev/sdmmc/sdmmc_mem.c:1.56.4.1
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.56 Tue Apr 11 23:26:33 2017
+++ src/sys/dev/sdmmc/sdmmc_mem.c Sun Jun 4 20:45:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.56 2017/04/11 23:26:33 jmcneill Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.56.4.1 2017/06/04 20:45:54 bouyer Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -45,7 +45,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.56 2017/04/11 23:26:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.56.4.1 2017/06/04 20:45:54 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1641,6 +1641,8 @@ sdmmc_mem_read_block_subr(struct sdmmc_f
if (!ISSET(sf->flags, SFF_SDHC))
cmd.c_arg <<= SDMMC_SECTOR_SIZE_SB;
cmd.c_flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1 | SCF_RSP_SPI_R1;
+ if (ISSET(sf->flags, SFF_SDHC))
+ cmd.c_flags |= SCF_XFER_SDHC;
if (ISSET(sc->sc_caps, SMC_CAPS_DMA))
cmd.c_dmamap = dmap;
@@ -1866,6 +1868,8 @@ sdmmc_mem_write_block_subr(struct sdmmc_
if (!ISSET(sf->flags, SFF_SDHC))
cmd.c_arg <<= SDMMC_SECTOR_SIZE_SB;
cmd.c_flags = SCF_CMD_ADTC | SCF_RSP_R1;
+ if (ISSET(sf->flags, SFF_SDHC))
+ cmd.c_flags |= SCF_XFER_SDHC;
if (ISSET(sc->sc_caps, SMC_CAPS_DMA))
cmd.c_dmamap = dmap;
Index: src/sys/dev/sdmmc/sdmmcvar.h
diff -u src/sys/dev/sdmmc/sdmmcvar.h:1.23 src/sys/dev/sdmmc/sdmmcvar.h:1.23.6.1
--- src/sys/dev/sdmmc/sdmmcvar.h:1.23 Fri Feb 17 10:51:48 2017
+++ src/sys/dev/sdmmc/sdmmcvar.h Sun Jun 4 20:45:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcvar.h,v 1.23 2017/02/17 10:51:48 nonaka Exp $ */
+/* $NetBSD: sdmmcvar.h,v 1.23.6.1 2017/06/04 20:45:54 bouyer Exp $ */
/* $OpenBSD: sdmmcvar.h,v 1.13 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -122,6 +122,8 @@ struct sdmmc_command {
#define SCF_RSP_SPI_BSY (1U << 13)
/* Probing */
#define SCF_TOUT_OK (1U << 14) /* command timeout expected */
+/* Transfer hints */
+#define SCF_XFER_SDHC (1U << 15) /* card is SDHC */
/* response types */
#define SCF_RSP_R0 0 /* none */
#define SCF_RSP_R1 (SCF_RSP_PRESENT|SCF_RSP_CRC|SCF_RSP_IDX)
