From owner-freebsd-stable@freebsd.org Mon Jun 29 06:54:37 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 EB9E598E6A6 for ; Mon, 29 Jun 2015 06:54:36 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-oi0-x229.google.com (mail-oi0-x229.google.com [IPv6:2607:f8b0:4003:c06::229]) (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 A7744154D; Mon, 29 Jun 2015 06:54:36 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: by oigx81 with SMTP id x81so111550900oig.1; Sun, 28 Jun 2015 23:54:36 -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=UNbTH5ROIzYP/sxYB7f31t4laUIwytJ5waxc7BD5ZsA=; b=t5+ozh3x/JPENrQmI+q9U2iJZh03LuBDWz+gk+A6ZX2e+OonbRRGBZGzDV6tX2U/l0 XzDjS+KHr+yKZtM+YOJHamzqj3+ZZwSBZrKmOdbajub7kLXjeGo5tzMY113KMJtRhZV+ uenHmHF2GWoeIjp7n3ZjYUrhXPbVYDrMBcNnDVbo36qde+uMI8EelfpEiaerF9pJl28m g3n/WJezGIPZNIMegCwmKr5eIi8OXcG66M+FMegBeJYzeDSu50NISZ7LIQB/owxdQ81o LX54EFH/2G0HMUbe6D+TsFyvmJWktAmLjMOBpnB7gdf1k603Y63FN34cnftTcfcxTxA5 Hehg== MIME-Version: 1.0 X-Received: by 10.202.188.139 with SMTP id m133mr11966805oif.73.1435560876033; Sun, 28 Jun 2015 23:54:36 -0700 (PDT) Sender: kob6558@gmail.com Received: by 10.202.221.69 with HTTP; Sun, 28 Jun 2015 23:54:35 -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:54:35 -0700 X-Google-Sender-Auth: P3nbntRIpjPZ6pPRI6-2iKC7KJM Message-ID: Subject: Re: suspend/resume regression From: Kevin Oberman To: Adrian Chadd Cc: Joseph Mingrone , "Brandon J. Wandersee" , FreeBSD-STABLE Mailing List , John Baldwin 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: Mon, 29 Jun 2015 06:54:37 -0000 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 > > >