Subject: panic wi at obio (Re: ppcoea-rennovation branch merge soon)
To: None <root@garbled.net>
From: KIYOHARA Takashi <kiyohara@kk.iij4u.or.jp>
List: port-macppc
Date: 10/23/2007 02:32:50
Hi! Tim,


From: Tim Rightnour <root@garbled.net>
Date: Mon, 15 Oct 2007 15:21:13 -0700 (MST)

> Unless I hear specific objections, in the next week or so, I plan to merge the
> ppcoea-rennovation branch back into HEAD.  There are a few caveats here:


My kernel panics in wi_obio_attach() since after this merge.  We need
following changes.


Index: if_wi_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/if_wi_obio.c,v
retrieving revision 1.14
diff -u -r1.14 if_wi_obio.c
--- if_wi_obio.c        17 Oct 2007 19:55:18 -0000      1.14
+++ if_wi_obio.c        22 Oct 2007 17:13:55 -0000
@@ -96,13 +96,14 @@
        aprint_normal(" irq %d:", ca->ca_intr[0]);
        intr_establish(ca->ca_intr[0], IST_LEVEL, IPL_NET, wi_intr, sc);
 
-       wisc->sc_iot = ca->ca_tag;
+       sc->sc_tag = wisc->sc_iot = ca->ca_tag;
        bus_space_map(sc->sc_tag, 0x8000000, 0x20000, 0, &sc->sc_bsh);
        bus_space_subregion(sc->sc_tag, sc->sc_bsh, 0x40, 4, &sc->sc_fcr2h);
        bus_space_subregion(sc->sc_tag, sc->sc_bsh, 0x6a, 16, &sc->sc_gpioh);
        bus_space_subregion(sc->sc_tag, sc->sc_bsh, 0x58, 16, &sc->sc_extint_gpioh);
 
-       if (bus_space_map(wisc->sc_iot, ca->ca_reg[0], ca->ca_reg[1], 0, &wisc->
sc_ioh)) {
+       if (bus_space_map(wisc->sc_iot, ca->ca_reg[0] + ca->ca_baseaddr,
+           ca->ca_reg[1], 0, &wisc->sc_ioh)) {
                printf(" can't map i/o space\n");
                return;
        }


By the way, I think that you should use ca->ca_baseaddr is better than
0x8000000.  ;-)


Thanks
--
kiyohara