Date: Thu, 25 Sep 2014 19:18:08 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Warner Losh <imp@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r271201 - head/sys/dev/ahci Message-ID: <5424B0C0.30202@FreeBSD.org> In-Reply-To: <201409061820.s86IKpnw042259@svn.freebsd.org> References: <201409061820.s86IKpnw042259@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] This drove me crazy for the past few days! https://lists.freebsd.org/pipermail/freebsd-current/2014-September/052215.html 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 > > Log: > Restore order of interrupt setup. Minor problems can result by > setting up the interrupts too early: > > Reviewed by: mav@ > Sponsored by: Netflix > > Modified: > head/sys/dev/ahci/ahci.c > head/sys/dev/ahci/ahci_pci.c > > Modified: head/sys/dev/ahci/ahci.c > ============================================================================== > --- 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) > > ahci_ctlr_setup(dev); > > + /* 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 = 0; > for (u = ctlr->ichannels; u != 0; u >>= 1) > i += (u & 1); > > Modified: head/sys/dev/ahci/ahci_pci.c > ============================================================================== > --- 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 = 1; > } > > - 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 = ahci_attach(dev); > if (error != 0) > if (ctlr->msi) > -- Regards, Bryan Drewery [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5424B0C0.30202>