From owner-svn-src-all@freebsd.org Mon Dec 16 23:13:58 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2F44A1D12C0 for ; Mon, 16 Dec 2019 23:13:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47cHC91Y0Lz4Rm5 for ; Mon, 16 Dec 2019 23:13:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x832.google.com with SMTP id e6so111213qtq.7 for ; Mon, 16 Dec 2019 15:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rXrLNQx87ar5r1tGl2VUgQJtR4M3pOtl8//fWeoAH5s=; b=juRQgxgtwyiu1/WLDHIa8TOer7u5VBPM/W3x/2psSC/S+sn+cvvWdg3IoDCdZxtKY7 5FAqyrAb0TIVDgTq83xzywYfTl76a8lE1ZhlLzA/vCPf+MHiApj4kyJm6deec/B5CWSR P6mJPkQnmt8FT5r57kda1dfPUwtRJtHs02dUWkXWB48QImUSHdWxzWJPohVMFJeofLUJ I83iZHMHtribTEnXFU7kISvjaLOwQut36v/k0kU/trmRs0Ka8vWaS5WfOXQUPdeTZl8N afKvklPjDtr5pBrHaTXMgrNN/HpKl6X50pmy1VR66BbbaLyFMd8hl03ltz+jrnEesWo7 EmJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rXrLNQx87ar5r1tGl2VUgQJtR4M3pOtl8//fWeoAH5s=; b=C02ibxhhbJTfSnfYvCq1Bu8tC1iqmU+s44AEHcum9nlrz8KtpdmVMc7QsDLtDOc1DA 7mnSLnGXoKvXjosygjB4cfwhwip0NT3ucuemm9vnn5aQ7s9XltQ/T1Lm1GwQTYFASnRm BMQvKbrnVY16rsjchMse5pZjR8NXjHQDSXthFI527FH6Fki0/eDWitzCPex5zfhWcJUs ZSVe6GoQN/xVasPdV5U/+wL1yh51Ff/qYu5EvvcVNtR2lK1JrVkBbAcy2WRURH8j2vb4 mCbT6dltCFhr2LmGF5Lv3JSDslb7BsriSbijxy7DPYzITRcOYuCwQ0L2ID5migMfm2kW AUVw== X-Gm-Message-State: APjAAAWPhpY/u9cTKI3OXZJL3dFeqPP9nW7miGTz4p2JtHYUcsWFwF1o RdAobAHvEpJMPw86Z59uvqKvsAJPQ4fHAbSobawV4wtFOW0= X-Google-Smtp-Source: APXvYqxaRKHkfsFMbrBLDa2MGDSI+Ly1GpEpJ3ADey3CwImA++TpeS5dr1drJHpW8lpSCa0y25F+LOYcUXy4mN7AZfU= X-Received: by 2002:ac8:74cb:: with SMTP id j11mr1850309qtr.32.1576538035786; Mon, 16 Dec 2019 15:13:55 -0800 (PST) MIME-Version: 1.0 References: <201912162308.xBGN89jg049753@repo.freebsd.org> In-Reply-To: <201912162308.xBGN89jg049753@repo.freebsd.org> From: Warner Losh Date: Mon, 16 Dec 2019 16:13:44 -0700 Message-ID: Subject: Re: svn commit: r355827 - head/sys/dev/pccbb To: Warner Losh Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 47cHC91Y0Lz4Rm5 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=juRQgxgt; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::832) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.70 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.70)[ip: (-9.35), ipnet: 2607:f8b0::/32(-2.19), asn: 15169(-1.90), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2019 23:13:58 -0000 On Mon, Dec 16, 2019 at 4:08 PM Warner Losh wrote: > 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: > This was intentional, btw. I'd planned on doing it in a separate commit, but it wound up in this one. Not worth reverting and redoing, imho, so I won't. The cbb driver will just be for CardBus Bridges. There's a pcic driver, out of tree because it's broken and mostly irrelevant after the NIC purge, that will handle PCI and ISA to 16-bit PCMCIA bridges. And C Bus is no longer relevant because PC 98 support has been removed from FreeBSD (and the driver it would have been was relevant for only a few very old PC 98 laptops with custom NEC PCMCIA interface that's impossible to find docs for these days). Warner > @@ -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); > } > >