diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-04-05 19:14:01 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-04-05 19:14:01 +0000 |
| commit | 852f3f5e5ef008419293718b89c1f641e73401ce (patch) | |
| tree | ae3507ff96dbdc5b21dfb277cdd19000b7627e3b /sys/arch | |
| parent | cb74df93525fce32f87e454311d83c0ffca77809 (diff) | |
Fix interrupts.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/dev/ebus_mainbus.c | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/sys/arch/sparc64/dev/ebus_mainbus.c b/sys/arch/sparc64/dev/ebus_mainbus.c index ba6c3839969..ea1c0d5e0b8 100644 --- a/sys/arch/sparc64/dev/ebus_mainbus.c +++ b/sys/arch/sparc64/dev/ebus_mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ebus_mainbus.c,v 1.1 2007/04/04 18:38:54 kettenis Exp $ */ +/* $OpenBSD: ebus_mainbus.c,v 1.2 2007/04/05 19:14:00 kettenis Exp $ */ /* * Copyright (c) 2007 Mark Kettenis @@ -43,10 +43,14 @@ extern int ebus_debug; #include <machine/autoconf.h> #include <machine/openfirm.h> +#include <dev/pci/pcivar.h> + #include <sparc64/dev/iommureg.h> #include <sparc64/dev/ebusreg.h> #include <sparc64/dev/ebusvar.h> -#include <sparc64/sparc64/cache.h> +#include <sparc64/dev/pyrovar.h> + +extern struct cfdriver pyro_cd; int ebus_mainbus_match(struct device *, void *, void *); void ebus_mainbus_attach(struct device *, struct device *, void *); @@ -85,25 +89,35 @@ ebus_mainbus_attach(struct device *parent, struct device *self, void *aux) struct ebus_attach_args eba; struct ebus_interrupt_map_mask *immp; int node, nmapmask, error; + struct pyro_softc *psc; + int i; - sc->sc_ign = INTIGN((ma->ma_upaid & 0x1e) << INTMAP_IGN_SHIFT); - - printf(": ign %x\n", sc->sc_ign); + sc->sc_node = node = ma->ma_node; + sc->sc_ign = INTIGN((ma->ma_upaid) << INTMAP_IGN_SHIFT); - sc->sc_memtag = ebus_alloc_bus_tag(sc, ma->ma_bustag); - sc->sc_iotag = ebus_alloc_bus_tag(sc, ma->ma_bustag); - sc->sc_dmatag = ebus_alloc_dma_tag(sc, ma->ma_dmatag); + printf(": ign %x", sc->sc_ign); - sc->sc_node = node = ma->ma_node; + for (i = 0; i < pyro_cd.cd_ndevs; i++) { + psc = pyro_cd.cd_devs[i]; + if (psc && psc->sc_ign == sc->sc_ign) { + sc->sc_bust = psc->sc_bust; + sc->sc_csr = psc->sc_csr; + sc->sc_csrh = psc->sc_csrh; + break; + } + } - /* XXX double mapping? */ - sc->sc_bust = ma->ma_bustag; - sc->sc_csr = ma->ma_reg[0].ur_paddr + 0x600000 - 0x464000; - if (bus_space_map(sc->sc_bust, sc->sc_csr, 0x2000, 0, &sc->sc_csrh)) { - printf(": failed to map csr registers\n"); + if (sc->sc_csr == 0) { + printf(": can't find matching host bridge leaf\n"); return; } + printf("\n"); + + sc->sc_memtag = ebus_alloc_bus_tag(sc, ma->ma_bustag); + sc->sc_iotag = ebus_alloc_bus_tag(sc, ma->ma_bustag); + sc->sc_dmatag = ebus_alloc_dma_tag(sc, ma->ma_dmatag); + /* * fill in our softc with information from the prom */ |