diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-25 10:52:10 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-25 10:52:10 +0000 |
| commit | 7ac5456ddfe594fa299bc0055230df33e759a988 (patch) | |
| tree | 08b9bc163c32de93d602a397e26b467d077f1816 /sys/dev | |
| parent | b49801085048619213c1789bbeccb99abeef5faf (diff) | |
Map the interrupt pins used for swizzling *after* mapping the PCI Express
hotplug interrupt such that we don't thrash the information necessary to do
that.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/ppb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 95c60b963a8..6a5f12f749d 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.20 2007/11/24 21:33:58 kettenis Exp $ */ +/* $OpenBSD: ppb.c,v 1.21 2007/11/25 10:52:09 kettenis Exp $ */ /* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -115,12 +115,6 @@ ppbattach(struct device *parent, struct device *self, void *aux) return; } - for (pin = PCI_INTERRUPT_PIN_A; pin <= PCI_INTERRUPT_PIN_D; pin++) { - pa->pa_intrpin = pa->pa_rawintrpin = pin; - pa->pa_intrline = 0; - pci_intr_map(pa, &sc->sc_ih[pin - PCI_INTERRUPT_PIN_A]); - } - #if 0 /* * XXX can't do this, because we're not given our bus number @@ -154,6 +148,12 @@ ppbattach(struct device *parent, struct device *self, void *aux) printf("\n"); + for (pin = PCI_INTERRUPT_PIN_A; pin <= PCI_INTERRUPT_PIN_D; pin++) { + pa->pa_intrpin = pa->pa_rawintrpin = pin; + pa->pa_intrline = 0; + pci_intr_map(pa, &sc->sc_ih[pin - PCI_INTERRUPT_PIN_A]); + } + /* * Attach the PCI bus that hangs off of it. * |