[src/trunk]: src/sys/arch/arm/sunxi Reduce timeouts and add hw reset support

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1189a4c5deb
branches:  trunk
changeset: 447193:f1189a4c5deb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jan 03 15:34:41 2019 +0000

description:
Reduce timeouts and add hw reset support

diffstat:

 sys/arch/arm/sunxi/sunxi_mmc.c |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 9944cc0d4153 -r f1189a4c5deb sys/arch/arm/sunxi/sunxi_mmc.c
--- a/sys/arch/arm/sunxi/sunxi_mmc.c    Thu Jan 03 15:33:06 2019 +0000
+++ b/sys/arch/arm/sunxi/sunxi_mmc.c    Thu Jan 03 15:34:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.32 2019/01/03 15:34:41 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_sunximmc.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.32 2019/01/03 15:34:41 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -525,6 +525,15 @@
 }
 
 static void
+sunxi_mmc_hw_reset(struct sunxi_mmc_softc *sc)
+{
+       MMC_WRITE(sc, SUNXI_MMC_HWRST, 0);
+       delay(1000);
+       MMC_WRITE(sc, SUNXI_MMC_HWRST, 1);
+       delay(1000);
+}
+
+static void
 sunxi_mmc_attach_i(device_t self)
 {
        struct sunxi_mmc_softc *sc = device_private(self);
@@ -535,6 +544,9 @@
        if (sc->sc_pwrseq)
                fdtbus_mmc_pwrseq_pre_power_on(sc->sc_pwrseq);
 
+       if (of_hasprop(sc->sc_phandle, "cap-mmc-hw-reset"))
+               sunxi_mmc_hw_reset(sc);
+
        sunxi_mmc_host_reset(sc);
        sunxi_mmc_bus_width(sc, 1);
        sunxi_mmc_set_clock(sc, 400, false);
@@ -1144,7 +1156,7 @@
        }
 
        cmd->c_error = sunxi_mmc_wait_rint(sc,
-           SUNXI_MMC_INT_ERROR|SUNXI_MMC_INT_CMD_DONE, hz * 10, poll);
+           SUNXI_MMC_INT_ERROR|SUNXI_MMC_INT_CMD_DONE, hz * 3, poll);
        if (cmd->c_error == 0 && (sc->sc_intr_rint & SUNXI_MMC_INT_ERROR)) {
                if (sc->sc_intr_rint & SUNXI_MMC_INT_RESP_TIMEOUT) {
                        cmd->c_error = ETIMEDOUT;
@@ -1165,7 +1177,7 @@
                    SUNXI_MMC_INT_ERROR|
                    SUNXI_MMC_INT_AUTO_CMD_DONE|
                    SUNXI_MMC_INT_DATA_OVER,
-                   hz*10, poll);
+                   hz*3, poll);
                if (cmd->c_error == 0 &&
                    (sc->sc_intr_rint & SUNXI_MMC_INT_ERROR)) {
                        cmd->c_error = ETIMEDOUT;