aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/advansys
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2001-03-01 17:09:09 +0000
committerMark Murray <markm@FreeBSD.org>2001-03-01 17:09:09 +0000
commited34d0ade2848f88c70b745d77380c5069ebdfd6 (patch)
treefadc7b6cd2c258b196b444eb1c16b198554d73b8 /sys/dev/advansys
parent7bf8fc01e983ebc7e114645470a880d0abaa911f (diff)
downloadsrc-ed34d0ade2848f88c70b745d77380c5069ebdfd6.tar.gz
src-ed34d0ade2848f88c70b745d77380c5069ebdfd6.zip
Turn on interrupt-entropy harvesting for all/any mass storage devices
I could find. I have no doubt missed a couple. Interrupt entropy harvesting is still conditional on the kern.random.sys.harvest_interrupt sysctl.
Notes
Notes: svn path=/head/; revision=73280
Diffstat (limited to 'sys/dev/advansys')
-rw-r--r--sys/dev/advansys/adv_eisa.c2
-rw-r--r--sys/dev/advansys/adv_isa.c2
-rw-r--r--sys/dev/advansys/adv_pci.c2
-rw-r--r--sys/dev/advansys/adwcam.c5
4 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index e769ca42fe70..a2ed93903783 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -309,7 +309,7 @@ adv_eisa_attach(device_t dev)
/*
* Enable our interrupt handler.
*/
- bus_setup_intr(dev, irq, INTR_TYPE_CAM, adv_intr, adv, &ih);
+ bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv, &ih);
/* Attach sub-devices - always succeeds */
adv_attach(adv);
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index f55dcc73e439..a0f15e9eec39 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -319,7 +319,7 @@ adv_isa_probe(device_t dev)
irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
RF_ACTIVE);
if (irqres == NULL ||
- bus_setup_intr(dev, irqres, INTR_TYPE_CAM, adv_intr, adv,
+ bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv,
&ih)) {
bus_dmamap_unload(overrun_dmat, overrun_dmamap);
bus_dmamem_free(overrun_dmat, overrun_buf,
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index b965ce6a3cfa..55ce7514da1e 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -293,7 +293,7 @@ adv_pci_attach(device_t dev)
irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
RF_SHAREABLE | RF_ACTIVE);
if (irqres == NULL ||
- bus_setup_intr(dev, irqres, INTR_TYPE_CAM, adv_intr, adv, &ih)) {
+ bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv, &ih)) {
adv_free(adv);
bus_release_resource(dev, SYS_RES_IOPORT, 0, iores);
return ENXIO;
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 3c9b00b78856..91d2c7d44639 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -1169,8 +1169,9 @@ adw_attach(struct adw_softc *adw)
error = 0;
s = splcam();
/* Hook up our interrupt handler */
- if ((error = bus_setup_intr(adw->device, adw->irq, INTR_TYPE_CAM,
- adw_intr, adw, &adw->ih)) != 0) {
+ if ((error = bus_setup_intr(adw->device, adw->irq,
+ INTR_TYPE_CAM | INTR_ENTROPY, adw_intr,
+ adw, &adw->ih)) != 0) {
device_printf(adw->device, "bus_setup_intr() failed: %d\n",
error);
goto fail;