Although the attached patch does not let iwi work, but it will not let
the system panic if iwi attaching failed. Would you please give it a
try and upload the dmesg after loading the iwi module? Thanks.
Best Regards,
sephe
On 7/25/05, Eirik Nygaard <[EMAIL PROTECTED]> wrote:
> I bought a new laptop a while back, the card was suppose to be supported by
> the
> iwi(4) driver, but when I load the driver my laptop panics after printing
> "could
> not allocate memory resource".
>
> I have also tried with ndis, that failed as well.
>
> dmesg output: http://leaf.dragonflybsd.org/~eirikn/dmesg-lap.verbose
> pciconf output: http://leaf.dragonflybsd.org/~eirikn/pciconf-lap
> ndis loading output: http://leaf.dragonflybsd.org/~eirikn/ndis-lap
>
>
> --
> Eirik Nygaard
>
--
Live Free or Die
Index: if_iwi.c
===================================================================
RCS file: /opt/df_cvs/src/sys/dev/netif/iwi/if_iwi.c,v
retrieving revision 1.5
diff -u -p -r1.5 if_iwi.c
--- if_iwi.c 27 Jun 2005 11:28:54 -0000 1.5
+++ if_iwi.c 26 Jul 2005 11:11:19 -0000
@@ -322,6 +322,7 @@ iwi_attach(device_t dev)
sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (sc->mem == NULL) {
device_printf(dev, "could not allocate memory resource\n");
+ error = ENXIO;
goto fail;
}
@@ -333,20 +334,24 @@ iwi_attach(device_t dev)
RF_SHAREABLE);
if (sc->irq == NULL) {
device_printf(dev, "could not allocate interrupt resource\n");
+ error = ENXIO;
goto fail;
}
- if (iwi_reset(sc) != 0) {
+ error = iwi_reset(sc);
+ if (error != 0) {
device_printf(dev, "could not reset adapter\n");
goto fail;
}
- if (iwi_start_fw_monitor_thread(sc) ) {
+ if (iwi_start_fw_monitor_thread(sc)) {
device_printf(dev, "could not start f/w reset thread\n");
+ error = ENXIO;
goto fail;
}
- if (iwi_dma_alloc(sc) != 0) {
+ error = iwi_dma_alloc(sc);
+ if (error != 0) {
device_printf(dev, "could not allocate DMA resources\n");
goto fail;
}
@@ -434,16 +439,6 @@ iwi_attach(device_t dev)
sc->sc_txtap.wt_ihdr.it_present = htole32(IWI_TX_RADIOTAP_PRESENT);
/*
- * Hook our interrupt after all initialization is complete
- */
- error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE,
- iwi_intr, sc, &sc->sc_ih, NULL);
- if (error != 0) {
- device_printf(dev, "could not set up interrupt\n");
- goto fail;
- }
-
- /*
* Add sysctl knobs
*
* use -1 to indicate 'default / not set'
@@ -466,8 +461,9 @@ iwi_attach(device_t dev)
0, "");
if (sc->sysctl_tree == NULL) {
+ device_printf(dev, "sysctl add node failed\n");
error = EIO;
- goto fail;
+ goto fail2;
}
SYSCTL_ADD_INT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree),
@@ -537,10 +533,24 @@ iwi_attach(device_t dev)
iwi_sysctl_disable_multicast_decryption, "I",
"Disable multicast decryption.");
+ /*
+ * Hook our interrupt after all initialization is complete
+ */
+ error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE,
+ iwi_intr, sc, &sc->sc_ih, NULL);
+ if (error != 0) {
+ device_printf(dev, "could not set up interrupt\n");
+ goto fail2;
+ }
+
return 0;
-fail: iwi_detach(dev);
- return ENXIO;
+fail2:
+ bpfdetach(ifp);
+ ieee80211_ifdetach(ifp);
+fail:
+ iwi_detach(dev);
+ return error;
}
static int
@@ -554,38 +564,40 @@ iwi_detach(device_t dev)
sc->flags |= IWI_FLAG_EXIT;
wakeup(IWI_FW_WAKE_MONITOR(sc)); /* Stop firmware monitor. */
- (void) tsleep(IWI_FW_MON_EXIT(sc), 0, "iwiexi", 10 * hz );
+ tsleep(IWI_FW_MON_EXIT(sc), 0, "iwiexi", 10 * hz);
IWI_LOCK(sc);
IWI_IPLLOCK(sc);
- iwi_stop(sc);
- iwi_free_firmware(sc);
+ if (device_is_attached(dev)) {
+ iwi_stop(sc);
+ iwi_free_firmware(sc);
+ bpfdetach(ifp);
+ ieee80211_ifdetach(ifp);
+ }
- if ( sc->sysctl_tree ) {
+ if (sc->sysctl_tree) {
crit_enter();
sysctl_ctx_free(&sc->sysctl_ctx);
crit_exit();
sc->sysctl_tree = 0;
}
+ if (sc->sc_ih != NULL)
+ bus_teardown_intr(dev, sc->irq, sc->sc_ih);
+
IWI_IPLUNLOCK(sc);
IWI_UNLOCK(sc);
- bpfdetach(ifp);
-
- ieee80211_ifdetach(ifp);
-
- iwi_release(sc);
-
- if (sc->irq != NULL) {
- bus_teardown_intr(dev, sc->irq, sc->sc_ih);
+ if (sc->irq != NULL)
bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq);
- }
- if (sc->mem != NULL)
+ if (sc->mem != NULL) {
bus_release_resource(dev, SYS_RES_MEMORY, IWI_PCI_BAR0,
sc->mem);
+ }
+
+ iwi_release(sc);
IWI_LOCK_DESTROY(&(sc->sc_lock));
IWI_LOCK_DESTROY(&(sc->sc_intrlock));
