d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add back accidentally dropped masking...

Browse Source 
-       PCI_MASK_CONFIG(sc->dev, CBBR_BRIDGECTRL,
-           & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2);

was accidentally dropped from r355822 in the refactor. Restore it since 16-bit
cards may fail without it (some bridges autodetect this properly, so my laptop
worked when I tested it).

Noticed by: rpokala@
This commit is contained in:
Warner Losh 2019-12-16 23:08:09 +00:00
parent 2db46b45f4
commit 84e6c29ca5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/pccbb/pccbb.c
View File

@ -59,9 +59,6 @@
/* /*
* Driver for PCI to CardBus Bridge chips * Driver for PCI to CardBus Bridge chips
* and PCI to PCMCIA Bridge chips
* and ISA to PCMCIA host adapters
* and C Bus to PCMCIA host adapters
* *
* References: * References:
* TI Datasheets: * TI Datasheets:
@ -273,6 +270,8 @@ cbb_enable_func_intr(struct cbb_softc *sc)
reg = (exca_getb(&sc->exca, EXCA_INTR) & ~EXCA_INTR_IRQ_MASK) | reg = (exca_getb(&sc->exca, EXCA_INTR) & ~EXCA_INTR_IRQ_MASK) |
EXCA_INTR_IRQ_NONE; EXCA_INTR_IRQ_NONE;
PCI_MASK_CONFIG(sc->dev, CBBR_BRIDGECTRL,
& ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2);
exca_putb(&sc->exca, EXCA_INTR, reg); exca_putb(&sc->exca, EXCA_INTR, reg);
} }