Module Name: src
Committed By: jdolecek
Date: Tue Jul 14 12:04:46 UTC 2020
Modified Files:
src/sys/dev/ic: ciss.c cissvar.h
src/sys/dev/pci: ciss_pci.c
Log Message:
remove CISS_NO_INTERRUPT_HACK, discussed with joerg@ and spz@
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/cissvar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ciss_pci.c
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/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.48 src/sys/dev/ic/ciss.c:1.49
--- src/sys/dev/ic/ciss.c:1.48 Tue Jul 14 11:44:52 2020
+++ src/sys/dev/ic/ciss.c Tue Jul 14 12:04:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.48 2020/07/14 11:44:52 jdolecek Exp $ */
+/* $NetBSD: ciss.c,v 1.49 2020/07/14 12:04:46 jdolecek Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.48 2020/07/14 11:44:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.49 2020/07/14 12:04:46 jdolecek Exp $");
#include "bio.h"
@@ -74,11 +74,6 @@ static int ciss_scsi_ioctl(struct scsipi
void *addr, int flag, struct proc *p);
static void cissminphys(struct buf *bp);
-#if 0
-static void ciss_scsi_raw_cmd(struct scsipi_channel *chan,
- scsipi_adapter_req_t req, void *arg);
-#endif
-
static int ciss_sync(struct ciss_softc *sc);
static void ciss_heartbeat(void *v);
static void ciss_shutdown(void *v);
@@ -753,11 +748,9 @@ ciss_cmd(struct ciss_softc *sc, struct c
bus_dmamap_sync(sc->sc_dmat, sc->cmdmap, 0, sc->cmdmap->dm_mapsize,
BUS_DMASYNC_PREWRITE);
-#ifndef CISS_NO_INTERRUPT_HACK
if ((wait & (XS_CTL_POLL|XS_CTL_NOSLEEP)) == (XS_CTL_POLL|XS_CTL_NOSLEEP))
bus_space_write_4(sc->sc_iot, sc->sc_ioh, CISS_IMR,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) | sc->iem);
-#endif
if (!pollsleep)
ccb->ccb_state = CISS_CCB_ONQ;
@@ -810,11 +803,9 @@ ciss_cmd(struct ciss_softc *sc, struct c
ccb->ccb_err.cmd_stat, ccb->ccb_err.scsi_stat));
}
-#ifndef CISS_NO_INTERRUPT_HACK
if ((wait & (XS_CTL_POLL|XS_CTL_NOSLEEP)) == (XS_CTL_POLL|XS_CTL_NOSLEEP))
bus_space_write_4(sc->sc_iot, sc->sc_ioh, CISS_IMR,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) & ~sc->iem);
-#endif
return (error);
}
Index: src/sys/dev/ic/cissvar.h
diff -u src/sys/dev/ic/cissvar.h:1.9 src/sys/dev/ic/cissvar.h:1.10
--- src/sys/dev/ic/cissvar.h:1.9 Tue Jul 14 10:37:30 2020
+++ src/sys/dev/ic/cissvar.h Tue Jul 14 12:04:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cissvar.h,v 1.9 2020/07/14 10:37:30 jdolecek Exp $ */
+/* $NetBSD: cissvar.h,v 1.10 2020/07/14 12:04:46 jdolecek Exp $ */
/* $OpenBSD: cissvar.h,v 1.15 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -45,9 +45,6 @@ struct ciss_softc {
void *sc_sh; /* shutdown hook */
struct proc *sc_thread;
int sc_flush;
-#ifdef CISS_NO_INTERRUPT_HACK
- struct callout sc_interrupt_hack;
-#endif
struct scsipi_channel sc_channel;
struct scsipi_channel *sc_channel_raw;
Index: src/sys/dev/pci/ciss_pci.c
diff -u src/sys/dev/pci/ciss_pci.c:1.18 src/sys/dev/pci/ciss_pci.c:1.19
--- src/sys/dev/pci/ciss_pci.c:1.18 Tue Jul 14 10:37:30 2020
+++ src/sys/dev/pci/ciss_pci.c Tue Jul 14 12:04:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss_pci.c,v 1.18 2020/07/14 10:37:30 jdolecek Exp $ */
+/* $NetBSD: ciss_pci.c,v 1.19 2020/07/14 12:04:46 jdolecek Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.18 2020/07/14 10:37:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.19 2020/07/14 12:04:46 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -243,20 +243,6 @@ ciss_pci_match(device_t parent, cfdata_t
return 0;
}
-#ifdef CISS_NO_INTERRUPT_HACK
-static void
-ciss_intr_wrapper(void *sc_)
-{
- struct ciss_softc *sc = sc_;
- int s;
-
- s = splbio();
- ciss_intr(sc);
- splx(s);
- callout_schedule(&sc->sc_interrupt_hack, 1);
-}
-#endif
-
void
ciss_pci_attach(device_t parent, device_t self, void *aux)
{
@@ -271,10 +257,6 @@ ciss_pci_attach(device_t parent, device_
char intrbuf[PCI_INTRSTR_LEN];
int (*intr_handler)(void *);
-#ifdef CISS_NO_INTERRUPT_HACK
- callout_init(&sc->sc_interrupt_hack, 0);
- callout_setfunc(&sc->sc_interrupt_hack, ciss_intr_wrapper, sc);
-#endif
sc->sc_dev = self;
aprint_naive("\n");
@@ -339,11 +321,9 @@ ciss_pci_attach(device_t parent, device_
(u_int32_t *)&sc->cfg, sizeof(sc->cfg) / 4);
/* disable interrupts until ready */
-#ifndef CISS_NO_INTERRUPT_HACK
bus_space_write_4(sc->sc_iot, sc->sc_ioh, CISS_IMR,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) |
sc->iem | CISS_INTR_OPQ | CISS_INTR_MSI);
-#endif
int counts[PCI_INTR_TYPE_SIZE] = {
[PCI_INTR_TYPE_INTX] = 1,
@@ -409,11 +389,7 @@ ciss_pci_attach(device_t parent, device_
return;
}
-#ifndef CISS_NO_INTERRUPT_HACK
/* enable interrupts now */
bus_space_write_4(sc->sc_iot, sc->sc_ioh, CISS_IMR,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) & ~sc->iem);
-#else
- callout_schedule(&sc->sc_interrupt_hack, 1);
-#endif
}
