Date: Tue, 30 Jun 2015 09:45:18 -0600 From: John Baldwin <jhb@FreeBSD.org> To: Kevin Oberman <rkoberman@gmail.com> Cc: Adrian Chadd <adrian.chadd@gmail.com>, Joseph Mingrone <jrm@ftfl.ca>, "Brandon J. Wandersee" <brandon.wandersee@gmail.com>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>, John Baldwin <jhb@freebsd.org> Subject: Re: suspend/resume regression Message-ID: <CFA49679-EAB4-4D44-A1D1-FF4BE5AB16BB@FreeBSD.org> In-Reply-To: <CAN6yY1suFsDNWDC_AnA=UJxeUj%2Bi_N-iPSqBSFJHFbCBJ%2BzwCw@mail.gmail.com> References: <86oak289hv.fsf@gly.ftfl.ca> <CAJ-Vmo=onHpgQzxqk1_AsBNXvDNGqcMjBDf8DCff7Zt39Pipqg@mail.gmail.com> <86616894vk.fsf@gly.ftfl.ca> <CAN6yY1tuv6XO05HPXTVdoQGHFz-0Bod0Lvj4h5PRqEyyVy61Xg@mail.gmail.com> <86oak0bkky.fsf@WorkBox.Home> <CAN6yY1ud1-0MXnZXSo74oVxOhMU4%2Bc3KY9-6LmGXQ2Aq6-q6TQ@mail.gmail.com> <867fqo6sbh.fsf@gly.ftfl.ca> <CAN6yY1sGmjv6NtKQWHRkngVJMew0exy2D_VaqvDYSr80TwxPMA@mail.gmail.com> <CAN6yY1sPPkCGen7ZGzSQZNGc7NrzXPRuKi4sQNyUZbwQpkrfZA@mail.gmail.com> <CAN6yY1sF4f8CtnGO8TzwNDDD432bOaHS-gY5_f3eaY5nGMs9Ow@mail.gmail.com> <CAJ-VmokMH%2BWoi9HmuK_U003XWWvUS0qCZwUO7euNvLz7v4ei-w@mail.gmail.com> <86zj3j68e7.fsf@gly.ftfl.ca> <CAN6yY1smQ5uhert2BngMFtZCdrMdcOM6tXW7oYQTZvu1S4saJw@mail.gmail.com> <CAN6yY1txeEC6YuLEC9oR4Gt3PBD6e70BPcV3nQyY2RrCg5hgaA@mail.gmail.com> <CAJ-Vmon1%2BEDVUnYseXoBRun8uJ=6GwipJP=Jv0egCXWxXvmkJw@mail.gmail.com> <CAN6yY1suFsDNWDC_AnA=UJxeUj%2Bi_N-iPSqBSFJHFbCBJ%2BzwCw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
I'm traveling and AFK for a week or so more, but I did test this MFC includi= ng suspend/resume with CardBus, etc. on a T440 before committing it. It wou= ld be good to know if HEAD works for you. If it does then there's likely an= other fix from HEAD that you need merged. --=20 John Baldwin > On Jun 29, 2015, at 00:54, Kevin Oberman <rkoberman@gmail.com> wrote: >=20 >> On Sun, Jun 28, 2015 at 11:07 PM, Adrian Chadd <adrian.chadd@gmail.com> w= rote: >> Ok, so which subset of changes is the culprit? >>=20 >> (sorry, I'm tired.. :( ) > The merge of 281874 broke it. Unfortunately, this is a fairly large and im= portant change that touches five files, mainly dev/pci/pci.c and dev/pci/pci= _pci.c with a less significant update to dev/pccbb/pccbb_pci.c. >=20 > Get some rest. This is an annoying regression, but not disastrous. Systems= still run and it sounds like many still resume. Unfortunately my T520 and s= ome contemporary ThinkPads don't. >=20 > I now have enough data to open a fairly coherent ticket. I'll try to open i= t tomorrow. (I'm tired, too.) > -- > Kevin Oberman, Network Engineer, Retired > E-mail: rkoberman@gmail.com > PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 >=20 >>=20 >> -a >>=20 >>=20 >> On 28 June 2015 at 22:45, Kevin Oberman <rkoberman@gmail.com> wrote: >> > On Sun, Jun 28, 2015 at 4:54 PM, Kevin Oberman <rkoberman@gmail.com> wr= ote: >> >> >> >> On Sun, Jun 28, 2015 at 10:38 AM, Joseph Mingrone <jrm@ftfl.ca> wrote:= >> >>> >> >>> Adrian Chadd <adrian.chadd@gmail.com> writes: >> >>> > ok. I've updated my x230 to the latest -head and it is okay at >> >>> > suspend/resume. >> >>> >> >>> No problem with -head on the X220 as well. >> >>> >> >>> > I can go acquire an x220 (now that they're cheap) to have as anothe= r >> >>> > reference laptop. >> >>> >> >>> You might ping Allan Jude. If I'm not mistaken he had at least two >> >>> X220s at BSDCan. Maybe he'd be willing to part with one. >> >> >> >> >> >> I have now merged all of the parts of 284034 except for 281874 and res= ume >> >> works correctly. As i suspected, something in that rather large commit= is >> >> the problem and it is probably something that is tied to some other ch= ange >> >> in HEAD as Adrian has reported that it works fine in HEAD. >> >> >> >> I'll have to admit that have no idea how to approach figuring this out= . >> >> I'm not sure how I can even revert a part of the commit to get >> >> 10.2-PRERELEASE working for me. I really wish that a commit as large a= s this >> >> one had been MFCed separately. :-( So far there has been only a singl= e >> >> commit to pci and none to pccbb since 284034, so I built stable with t= he >> >> files modified in 281874 manually reverted. >> > >> > >> > I now have r284916M running and it seems to be working fine. All of 284= 034 >> > committed except for the MFC from 281874. That left three files conflic= ting >> > with STABLE: >> > /usr/src/sys/dev/pci/pci.c >> > /usr/src/sys/dev/pci/pci_pci.c >> > /usr/src/sys/dev/pccbb/pccbb_pci.c >> > -- >> > Kevin Oberman, Network Engineer, Retired >> > E-mail: rkoberman@gmail.com >> > PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 >> > >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CFA49679-EAB4-4D44-A1D1-FF4BE5AB16BB>