diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-09-22 11:02:37 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-09-22 11:02:37 +0000 |
| commit | 197669fe8923e3ea51187e39f267a0c24e385020 (patch) | |
| tree | de7ed7e96b1b320a750704999837d92fb106123b /sys/arch/i386 | |
| parent | 1f040ae349629abcf8d8dc8eb896478b5b84c220 (diff) | |
revert previous, breaks the tree
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/pci/pci_machdep.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index 8d0033a9edd..46b418550d6 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.71 2012/09/21 14:07:46 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.72 2012/09/22 11:02:36 sthen Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -780,7 +780,7 @@ pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level, if (ih.line & APIC_INT_VIA_MSG) { struct intrhand *ih; - pcireg_t reg, addr; + pcireg_t reg; int off, vec; if (pci_get_capability(pc, tag, PCI_CAP_MSI, &off, ®) == 0) @@ -807,14 +807,12 @@ pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level, apic_intrhand[vec] = ih; idt_vec_set(vec, apichandler[vec & 0xf]); - addr = 0xfee00000UL | (cpu_info_primary.apicid << 12); - if (reg & PCI_MSI_MC_C64) { - pci_conf_write(pc, tag, off + PCI_MSI_MA, addr); + pci_conf_write(pc, tag, off + PCI_MSI_MA, 0xfee00000); pci_conf_write(pc, tag, off + PCI_MSI_MAU32, 0); pci_conf_write(pc, tag, off + PCI_MSI_MD64, vec); } else { - pci_conf_write(pc, tag, off + PCI_MSI_MA, addr); + pci_conf_write(pc, tag, off + PCI_MSI_MA, 0xfee00000); pci_conf_write(pc, tag, off + PCI_MSI_MD32, vec); } pci_conf_write(pc, tag, off, reg | PCI_MSI_MC_MSIE); |