2 files changed, 46 insertions, 21 deletions

diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 9759bd58770..f42a7e84079 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751.c,v 1.89 2001/08/08 03:11:46 jason Exp $	*/
+/*	$OpenBSD: hifn7751.c,v 1.90 2001/08/08 03:46:44 jason Exp $	*/
 
 /*
  * Invertex AEON / Hifn 7751 driver
@@ -102,6 +102,7 @@ void	hifn_dmamap_load __P((bus_dmamap_t, int *, struct hifn_desc *, int,
     volatile int *));
 int	hifn_init_pubrng __P((struct hifn_softc *));
 void	hifn_rng __P((void *));
+void	hifn_tick __P((void *));
 
 struct hifn_stats {
 	u_int64_t hst_ibytes;
@@ -311,6 +312,9 @@ hifn_attach(parent, self, aux)
 	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
 		hifn_init_pubrng(sc);
 
+	timeout_set(&sc->sc_tickto, hifn_tick, sc);
+	timeout_add(&sc->sc_tickto, hz);
+
 	return;
 
 fail_intr:
@@ -1299,6 +1303,7 @@ hifn_crypto(sc, cmd, crp)
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 
+	sc->sc_active = 5;
 	splx(s);
 	return 0;		/* success */
 
@@ -1315,6 +1320,43 @@ err_srcmap1:
 	return (-1);
 }
 
+void
+hifn_tick(vsc)
+	void *vsc;
+{
+	struct hifn_softc *sc = vsc;
+	int s;
+
+	s = splnet();
+	if (sc->sc_active == 0) {
+		struct hifn_dma *dma = sc->sc_dma;
+		u_int32_t r = 0;
+
+		if (dma->cmdu == 0 && sc->sc_c_busy) {
+			sc->sc_c_busy = 0;
+			r |= HIFN_DMACSR_C_CTRL_DIS;
+		}
+		if (dma->srcu == 0 && sc->sc_s_busy) {
+			sc->sc_s_busy = 0;
+			r |= HIFN_DMACSR_S_CTRL_DIS;
+		}
+		if (dma->dstu == 0 && sc->sc_d_busy) {
+			sc->sc_d_busy = 0;
+			r |= HIFN_DMACSR_D_CTRL_DIS;
+		}
+		if (dma->resu == 0 && sc->sc_r_busy) {
+			sc->sc_r_busy = 0;
+			r |= HIFN_DMACSR_R_CTRL_DIS;
+		}
+		if (r)
+			WRITE_REG_1(sc, HIFN_1_DMA_CSR, r);
+	}
+	else
+		sc->sc_active--;
+	splx(s);
+	timeout_add(&sc->sc_tickto, hz);
+}
+
 int 
 hifn_intr(arg)
 	void *arg;
@@ -1417,23 +1459,6 @@ hifn_intr(arg)
 	}
 	dma->cmdk = i; dma->cmdu = u;
 
-	if (dma->cmdu == 0) {
-		rings |= HIFN_DMACSR_C_CTRL_DIS;
-		sc->sc_c_busy = 0;
-	}
-	if (dma->srcu == 0) {
-		rings |= HIFN_DMACSR_S_CTRL_DIS;
-		sc->sc_s_busy = 0;
-	}
-	if (dma->dstu == 0) {
-		rings |= HIFN_DMACSR_D_CTRL_DIS;
-		sc->sc_d_busy = 0;
-	}
-	if (dma->resu == 0) {
-		rings |= HIFN_DMACSR_R_CTRL_DIS;
-		sc->sc_r_busy = 0;
-	}
-
 	/*
 	 * Clear "result done" and "command wait" flags in status register.
 	 * If we still have slots to process and we received a "command wait"
diff --git a/sys/dev/pci/hifn7751var.h b/sys/dev/pci/hifn7751var.h
index 624329d4202..0aa10127bea 100644
--- a/sys/dev/pci/hifn7751var.h
+++ b/sys/dev/pci/hifn7751var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751var.h,v 1.30 2001/08/08 03:11:47 jason Exp $	*/
+/*	$OpenBSD: hifn7751var.h,v 1.31 2001/08/08 03:46:44 jason Exp $	*/
 
 /*
  * Invertex AEON / Hifn 7751 driver
@@ -120,10 +120,10 @@ struct hifn_softc {
 	int sc_flags;
 #define	HIFN_HAS_RNG		1
 #define	HIFN_HAS_PUBLIC		2
-	struct timeout sc_rngto;
+	struct timeout sc_rngto, sc_tickto;
 	int sc_rngfirst;
 	int sc_rnghz;
-	int sc_c_busy, sc_s_busy, sc_d_busy, sc_r_busy;
+	int sc_c_busy, sc_s_busy, sc_d_busy, sc_r_busy, sc_active;
 	struct hifn_session sc_sessions[2048];
 };