Date: Mon, 16 Dec 2019 23:08:09 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355827 - head/sys/dev/pccbb Message-ID: <201912162308.xBGN89jg049753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Dec 16 23:08:09 2019 New Revision: 355827 URL: https://svnweb.freebsd.org/changeset/base/355827 Log: Add back accidentally dropped masking... - 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@ Modified: head/sys/dev/pccbb/pccbb.c Modified: head/sys/dev/pccbb/pccbb.c ============================================================================== --- head/sys/dev/pccbb/pccbb.c Mon Dec 16 22:05:03 2019 (r355826) +++ head/sys/dev/pccbb/pccbb.c Mon Dec 16 23:08:09 2019 (r355827) @@ -59,9 +59,6 @@ /* * 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: * 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) | 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912162308.xBGN89jg049753>