Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mac68k/dev Honor the XS_CTL_POLL flag and fallback ...



details:   https://anonhg.NetBSD.org/src/rev/64cd3c016f7f
branches:  trunk
changeset: 373571:64cd3c016f7f
user:      nat <nat%NetBSD.org@localhost>
date:      Sat Feb 18 13:17:45 2023 +0000

description:
Honor the XS_CTL_POLL flag and fallback to polled io instead of PDMA.

As posted to tech-kern.

diffstat:

 sys/arch/mac68k/dev/sbc.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r fb35af8ee060 -r 64cd3c016f7f sys/arch/mac68k/dev/sbc.c
--- a/sys/arch/mac68k/dev/sbc.c Sat Feb 18 11:55:20 2023 +0000
+++ b/sys/arch/mac68k/dev/sbc.c Sat Feb 18 13:17:45 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbc.c,v 1.57 2018/09/03 16:29:25 riastradh Exp $       */
+/*     $NetBSD: sbc.c,v 1.58 2023/02/18 13:17:45 nat Exp $     */
 
 /*
  * Copyright (C) 1996 Scott Reynolds.  All rights reserved.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbc.c,v 1.57 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbc.c,v 1.58 2023/02/18 13:17:45 nat Exp $");
 
 #include "opt_ddb.h"
 
@@ -249,7 +249,9 @@
        int resid, s;
 
        if (datalen < ncr_sc->sc_min_dma_len ||
-           (sc->sc_options & SBC_PDMA) == 0)
+           (sc->sc_options & SBC_PDMA) == 0 ||
+           (ncr_sc->sc_current != NULL &&
+           (ncr_sc->sc_current->sr_xs->xs_control & XS_CTL_POLL)))
                return ncr5380_pio_in(ncr_sc, phase, datalen, data);
 
        s = splbio();
@@ -315,7 +317,9 @@
 #endif
 
        if (datalen < ncr_sc->sc_min_dma_len ||
-           (sc->sc_options & SBC_PDMA) == 0)
+           (sc->sc_options & SBC_PDMA) == 0 ||
+           (ncr_sc->sc_current != NULL &&
+           (ncr_sc->sc_current->sr_xs->xs_control & XS_CTL_POLL)))
                return ncr5380_pio_out(ncr_sc, phase, datalen, data);
 
        s = splbio();



Home | Main Index | Thread Index | Old Index