From owner-freebsd-stable@freebsd.org Tue Jun 30 15:46:24 2015 Return-Path: Delivered-To: freebsd-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F12E698D3C4 for ; Tue, 30 Jun 2015 15:46:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF215157C; Tue, 30 Jun 2015 15:46:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from [10.168.199.80] (mobile-166-173-057-007.mycingular.net [166.173.57.7]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 50B44B94E; Tue, 30 Jun 2015 11:45:22 -0400 (EDT) Mime-Version: 1.0 (1.0) Subject: Re: suspend/resume regression From: John Baldwin X-Mailer: iPhone Mail (12F70) In-Reply-To: Date: Tue, 30 Jun 2015 09:45:18 -0600 Cc: Adrian Chadd , Joseph Mingrone , "Brandon J. Wandersee" , FreeBSD-STABLE Mailing List , John Baldwin Message-Id: References: <86oak289hv.fsf@gly.ftfl.ca> <86616894vk.fsf@gly.ftfl.ca> <86oak0bkky.fsf@WorkBox.Home> <867fqo6sbh.fsf@gly.ftfl.ca> <86zj3j68e7.fsf@gly.ftfl.ca> To: Kevin Oberman X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 30 Jun 2015 11:46:22 -0400 (EDT) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2015 15:46:24 -0000 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 wrote: >=20 >> On Sun, Jun 28, 2015 at 11:07 PM, Adrian Chadd 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 wrote: >> > On Sun, Jun 28, 2015 at 4:54 PM, Kevin Oberman wr= ote: >> >> >> >> On Sun, Jun 28, 2015 at 10:38 AM, Joseph Mingrone wrote:= >> >>> >> >>> Adrian Chadd 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