From owner-freebsd-stable@freebsd.org Mon Jun 29 06:07:05 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 91EF398DFF1 for ; Mon, 29 Jun 2015 06:07:05 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x22b.google.com (mail-ig0-x22b.google.com [IPv6:2607:f8b0:4001:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 615691224; Mon, 29 Jun 2015 06:07:05 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igrv9 with SMTP id v9so33902352igr.1; Sun, 28 Jun 2015 23:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=DnUTbYWz86px54OeWAu3myZjoB+Z6zNoZA7k3TPKQao=; b=cEFpYzJIjYf0gqycol4o6K/CD1vLMafjfrQSyGewxAFiln7jj8FxWOS05mZWcShld7 hxiR9quQjaV78u78NayJOVTPyovFP7WEPDgvtaiQdY6SdfVD3I5aGxegdrCSIB5jZ8XY xWvZGRxPN8/D8EcQoyiYVCWkY5EPpqP74p5bDrjuiMD0IYeH/2qT9fOWb9CpS6/aCoSp wJUT83nF1Sudp3hEa9m+bIhhyBTlp5Z1qPfM0zjIl/OYpR+Sh2RpBRjcRefunIiLiFk+ 4owTaZtVXfz+6XHaKAufmNYFvV8rHDbkrxlbXs/h8OF89DxmHJ6wyckXr/vmEVXrjSBF dTZQ== MIME-Version: 1.0 X-Received: by 10.50.134.196 with SMTP id pm4mr12706845igb.6.1435558024718; Sun, 28 Jun 2015 23:07:04 -0700 (PDT) Received: by 10.36.38.133 with HTTP; Sun, 28 Jun 2015 23:07:04 -0700 (PDT) In-Reply-To: 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> Date: Sun, 28 Jun 2015 23:07:04 -0700 Message-ID: Subject: Re: suspend/resume regression From: Adrian Chadd To: Kevin Oberman Cc: Joseph Mingrone , "Brandon J. Wandersee" , FreeBSD-STABLE Mailing List , John Baldwin Content-Type: text/plain; charset=UTF-8 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: Mon, 29 Jun 2015 06:07:05 -0000 Ok, so which subset of changes is the culprit? (sorry, I'm tired.. :( ) -a On 28 June 2015 at 22:45, Kevin Oberman wrote: > On Sun, Jun 28, 2015 at 4:54 PM, Kevin Oberman wrote: >> >> 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 another >>> > 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 resume >> 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 change >> 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 as this >> one had been MFCed separately. :-( So far there has been only a single >> commit to pci and none to pccbb since 284034, so I built stable with the >> files modified in 281874 manually reverted. > > > I now have r284916M running and it seems to be working fine. All of 284034 > committed except for the MFC from 281874. That left three files conflicting > 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 >