Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sunxi Do not print timeout message when SCF_TOU...



details:   https://anonhg.NetBSD.org/src/rev/04641243e9dd
branches:  trunk
changeset: 459971:04641243e9dd
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Oct 03 15:10:32 2019 +0000

description:
Do not print timeout message when SCF_TOUT_OK flag is set

diffstat:

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

diffs (28 lines):

diff -r 88dba3d503b0 -r 04641243e9dd sys/arch/arm/sunxi/sunxi_mmc.c
--- a/sys/arch/arm/sunxi/sunxi_mmc.c    Thu Oct 03 14:42:20 2019 +0000
+++ b/sys/arch/arm/sunxi/sunxi_mmc.c    Thu Oct 03 15:10:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.38 2019/10/03 13:49:33 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.39 2019/10/03 15:10:32 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.38 2019/10/03 13:49:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.39 2019/10/03 15:10:32 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -633,7 +633,8 @@
                        /* Wait for command to complete */
                        sc->sc_wait_data = sc->sc_wait_dma = false;
                        if (cmd->c_opcode != SD_IO_SEND_OP_COND &&
-                           cmd->c_opcode != SD_IO_RW_DIRECT)
+                           cmd->c_opcode != SD_IO_RW_DIRECT &&
+                           !ISSET(cmd->c_flags, SCF_TOUT_OK))
                                device_printf(sc->sc_dev, "host controller timeout, mint=0x%08x\n", mint);
                } else {
                        device_printf(sc->sc_dev, "host controller error, mint=0x%08x\n", mint);



Home | Main Index | Thread Index | Old Index