diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-06-05 18:09:01 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-06-05 18:09:01 +0000 |
| commit | 3fbd9089b990f19cc09a737dc7a4123759828e90 (patch) | |
| tree | 91899ce5f44f4af0e8b5ea7307d6003686ebbdad /sys/arch/amd64/pci | |
| parent | 39262a39a455cabe1f3ea6a03c5942f2bec6ab6d (diff) | |
Disable MSIs in pci_intr_disestablish() when appropriate.
Diffstat (limited to 'sys/arch/amd64/pci')
| -rw-r--r-- | sys/arch/amd64/pci/pci_machdep.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c index 85346919afa..6e11b053205 100644 --- a/sys/arch/amd64/pci/pci_machdep.c +++ b/sys/arch/amd64/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.48 2011/06/05 10:07:30 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.49 2011/06/05 18:09:00 kettenis Exp $ */ /* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -554,6 +554,23 @@ pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level, void pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie) { + struct intrhand *ih = cookie; + struct cpu_info *ci; + struct pic *pic; + + ci = ih->ih_cpu; + pic = ci->ci_isources[ih->ih_slot]->is_pic; + + if (pic == &msi_pic) { + pcitag_t tag = ih->ih_pin; + pcireg_t reg; + int off; + + if (pci_get_capability(pc, tag, PCI_CAP_MSI, &off, ®) == 0) + panic("%s: no msi capability", __func__); + pci_conf_write(pc, tag, off, reg & ~PCI_MSI_MC_MSIE); + } + intr_disestablish(cookie); } |