From owner-p4-projects@FreeBSD.ORG  Fri Sep 14 08:21:41 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4116D16A41B; Fri, 14 Sep 2007 08:21:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0061616A417
	for <perforce@FreeBSD.org>; Fri, 14 Sep 2007 08:21:41 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EED8913C45D
	for <perforce@FreeBSD.org>; Fri, 14 Sep 2007 08:21:40 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8E8Le5Z042410
	for <perforce@FreeBSD.org>; Fri, 14 Sep 2007 08:21:40 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8E8LeLR042407
	for perforce@freebsd.org; Fri, 14 Sep 2007 08:21:40 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 14 Sep 2007 08:21:40 GMT
Message-Id: <200709140821.l8E8LeLR042407@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2007 08:21:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=126399

Change 126399 by zec@zec_tpx32 on 2007/09/14 08:20:51

	Hold th Giant across DEVICE_SUSPEND/RESUME in apm_do_suspend()
	since non-MPSAFE drivers need this.  In particular this change
	allows for USB periperals to better survive suspend/resume
	cycles.

Affected files ...

.. //depot/projects/vimage/src/sys/i386/bios/apm.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/i386/bios/apm.c#2 (text+ko) ====

@@ -485,7 +485,13 @@
 	apm_op_inprog = 0;
 	sc->suspends = sc->suspend_countdown = 0;
 
+	/*
+	 * Be sure to hold Giant across DEVICE_SUSPEND/RESUME since
+	 * non-MPSAFE drivers need this.
+	 */
+	mtx_lock(&Giant);
 	error = DEVICE_SUSPEND(root_bus);
+	mtx_unlock(&Giant);
 	if (error)
 		return;
 
@@ -496,7 +502,9 @@
 	} else {
 		/* Failure, 'resume' the system again */
 		apm_execute_hook(hook[APM_HOOK_RESUME]);
+		mtx_lock(&Giant);
 		DEVICE_RESUME(root_bus);
+		mtx_unlock(&Giant);
 	}
 	return;
 }
@@ -602,7 +610,9 @@
 
 	sc->suspending = 0;
 	apm_execute_hook(hook[APM_HOOK_RESUME]);
+	mtx_lock(&Giant);
 	DEVICE_RESUME(root_bus);
+	mtx_unlock(&Giant);
 	return;
 }