From 671348b0ff54db3e2b5c4fbfea1b55a5a05e055f Mon Sep 17 00:00:00 2001
From: ps <ps@FreeBSD.org>
Date: Thu, 11 Sep 2003 23:30:28 +0000
Subject: [PATCH] Delay most of the adapter initilization until after
 interrupts are enabled.

Tested by:	Richard Puga <puga@mauibuilt.com>
---
 sys/dev/ips/ips.h     |  1 +
 sys/dev/ips/ips_pci.c | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index 02d58c983813..3d0f19ade996 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -343,6 +343,7 @@ typedef struct ips_wait_list{
 typedef struct ips_softc{
         struct resource *       iores;
         struct resource *       irqres;
+        struct intr_config_hook ips_ich;
         int                     configured;
         int                     state;
         int                     iotype;
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 9e77cd05db6f..1981e2855354 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ips/ips.h>
 
 static int ips_pci_free(ips_softc_t *sc);
+static void ips_intrhook(void *arg);
 
 static int ips_pci_probe(device_t dev)
 {
@@ -132,15 +133,30 @@ static int ips_pci_attach(device_t dev)
                 printf("IPS can't alloc dma tag\n");
                 goto error;
         }
-	if(ips_adapter_init(sc))
+	sc->ips_ich.ich_func = ips_intrhook;
+	sc->ips_ich.ich_arg = sc;
+	if (config_intrhook_establish(&sc->ips_ich) != 0) {
+		printf("IPS can't establish configuration hook\n");
 		goto error;
-        sc->configured = 1;
+	}
         return 0;
 error:
 	ips_pci_free(sc);
         return (ENXIO);
 }
 
+static void
+ips_intrhook(void *arg)
+{
+	struct ips_softc *sc = (struct ips_softc *)arg;
+
+	config_intrhook_disestablish(&sc->ips_ich);
+	if (ips_adapter_init(sc))
+		ips_pci_free(sc);
+	else
+		sc->configured = 1;
+}
+
 static int ips_pci_free(ips_softc_t *sc)
 {
 	if(sc->adapter_dmatag)