From owner-freebsd-stable@freebsd.org Wed Jul 1 03:25:48 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 6D2CB991B05 for ; Wed, 1 Jul 2015 03:25:48 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-ob0-x22d.google.com (mail-ob0-x22d.google.com [IPv6:2607:f8b0:4003:c01::22d]) (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 319BC1BE6; Wed, 1 Jul 2015 03:25:48 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: by obdbs4 with SMTP id bs4so20064722obd.3; Tue, 30 Jun 2015 20:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=Dq8aEJDPFkWzOXSk9w03yy+N9sDVTIoFAxiaT9AEy9M=; b=yMx3SirAgpfWEKZha5xNj7DW6wi80QkdCm3oTAwZ+14WY3Lf2VdCb7+iY3XrrP+m7i g1T9+NuOC4CIvRi1ZS2+P2dpHknAD1DF6L5wgxkqvToLYX6P9JBKpAiADXmRf7unf+VM nGeRi/Ux5bnsgqu0vnx3OWor4aJcZl7XhOYwdCzXWadxjMXWtUBbIjE5RyEVoEpIUDz0 F8xcnnH/VLjxtZcjEhXa375bfpV15ixr4sYq4jN7s89pZtoUpf/DN9uB2xJeOafyCEy5 wEe4wzNwBh0JcFlvqDAo7XmevIv+DMJuZG2K1RlU4eUwuUJa78eATirctL0pYiLm9Tke MX+g== MIME-Version: 1.0 X-Received: by 10.182.230.234 with SMTP id tb10mr21435835obc.23.1435721147710; Tue, 30 Jun 2015 20:25:47 -0700 (PDT) Sender: kob6558@gmail.com Received: by 10.202.221.69 with HTTP; Tue, 30 Jun 2015 20:25:47 -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: Tue, 30 Jun 2015 20:25:47 -0700 X-Google-Sender-Auth: JvgmZANI55aGNW9miX61piGDG0Y Message-ID: Subject: Re: suspend/resume regression From: Kevin Oberman To: John Baldwin Cc: Adrian Chadd , Joseph Mingrone , "Brandon J. Wandersee" , FreeBSD-STABLE Mailing List Content-Type: text/plain; charset=UTF-8 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: Wed, 01 Jul 2015 03:25:48 -0000 On Tue, Jun 30, 2015 at 8:45 AM, John Baldwin wrote: > I'm traveling and AFK for a week or so more, but I did test this MFC > including suspend/resume with CardBus, etc. on a T440 before committing > it. It would be good to know if HEAD works for you. If it does then > there's likely another fix from HEAD that you need merged. > > -- > John Baldwin > > John, I have opened bug # 201239 for the problem. Unfortunately I will be traveling and need a functioning laptop, so I can't test with HEAD right now. I will be back on the 9th and, if no one else has had a chance to test by then, I'll give it a try. It's about time I gave it a shot as I have not run HEAD since 10 was branched. Thanks for looking at this. -- Kevin Oberman, Network Engineer, Retired E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 > On Jun 29, 2015, at 00:54, Kevin Oberman wrote: > > On Sun, Jun 28, 2015 at 11:07 PM, Adrian Chadd > wrote: > >> Ok, so which subset of changes is the culprit? >> >> (sorry, I'm tired.. :( ) >> >> >> The merge of 281874 broke it. Unfortunately, this is a fairly large and > important 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. > > 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 > some contemporary ThinkPads don't. > > I now have enough data to open a fairly coherent ticket. I'll try to open > it tomorrow. (I'm tired, too.) > -- > Kevin Oberman, Network Engineer, Retired > E-mail: rkoberman@gmail.com > PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 > > >> -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 >> > >> > >