From owner-svn-src-all@FreeBSD.ORG Fri Sep 26 00:18:20 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3A04DD8 for ; Fri, 26 Sep 2014 00:18:19 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4C02780 for ; Fri, 26 Sep 2014 00:18:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s8Q0IJZv067792 for ; Fri, 26 Sep 2014 00:18:19 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s8Q0IJxa067788 for svn-src-all@freebsd.org; Fri, 26 Sep 2014 00:18:19 GMT (envelope-from bdrewery) Received: (qmail 82550 invoked from network); 25 Sep 2014 19:18:18 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 25 Sep 2014 19:18:18 -0500 Message-ID: <5424B0C0.30202@FreeBSD.org> Date: Thu, 25 Sep 2014 19:18:08 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r271201 - head/sys/dev/ahci References: <201409061820.s86IKpnw042259@svn.freebsd.org> In-Reply-To: <201409061820.s86IKpnw042259@svn.freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1qFHmSm7rM8vwNwf0gOfSPHna9NkV33nH" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Fri, 26 Sep 2014 00:18:20 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1qFHmSm7rM8vwNwf0gOfSPHna9NkV33nH Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This drove me crazy for the past few days! https://lists.freebsd.org/pipermail/freebsd-current/2014-September/052215= =2Ehtml Not sure about the first trace there, but the others I encountered were due to this not being fixed yet. smh@ tracked the ordering down and then we found this. I couldn't try a newer build easily since my system would panic on just buildworld :) On 9/6/2014 1:20 PM, Warner Losh wrote: > Author: imp > Date: Sat Sep 6 18:20:50 2014 > New Revision: 271201 > URL: http://svnweb.freebsd.org/changeset/base/271201 >=20 > Log: > Restore order of interrupt setup. Minor problems can result by > setting up the interrupts too early: > =20 > Reviewed by: mav@ > Sponsored by: Netflix >=20 > Modified: > head/sys/dev/ahci/ahci.c > head/sys/dev/ahci/ahci_pci.c >=20 > Modified: head/sys/dev/ahci/ahci.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/dev/ahci/ahci.c Sat Sep 6 18:08:21 2014 (r271200) > +++ head/sys/dev/ahci/ahci.c Sat Sep 6 18:20:50 2014 (r271201) > @@ -229,6 +229,15 @@ ahci_attach(device_t dev) > =20 > ahci_ctlr_setup(dev); > =20 > + /* Setup interrupts. */ > + if (ahci_setup_interrupt(dev)) { > + bus_dma_tag_destroy(ctlr->dma_tag); > + bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, > + ctlr->r_mem); > + rman_fini(&ctlr->sc_iomem); > + return ENXIO; > + } > + > i =3D 0; > for (u =3D ctlr->ichannels; u !=3D 0; u >>=3D 1) > i +=3D (u & 1); >=20 > Modified: head/sys/dev/ahci/ahci_pci.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/dev/ahci/ahci_pci.c Sat Sep 6 18:08:21 2014 (r271200) > +++ head/sys/dev/ahci/ahci_pci.c Sat Sep 6 18:20:50 2014 (r271201) > @@ -417,13 +417,6 @@ ahci_pci_attach(device_t dev) > ctlr->numirqs =3D 1; > } > =20 > - if (ahci_setup_interrupt(dev)) { > - if (ctlr->msi) > - pci_release_msi(dev); > - bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);= > - return ENXIO; > - } > - > error =3D ahci_attach(dev); > if (error !=3D 0) > if (ctlr->msi) >=20 --=20 Regards, Bryan Drewery --1qFHmSm7rM8vwNwf0gOfSPHna9NkV33nH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUJLDAAAoJEDXXcbtuRpfPJz4H/3XDSotjh2Tv6J7zPNfXVJ6U ZlOJG6lREpWl5LHAmybC8JUXU0tk1lNMZqvBkDI91qHn0s1dvaGhrje8vgvINSzT QjIuvNl3O4diseavNm3uE8T5a2vtWdaG658N1PlkDdD2jb8CGieBfvajck7L867R l1oqnJITCuHJ13Bp2QtaB3DjIXU+QsBkC15d4iQLfRzPLD0SeP4FT+JROE6s+SkB ZeRCMLgkJOr41V9qbUp4euXX44ThLXZe035GviR0R8CPEPxfMyiq/F2neWoIEy7V FdM2e/kGO+ubyE+2eAj5zwDMjT8Olm4IsvWaNSAw3+I/GFAZ/onZ1on2KybKyko= =MqTS -----END PGP SIGNATURE----- --1qFHmSm7rM8vwNwf0gOfSPHna9NkV33nH--