From owner-svn-src-projects@FreeBSD.ORG Tue Feb 3 02:23:30 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D188AAC; Tue, 3 Feb 2015 02:23:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09E209AE; Tue, 3 Feb 2015 02:23:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t132NT07040303; Tue, 3 Feb 2015 02:23:29 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t132NTO7040302; Tue, 3 Feb 2015 02:23:29 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201502030223.t132NTO7040302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 3 Feb 2015 02:23:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278123 - projects/pmac_pmu/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 02:23:30 -0000 Author: jhibbits Date: Tue Feb 3 02:23:29 2015 New Revision: 278123 URL: https://svnweb.freebsd.org/changeset/base/278123 Log: Bring back multipass suspend/resume in the bus_generic_{suspend,resume} functions. These were lost in the import. Modified: projects/pmac_pmu/sys/kern/subr_bus.c Modified: projects/pmac_pmu/sys/kern/subr_bus.c ============================================================================== --- projects/pmac_pmu/sys/kern/subr_bus.c Tue Feb 3 00:29:58 2015 (r278122) +++ projects/pmac_pmu/sys/kern/subr_bus.c Tue Feb 3 02:23:29 2015 (r278123) @@ -3695,12 +3695,21 @@ bus_generic_suspend(device_t dev) return (0); TAILQ_FOREACH(child, &dev->children, link) { - error = BUS_SUSPEND_CHILD(dev, child); + /* First traverse the tree, then suspend this child. */ + if (!(child->flags & DF_SUSPENDED)) + error = bus_generic_suspend(child); + if (error == 0) { + if (child->pass >= bus_current_pass && + device_is_attached(child)) + error = BUS_SUSPEND_CHILD(dev, child); + } if (error) { for (child2 = TAILQ_FIRST(&dev->children); child2 && child2 != child; - child2 = TAILQ_NEXT(child2, link)) + child2 = TAILQ_NEXT(child2, link)) { BUS_RESUME_CHILD(dev, child2); + bus_generic_resume(child2); + } return (error); } } @@ -3720,8 +3729,11 @@ bus_generic_resume(device_t dev) device_t child; TAILQ_FOREACH(child, &dev->children, link) { - BUS_RESUME_CHILD(dev, child); + if (child->pass == bus_current_pass && (child->flags & DF_SUSPENDED)) + BUS_RESUME_CHILD(dev, child); /* if resume fails, there's nothing we can usefully do... */ + if (child->pass <= bus_current_pass) + bus_generic_resume(child); } return (0); }