Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 25 Sep 2014 17:59:06 -0700
From:      Warner Losh <imp@bsdimp.com>
To:        Bryan Drewery <bdrewery@FreeBSD.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Warner Losh <imp@FreeBSD.org>
Subject:   Re: svn commit: r271201 - head/sys/dev/ahci
Message-ID:  <4A1B4605-B3AE-4B8D-B039-AD1A86B561B8@bsdimp.com>
In-Reply-To: <5424B0C0.30202@FreeBSD.org>
References:  <201409061820.s86IKpnw042259@svn.freebsd.org> <5424B0C0.30202@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help 

--Apple-Mail=_C1E7CDE3-4270-42BA-98F8-CE5AD0621E41
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=windows-1252

Hey Bryan,

Sorry for the hassle. This didn=92t show up in the hardware I had, but =
did show up in Mav=92s hardware. It was like this less than a day, I =
thought=85

Warner


On Sep 25, 2014, at 5:18 PM, Bryan Drewery <bdrewery@FreeBSD.org> wrote:

> This drove me crazy for the past few days!
>=20
> =
https://lists.freebsd.org/pipermail/freebsd-current/2014-September/052215.=
html
>=20
> 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 :)
>=20
> 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
>=20
> --=20
> Regards,
> Bryan Drewery
>=20


--Apple-Mail=_C1E7CDE3-4270-42BA-98F8-CE5AD0621E41
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org

iQIcBAEBCgAGBQJUJLpaAAoJEGwc0Sh9sBEA/kQQAObnV59iDniCBt+Fx1T3RSCf
/VvDsv56DmgtTNXLCsSoOviP2IfA/3Nww5MYmRi9CoKih8E6bXKfQrWxXoOe3zbt
nlwubnXbgSQBgugv+OJFccT9M6KM/BeoPtwMzyg91rjnWF8SgMTn85CV+yH1WSgx
PB3VwKDzp3eDr8bFZehmpZgQIoChjefSYjbFBiVcgsr84GoayjqZ5eSrJzMf8buP
XijCp/tgolEA4HwqkAzJp8DNiwODbrNS7vxDQzvw3gT+dLV700KVpB7K2G4EVoyQ
Nwmdm0OgUjiK0VNzqToH7DbN2IBiU6N8HCebBnTyGd2foXS8ErqcaD8aBnp9G754
oKkz9JWZkJdsIAVC45yS6wnp4houumR5G8913K1+2YAYLqsGsBoNonoCwmGDhft+
ix8CEVN8YECnsALeYenAH7+KU5oee0L7921wme6C0UAH55YtzFzGndG4r9ghJO0R
YJATXXiX31NW2Gi5PD+PLzIuefmASootzw8yt63myHpKkggTiBfQTty9t3myZGkG
q/7DliBzm9tdEQK75T5CkUvabiooBe5L/oZIHcUYGgUJqpSZTIq3nSA3YXcjpbs0
p7PBJBM1vfLtX5VvvBu7HKHJeDdb6d8Ap4ff2L4O18vPYgiNLPy/D8MUUDX7khI9
AsgLsN7TK+HAjoe+o5Ay
=cqkH
-----END PGP SIGNATURE-----

--Apple-Mail=_C1E7CDE3-4270-42BA-98F8-CE5AD0621E41--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A1B4605-B3AE-4B8D-B039-AD1A86B561B8>