diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-11-29 21:31:28 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-11-29 21:31:28 +0000 |
| commit | 3c28ca4bebaf7849a9668f69b1b29850ac47d3bc (patch) | |
| tree | 7cd3aebc48276caaea8c2bca1c5f730de336fdc1 /sys | |
| parent | 6b2acdfe87300e9e3729d9efc5033d93bf1e34ad (diff) | |
Correct PCI interrupt setup routine for Texas Instruments PCI113X CardBus
bridges so that hot insertion and removal works; from NetBSD.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index f3e3764e962..84904e7db3d 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.10 2000/11/29 21:25:18 aaron Exp $ */ +/* $OpenBSD: pccbb.c,v 1.11 2000/11/29 21:31:27 aaron Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -759,8 +759,8 @@ pccbb_chipinit(sc) reg |= PCI113X_CBCTRL_PCI_IRQ_ENA; /* CSC intr enable */ reg |= PCI113X_CBCTRL_PCI_CSC; - /* functional intr prohibit */ - reg &= ~PCI113X_CBCTRL_PCI_INTR; + /* functional intr prohibit | prohibit ISA routing */ + reg &= ~(PCI113X_CBCTRL_PCI_INTR | PCI113X_CBCTRL_INT_MASK); pci_conf_write(pc, tag, PCI_CBCTRL, reg); break; @@ -834,8 +834,12 @@ pccbb_pcmcia_attach_setup(sc, paa) * 4) Clear any pending CSC interrupt. */ Pcic_write(ph, PCIC_INTR, PCIC_INTR_ENABLE | PCIC_INTR_RESET); - Pcic_write(ph, PCIC_CSC_INTR, PCIC_CSC_INTR_CD_ENABLE); - Pcic_read(ph, PCIC_CSC); + if (sc->sc_chipset == CB_TI113X) { + Pcic_write(ph, PCIC_CSC_INTR, 0); + } else { + Pcic_write(ph, PCIC_CSC_INTR, PCIC_CSC_INTR_CD_ENABLE); + Pcic_read(ph, PCIC_CSC); + } /* initialize pcmcia bus attachment */ paa->paa_busname = "pcmcia"; |